diff --git a/erp-produce/src/main/resources/template/js/erpBom/erpBomAdd.js b/erp-produce/src/main/resources/template/js/erpBom/erpBomAdd.js
index 49ae66c9d0482c40471993b52291f7e577d48bcf..8d4c7b3df58e418937f7062d5a1222e7763f1200 100644
--- a/erp-produce/src/main/resources/template/js/erpBom/erpBomAdd.js
+++ b/erp-produce/src/main/resources/template/js/erpBom/erpBomAdd.js
@@ -81,7 +81,7 @@ layui.config({
         		}
         	});
         	if(unitIndex >= 0){
-        		return unitList[unitIndex].salePrice;
+        		return unitList[unitIndex].normsSalePrice;
         	}
         }
         
diff --git a/erp-produce/src/main/resources/template/js/erpBom/erpBomEdit.js b/erp-produce/src/main/resources/template/js/erpBom/erpBomEdit.js
index 22efbd620e89eb05ea9273e4d9120c1ecaf9c19e..73d9eeebfe4fd0db526dafa403a480bcc9e24e55 100644
--- a/erp-produce/src/main/resources/template/js/erpBom/erpBomEdit.js
+++ b/erp-produce/src/main/resources/template/js/erpBom/erpBomEdit.js
@@ -22,7 +22,7 @@ layui.config({
         	
 	    var selTemplate = getFileContent('tpl/template/select-option-must.tpl');
 	    
-	    AjaxPostUtil.request({url: flowableBasePath + "erpbom005", params: {rowId: parent.rowId}, type: 'json', method: "GET", callback: function (json) {
+	    AjaxPostUtil.request({url: flowableBasePath + "erpbom005", params: {id: parent.rowId}, type: 'json', method: "GET", callback: function (json) {
 			$("#showForm").html(getDataUseHandlebars($("#mainHtml").html(), json));
 			textool.init({eleId: 'remark', maxlength: 200});
 
@@ -103,7 +103,7 @@ layui.config({
         		}
         	});
         	if(unitIndex >= 0){
-        		return unitList[unitIndex].salePrice;
+        		return unitList[unitIndex].normsSalePrice;
         	}
         }
         
@@ -319,8 +319,7 @@ layui.config({
 						var str = "";
 						var title = "";
 						$.each(procedureMationList, function(i, item) {
-							str += '' +
-									'<span class="layui-badge layui-bg-gray">' + item.number + '</span>' + item.procedureName + '，';
+							str += '<span class="layui-badge layui-bg-gray">' + item.number + '</span>' + item.procedureName + '，';
 							title += item.number + '、' + item.procedureName + '\n';
 						});
 						$("#procedureBox" + proId).html('<img class="procedureSel" id="procedureSel' + proId + '" src="../../assets/images/forum-menu.png"/>' + str);
diff --git a/erp-produce/src/main/resources/template/js/erpBom/erpBomList.js b/erp-produce/src/main/resources/template/js/erpBom/erpBomList.js
index 77a10a587774fd7c4d24b4b3337c6ee397fe6ea6..edb8a930345803255cbf736c2c6e6d8df0ba8092 100644
--- a/erp-produce/src/main/resources/template/js/erpBom/erpBomList.js
+++ b/erp-produce/src/main/resources/template/js/erpBom/erpBomList.js
@@ -28,9 +28,9 @@ layui.config({
             { field: 'title', title: 'bom方案名称', align: 'left',width: 150, templet: function (d) {
                 return '<a lay-event="details" class="notice-title-click">' + d.title + '</a>';
 		    }},
-		    { field: 'materialName', title: '商品名称', align: 'left',width: 150 },
-            { field: 'materialModel', title: '商品型号', align: 'left',width: 150 },
-            { field: 'unitName', title: '计量单位', align: 'center',width: 100 },
+		    { field: 'materialName', title: '商品名称', align: 'left',width: 150, templet: function (d) {return d.normMation.materialName}},
+            { field: 'materialModel', title: '商品型号', align: 'left',width: 150, templet: function (d) {return d.normMation.materialModel}},
+            { field: 'unitName', title: '计量单位', align: 'center',width: 100, templet: function (d) {return d.normMation.unitName}},
             { field: 'makeNum', title: '数量', align: 'center',width: 80 },
             { field: 'consumablesPrice', title: '耗材总费用', align: 'right',width: 100 },
             { field: 'procedurePrice', title: '工序总费用', align: 'right',width: 100 },
diff --git a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinAdd.js b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinAdd.js
index 85b026cb43d32b82f74f63496d5d89052e7d896f..4f2ea00af77d3c02b4cbe26053952b598dfa706c 100644
--- a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinAdd.js
+++ b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinAdd.js
@@ -58,8 +58,8 @@ layui.config({
 					if(thisRowValue == bean.id){//获取规格
 						//获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-						$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价
-						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额
+						$("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价
+						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额
 						return false;
 					}
 				});
diff --git a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinEdit.js b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinEdit.js
index b23392e16ca8c623be118834e90ce872f1981fe4..93f1edaf1ac2215ae6bc6eef85f0dbe370d2f95f 100644
--- a/erp-produce/src/main/resources/template/js/erpMachin/erpMachinEdit.js
+++ b/erp-produce/src/main/resources/template/js/erpMachin/erpMachinEdit.js
@@ -60,9 +60,9 @@ layui.config({
 				//加工产品信息
 				machinPro = {
 					materialId: data.materialId,
-					materialName: data.materialName,
-					materialModel: data.materialModel,
-					unitList: data.unitList
+					materialName: data.normMation.materialName,
+					materialModel: data.normMation.materialModel,
+					unitList: data.normMation.unitList
 				};
 				$("#productName").val(machinPro.materialName);
 				$("#productModel").val(machinPro.materialModel);
@@ -126,8 +126,8 @@ layui.config({
 					if(thisRowValue == bean.id){//获取规格
 						//获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-						$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价
-						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额
+						$("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价
+						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额
 						return false;
 					}
 				});
diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js b/erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js
index 5c52c78d39b34ff6100c766a8483de68ac681c84..15ad1e3240d2cd5a3c4053dd03d23a844d6c1092 100644
--- a/erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js
+++ b/erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js
@@ -49,8 +49,8 @@ layui.config({
 					if(thisRowValue == bean.id){//获取规格
 						//获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-						$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价
-						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额
+						$("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价
+						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额
 						return false;
 					}
 				});
diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js b/erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js
index a23ea3c5dfe94fdbf727e95965e5c9a122329b7e..fa20577ef1867f03a9b4416db9532b387b1ba559 100644
--- a/erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js
+++ b/erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js
@@ -84,8 +84,8 @@ layui.config({
 					if(thisRowValue == bean.id){//获取规格
 						//获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-						$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价
-						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额
+						$("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价
+						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额
 						return false;
 					}
 				});
diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js
index 9a2110d05c4fa65f54c49fc529ab555c059517d5..1f9c0615b43893541902046b19c28b4a4cf7010a 100644
--- a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js
+++ b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js
@@ -49,8 +49,8 @@ layui.config({
 					if(thisRowValue == bean.id){//获取规格
 						//获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-						$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价
-						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额
+						$("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价
+						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额
 						return false;
 					}
 				});
diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js
index 53dabec8f9e8f543c0150cf03ac5e2b0196990a7..161865d3463d1fa617f5363035689a7358c753be 100644
--- a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js
+++ b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js
@@ -94,8 +94,8 @@ layui.config({
 					if(thisRowValue == bean.id){//获取规格
 						//获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-						$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价
-						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额
+						$("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价
+						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额
 						return false;
 					}
 				});
diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpReturnAdd.js b/erp-produce/src/main/resources/template/js/erpPick/erpReturnAdd.js
index 35600dcbab45cce6add32efbaeb28ddbd687ec5d..c6835c54caaa50f5bab669279d5243a1293ab89a 100644
--- a/erp-produce/src/main/resources/template/js/erpPick/erpReturnAdd.js
+++ b/erp-produce/src/main/resources/template/js/erpPick/erpReturnAdd.js
@@ -45,8 +45,8 @@ layui.config({
 					if(thisRowValue == bean.id){//获取规格
 						//获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-						$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价
-						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额
+						$("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价
+						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额
 						return false;
 					}
 				});
diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpReturnEdit.js b/erp-produce/src/main/resources/template/js/erpPick/erpReturnEdit.js
index ca548dc54cb309f2989fdfacb75a051127214c2d..4bcd5e9177f5e53f1c3d50702783f37f3ad58f59 100644
--- a/erp-produce/src/main/resources/template/js/erpPick/erpReturnEdit.js
+++ b/erp-produce/src/main/resources/template/js/erpPick/erpReturnEdit.js
@@ -75,8 +75,8 @@ layui.config({
 					if(thisRowValue == bean.id){//获取规格
 						//获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-						$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价
-						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额
+						$("#unitPrice" + thisRowNum).val(bean.normsEstimatePurchasePrice.toFixed(2));//单价
+						$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.normsEstimatePurchasePrice)).toFixed(2));//金额
 						return false;
 					}
 				});
diff --git a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js
index fcb70e7d2e99ff1f4d49152c592d1dda11e2c4ea..cac7e7b47624c49757f16ec3c875d801412faee6 100644
--- a/erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js
+++ b/erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js
@@ -186,7 +186,7 @@ layui.config({
  	        			normsId: item.normsId,
  	        			number: $("#proposal" + item.materialId).val(),
  	        			unitNumber: item.needNum,
- 	        			unitPrice: item.normsPurchasePrice
+ 	        			unitPrice: item.normsEstimatePurchasePrice
  	        		});
  	        	});
  	        	//子件清单信息
diff --git a/erp-produce/src/main/resources/template/tpl/erpBom/erpBomDetail.html b/erp-produce/src/main/resources/template/tpl/erpBom/erpBomDetail.html
index c5f3f9408327128ea93a7da17ce6ce6c2a3a6cc6..653ceb799d710e724498456506f7fa4e59c1a3fc 100644
--- a/erp-produce/src/main/resources/template/tpl/erpBom/erpBomDetail.html
+++ b/erp-produce/src/main/resources/template/tpl/erpBom/erpBomDetail.html
@@ -56,19 +56,19 @@
 	        <div class="layui-form-item layui-col-xs12">
 	            <label class="layui-form-label">商品名称：</label>
 	            <div class="layui-input-block ver-center">
-	                {{materialName}}
+	                {{normMation.materialName}}
 	            </div>
 	        </div>
 	        <div class="layui-form-item layui-col-xs6">
 	            <label class="layui-form-label">商品型号：</label>
 	            <div class="layui-input-block ver-center">
-	                {{materialModel}}
+	                {{normMation.materialModel}}
 	            </div>
 	        </div>
 	        <div class="layui-form-item layui-col-xs6">
 	            <label class="layui-form-label">计量单位：</label>
 	            <div class="layui-input-block ver-center">
-	                {{unitName}}
+	                {{normMation.unitName}}
 	            </div>
 	        </div>
 			<div class="layui-form-item layui-col-xs6">
@@ -133,6 +133,7 @@
 	
 	<!-- 表格行 -->
 	<script type="text/html" id="tableBody">
+		<div class="diy" style="width: 13%">{{productName}}</div>
 		<div class="diy" style="width: 13%">{{productModel}}</div>
 		<div class="diy" style="width: 6%">{{unitName}}</div>
 		<div class="diy procedureBox" style="width: 15%" id="procedureBox{{productId}}" 
diff --git a/erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinDetails.html b/erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinDetails.html
index c15f8c1a2c58cbb82956770e6962838c9912734b..30c609771fa41c3f101bb37d5a4ac6427ac8e4aa 100644
--- a/erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinDetails.html
+++ b/erp-produce/src/main/resources/template/tpl/erpMachin/erpMachinDetails.html
@@ -52,7 +52,7 @@
 	        <div class="layui-form-item layui-col-xs6">
 	            <label class="layui-form-label">加工商品：</label>
 	            <div class="layui-input-block ver-center">
-	                {{materialName}}
+	                {{normMation.materialName}}
 	            </div>
 	        </div>
 	        <div class="layui-form-item layui-col-xs6">
@@ -64,13 +64,13 @@
 	        <div class="layui-form-item layui-col-xs6">
 	            <label class="layui-form-label">商品型号：</label>
 	            <div class="layui-input-block ver-center">
-	                {{materialModel}}
+	                {{normMation.materialModel}}
 	            </div>
 	        </div>
 	        <div class="layui-form-item layui-col-xs6">
 	            <label class="layui-form-label">计量单位：</label>
 	            <div class="layui-input-block ver-center">
-	                {{unitName}}
+	                {{normMation.unitName}}
 	            </div>
 	        </div>
 	        <div class="layui-form-item layui-col-xs6">
diff --git a/erp/src/main/resources/template/js/allocation/allocationadd.js b/erp/src/main/resources/template/js/allocation/allocationadd.js
index c1d191f87ba17cffbcbd5739083e15bc1488c815..dcc9ddded0817661ca4dbac42c905022dffe50d0 100644
--- a/erp/src/main/resources/template/js/allocation/allocationadd.js
+++ b/erp/src/main/resources/template/js/allocation/allocationadd.js
@@ -57,7 +57,7 @@ layui.config({
 		matchingLanguage();
 
 		// 商品规格加载变化事件
-		mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice", calculatedTotalPrice);
+		mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice", calculatedTotalPrice);
 
 		// 调出仓库变化事件
 		form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/allocation/allocationedit.js b/erp/src/main/resources/template/js/allocation/allocationedit.js
index 6656d6e260291ad4fac0aec66ff9149afe793fef..7fd812f6b2fafd489878540602d94aa875194211 100644
--- a/erp/src/main/resources/template/js/allocation/allocationedit.js
+++ b/erp/src/main/resources/template/js/allocation/allocationedit.js
@@ -109,7 +109,7 @@ layui.config({
 		}
 
 		// 商品规格加载变化事件
-		mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice", calculatedTotalPrice);
+		mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice", calculatedTotalPrice);
 
 		// 调出仓库变化事件
 		form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/assemblysheet/assemblysheetadd.js b/erp/src/main/resources/template/js/assemblysheet/assemblysheetadd.js
index c211a1532e5e9d83f6f8f984ec7e763795322480..755255f6f5d8e881b01cdddf196e8672553895d9 100644
--- a/erp/src/main/resources/template/js/assemblysheet/assemblysheetadd.js
+++ b/erp/src/main/resources/template/js/assemblysheet/assemblysheetadd.js
@@ -56,7 +56,7 @@ layui.config({
 		matchingLanguage();
 
 		// 商品规格加载变化事件
-		mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice", calculatedTotalPrice);
+		mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice", calculatedTotalPrice);
 
 		// 仓库变化事件
 		form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/assemblysheet/assemblysheetedit.js b/erp/src/main/resources/template/js/assemblysheet/assemblysheetedit.js
index c28afadd02bf5f2bb1c1c11d4fe5bdc162e1ff4e..256ba83d57c7ceb731e43b859864edfb7125415d 100644
--- a/erp/src/main/resources/template/js/assemblysheet/assemblysheetedit.js
+++ b/erp/src/main/resources/template/js/assemblysheet/assemblysheetedit.js
@@ -109,7 +109,7 @@ layui.config({
 		}
 
 		// 商品规格加载变化事件
-		mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice", calculatedTotalPrice);
+		mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice", calculatedTotalPrice);
 
 		// 仓库变化事件
 		form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/material/materialChooseToProduce.js b/erp/src/main/resources/template/js/material/materialChooseToProduce.js
index 997196bba400ce1e796fc428b0e3aee593f4be3f..3ebc19088bcea90a3a67053fbcbc1d833b5554cf 100644
--- a/erp/src/main/resources/template/js/material/materialChooseToProduce.js
+++ b/erp/src/main/resources/template/js/material/materialChooseToProduce.js
@@ -258,7 +258,7 @@ layui.config({
 			}
 		});
 		if(proIndex >= 0 && normsIndex >= 0){
-			return productMationList[proIndex].unitList[normsIndex].estimatePurchasePrice;
+			return productMationList[proIndex].unitList[normsIndex].normsEstimatePurchasePrice;
 		} else {
 			return new Array();
 		}
diff --git a/erp/src/main/resources/template/js/otheroutlets/otheroutletsadd.js b/erp/src/main/resources/template/js/otheroutlets/otheroutletsadd.js
index 4504eb021349d1f7a239fe9a3a5ee69c0146aae2..c019f564d963f7f3ace7c033fc9d8816c6f14d3f 100644
--- a/erp/src/main/resources/template/js/otheroutlets/otheroutletsadd.js
+++ b/erp/src/main/resources/template/js/otheroutlets/otheroutletsadd.js
@@ -79,7 +79,7 @@ layui.config({
 	matchingLanguage();
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "salePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsSalePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/otheroutlets/otheroutletsedit.js b/erp/src/main/resources/template/js/otheroutlets/otheroutletsedit.js
index 0615986411262771e8d15687ee8f0752535dae20..2de362d80c438727d7e86b3d1b4faf0f9b50dfb5 100644
--- a/erp/src/main/resources/template/js/otheroutlets/otheroutletsedit.js
+++ b/erp/src/main/resources/template/js/otheroutlets/otheroutletsedit.js
@@ -143,7 +143,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/otherwarehous/otherwarehousadd.js b/erp/src/main/resources/template/js/otherwarehous/otherwarehousadd.js
index 881bff3d9bf4ebc303f01bc02bf5b390fde3b793..d811d131b30a51cbb8dd81c28dd963cb4c9638aa 100644
--- a/erp/src/main/resources/template/js/otherwarehous/otherwarehousadd.js
+++ b/erp/src/main/resources/template/js/otherwarehous/otherwarehousadd.js
@@ -79,7 +79,7 @@ layui.config({
 	matchingLanguage();
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/otherwarehous/otherwarehousedit.js b/erp/src/main/resources/template/js/otherwarehous/otherwarehousedit.js
index d736e2092f2c922403fad9b95d649ed774be0c9f..b31a8f49856816a628ce58e30733380165e05492 100644
--- a/erp/src/main/resources/template/js/otherwarehous/otherwarehousedit.js
+++ b/erp/src/main/resources/template/js/otherwarehous/otherwarehousedit.js
@@ -139,7 +139,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js b/erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js
index 97771b7a08b19a2b7109ffe04009cd2db56f3f72..3b440426a47da01b2cf313c3441bebafc3f446dd 100644
--- a/erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js
+++ b/erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js
@@ -79,7 +79,7 @@ layui.config({
 	matchingLanguage();
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice");
 
 	// 保存为草稿
 	form.on('submit(formAddBean)', function(data) {
diff --git a/erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js b/erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js
index a1bcfd1e0c7735f6a948bef4c6b9917afcbf28dc..ef1267ada5e7f41f820c126509c16343428e6b87 100644
--- a/erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js
+++ b/erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js
@@ -143,7 +143,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice");
 
 	// 保存为草稿
 	form.on('submit(formEditBean)', function(data) {
diff --git a/erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js b/erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js
index 480a4ee26c574f606fb66c015d18cf1d6860e02a..6d65604a9132cf91e2d048e90f296b4055b32a84 100644
--- a/erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js
+++ b/erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js
@@ -184,7 +184,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/purchaseput/purchaseputadd.js b/erp/src/main/resources/template/js/purchaseput/purchaseputadd.js
index 30c25c6f26287dfbe143e56c09765b8f0e19bf49..896006d263132d47acdb26745f5f374125cf248d 100644
--- a/erp/src/main/resources/template/js/purchaseput/purchaseputadd.js
+++ b/erp/src/main/resources/template/js/purchaseput/purchaseputadd.js
@@ -101,7 +101,7 @@ layui.config({
 	matchingLanguage();
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/purchaseput/purchaseputedit.js b/erp/src/main/resources/template/js/purchaseput/purchaseputedit.js
index 99f3c32e79a37c700b456cd43912c71be954a09d..d9b2599b9ca52bfb1f9357c2fda3ee5dfa54684b 100644
--- a/erp/src/main/resources/template/js/purchaseput/purchaseputedit.js
+++ b/erp/src/main/resources/template/js/purchaseput/purchaseputedit.js
@@ -176,7 +176,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/purchasereturns/purchasereturnsadd.js b/erp/src/main/resources/template/js/purchasereturns/purchasereturnsadd.js
index 8e0e230886f03c128da68ab5b29233efa70eaf0b..8c483fd1ccd9ba5957bb430c87832341e07f63a3 100644
--- a/erp/src/main/resources/template/js/purchasereturns/purchasereturnsadd.js
+++ b/erp/src/main/resources/template/js/purchasereturns/purchasereturnsadd.js
@@ -104,7 +104,7 @@ layui.config({
 	matchingLanguage();
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/purchasereturns/purchasereturnsedit.js b/erp/src/main/resources/template/js/purchasereturns/purchasereturnsedit.js
index 9098ef02e3a32a032866acca777896b9e355d1e4..cf541773f441361cd1e6fe1b66fd1b609bffe641 100644
--- a/erp/src/main/resources/template/js/purchasereturns/purchasereturnsedit.js
+++ b/erp/src/main/resources/template/js/purchasereturns/purchasereturnsedit.js
@@ -176,7 +176,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/retailoutlet/retailoutletadd.js b/erp/src/main/resources/template/js/retailoutlet/retailoutletadd.js
index 9cd3ed1852cbdab35dfa0faa7ae9e6275bc2f64a..552786fe285b4607c945ddde0951f4eab77753b9 100644
--- a/erp/src/main/resources/template/js/retailoutlet/retailoutletadd.js
+++ b/erp/src/main/resources/template/js/retailoutlet/retailoutletadd.js
@@ -71,7 +71,7 @@ layui.config({
 	matchingLanguage();
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "retailPrice", calculatedTotalPrice);
+	mUnitChangeEvent(form, allChooseProduct, "normsRetailPrice", calculatedTotalPrice);
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/retailoutlet/retailoutletedit.js b/erp/src/main/resources/template/js/retailoutlet/retailoutletedit.js
index e46fdf5aba982701fbdd341820dfcb0d2e310c03..ea3e461bc998b84a958942401883e959adbb5937 100644
--- a/erp/src/main/resources/template/js/retailoutlet/retailoutletedit.js
+++ b/erp/src/main/resources/template/js/retailoutlet/retailoutletedit.js
@@ -139,7 +139,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "retailPrice", calculatedTotalPrice);
+	mUnitChangeEvent(form, allChooseProduct, "normsRetailPrice", calculatedTotalPrice);
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/retailreturns/retailreturnsadd.js b/erp/src/main/resources/template/js/retailreturns/retailreturnsadd.js
index ac1dc011afd944581af754724ef100d69d6fafec..9198a375f3fb33a134b9d7330cf8f08ecba4af77 100644
--- a/erp/src/main/resources/template/js/retailreturns/retailreturnsadd.js
+++ b/erp/src/main/resources/template/js/retailreturns/retailreturnsadd.js
@@ -71,7 +71,7 @@ layui.config({
 	matchingLanguage();
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "retailPrice", calculatedTotalPrice);
+	mUnitChangeEvent(form, allChooseProduct, "normsRetailPrice", calculatedTotalPrice);
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/retailreturns/retailreturnsedit.js b/erp/src/main/resources/template/js/retailreturns/retailreturnsedit.js
index 2178621cc9487cb0c1fb3c464313d2423c95db68..bfa24ab640091c97653798222aee108ce1e12336 100644
--- a/erp/src/main/resources/template/js/retailreturns/retailreturnsedit.js
+++ b/erp/src/main/resources/template/js/retailreturns/retailreturnsedit.js
@@ -139,7 +139,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "retailPrice", calculatedTotalPrice);
+	mUnitChangeEvent(form, allChooseProduct, "normsRetailPrice", calculatedTotalPrice);
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/salesorder/salesorderadd.js b/erp/src/main/resources/template/js/salesorder/salesorderadd.js
index 7e44a4c82889e7827f012ce5f6fb384bbbc1d2b6..a7b8c8eb74dd310bc4fba54d537e029d2e3d34a2 100644
--- a/erp/src/main/resources/template/js/salesorder/salesorderadd.js
+++ b/erp/src/main/resources/template/js/salesorder/salesorderadd.js
@@ -100,7 +100,7 @@ layui.config({
 	matchingLanguage();
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "salePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsSalePrice");
 
 	// 保存为草稿
 	form.on('submit(formAddBean)', function(data) {
diff --git a/erp/src/main/resources/template/js/salesorder/salesorderedit.js b/erp/src/main/resources/template/js/salesorder/salesorderedit.js
index 4cf3e475908c72923fa782bd2aea30df10718eb5..c6f9a50d8bfa7d8175248c886ad64d7a1af9f07c 100644
--- a/erp/src/main/resources/template/js/salesorder/salesorderedit.js
+++ b/erp/src/main/resources/template/js/salesorder/salesorderedit.js
@@ -192,7 +192,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "salePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsSalePrice");
 
 	// 保存为草稿
 	form.on('submit(formEditBean)', function(data) {
diff --git a/erp/src/main/resources/template/js/salesorder/salesorderpurchase.js b/erp/src/main/resources/template/js/salesorder/salesorderpurchase.js
index dfee0539af5d505192266b6e2b8ef5ef4413828a..c3523b376580a6a155fe544ba85ff92277a11aeb 100644
--- a/erp/src/main/resources/template/js/salesorder/salesorderpurchase.js
+++ b/erp/src/main/resources/template/js/salesorder/salesorderpurchase.js
@@ -203,7 +203,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "salePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsSalePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/salesoutlet/salesoutletadd.js b/erp/src/main/resources/template/js/salesoutlet/salesoutletadd.js
index 6bb07f1bde1aca884c2652d59405c263ddb93933..213c25ed1a33fa5faa25a4cdd85fb7f2987af0ef 100644
--- a/erp/src/main/resources/template/js/salesoutlet/salesoutletadd.js
+++ b/erp/src/main/resources/template/js/salesoutlet/salesoutletadd.js
@@ -108,7 +108,7 @@ layui.config({
 	matchingLanguage();
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "salePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsSalePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/salesoutlet/salesoutletedit.js b/erp/src/main/resources/template/js/salesoutlet/salesoutletedit.js
index 816ee1e313ae6a51890ff81f8bece8d6ee1c0017..d8068af157ddd0c26574326e9e91cbdec1219f0a 100644
--- a/erp/src/main/resources/template/js/salesoutlet/salesoutletedit.js
+++ b/erp/src/main/resources/template/js/salesoutlet/salesoutletedit.js
@@ -196,7 +196,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "salePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsSalePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/salesreturns/salesreturnsadd.js b/erp/src/main/resources/template/js/salesreturns/salesreturnsadd.js
index 2c3df5aeed0ecd7e67c2c3c74773de021dc4aa24..ea0b5afe5eacba17327f87127d649d7d1d68c82b 100644
--- a/erp/src/main/resources/template/js/salesreturns/salesreturnsadd.js
+++ b/erp/src/main/resources/template/js/salesreturns/salesreturnsadd.js
@@ -110,7 +110,7 @@ layui.config({
 	matchingLanguage();
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "salePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsSalePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/salesreturns/salesreturnsedit.js b/erp/src/main/resources/template/js/salesreturns/salesreturnsedit.js
index 36152c55cce52c5a470372c97f4426a57f6a35dc..be590642e70f43df7052577e8dc43ec94ff2038f 100644
--- a/erp/src/main/resources/template/js/salesreturns/salesreturnsedit.js
+++ b/erp/src/main/resources/template/js/salesreturns/salesreturnsedit.js
@@ -193,7 +193,7 @@ layui.config({
 	}
 
 	// 商品规格加载变化事件
-	mUnitChangeEvent(form, allChooseProduct, "salePrice");
+	mUnitChangeEvent(form, allChooseProduct, "normsSalePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/splitlist/splitlistadd.js b/erp/src/main/resources/template/js/splitlist/splitlistadd.js
index e9dbcb8e96985f8ca5462d4be9d9b4b8a8d2b72d..1278712cd2dd4c4ad3feb4af27733857f1fca356 100644
--- a/erp/src/main/resources/template/js/splitlist/splitlistadd.js
+++ b/erp/src/main/resources/template/js/splitlist/splitlistadd.js
@@ -56,7 +56,7 @@ layui.config({
 		matchingLanguage();
 
 		// 商品规格加载变化事件
-		mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice", calculatedTotalPrice);
+		mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice", calculatedTotalPrice);
 
 		// 仓库变化事件
 		form.on('select(depotId)', function(data) {
diff --git a/erp/src/main/resources/template/js/splitlist/splitlistedit.js b/erp/src/main/resources/template/js/splitlist/splitlistedit.js
index 9b36a77007585774b410ece2e04b3494d7bab708..7f1a155958239d1fdf0cb94141ee845ec5289e5a 100644
--- a/erp/src/main/resources/template/js/splitlist/splitlistedit.js
+++ b/erp/src/main/resources/template/js/splitlist/splitlistedit.js
@@ -110,7 +110,7 @@ layui.config({
 		}
 
 		// 商品规格加载变化事件
-		mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice", calculatedTotalPrice);
+		mUnitChangeEvent(form, allChooseProduct, "normsEstimatePurchasePrice", calculatedTotalPrice);
 
 		// 仓库变化事件
 		form.on('select(depotId)', function(data) {
diff --git a/seal-service/src/main/resources/template/js/partsclaim/partsclaimadd.js b/seal-service/src/main/resources/template/js/partsclaim/partsclaimadd.js
index 0ef3a98a5dcd1d2439fec067a16c21cea5af07ce..d88bf6c6331da5a29c242745bf19fa2beb039990 100644
--- a/seal-service/src/main/resources/template/js/partsclaim/partsclaimadd.js
+++ b/seal-service/src/main/resources/template/js/partsclaim/partsclaimadd.js
@@ -53,8 +53,8 @@ layui.config({
 					if(thisRowValue == bean.id){// 获取规格
 						// 获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-						$("#unitPrice" + thisRowNum).html(bean.retailPrice.toFixed(2));// 单价
-						$("#amountOfMoney" + thisRowNum).html((rkNum * parseFloat(bean.retailPrice)).toFixed(2));// 金额
+						$("#unitPrice" + thisRowNum).html(bean.normsRetailPrice.toFixed(2));// 单价
+						$("#amountOfMoney" + thisRowNum).html((rkNum * parseFloat(bean.normsRetailPrice)).toFixed(2));// 金额
 						return false;
 					}
 				});
diff --git a/seal-service/src/main/resources/template/js/partsclaim/partsclaimedit.js b/seal-service/src/main/resources/template/js/partsclaim/partsclaimedit.js
index 0475a41205d91cc773a7eee2369a9c628808482d..b032286a29daba3821c906e1745564d8a528e5c5 100644
--- a/seal-service/src/main/resources/template/js/partsclaim/partsclaimedit.js
+++ b/seal-service/src/main/resources/template/js/partsclaim/partsclaimedit.js
@@ -111,8 +111,8 @@ layui.config({
 					if(thisRowValue == bean.id){// 获取规格
 						// 获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-						$("#unitPrice" + thisRowNum).html(bean.retailPrice.toFixed(2));// 单价
-						$("#amountOfMoney" + thisRowNum).html((rkNum * parseFloat(bean.retailPrice)).toFixed(2));// 金额
+						$("#unitPrice" + thisRowNum).html(bean.normsRetailPrice.toFixed(2));// 单价
+						$("#amountOfMoney" + thisRowNum).html((rkNum * parseFloat(bean.normsRetailPrice)).toFixed(2));// 金额
 						return false;
 					}
 				});
diff --git a/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinished.js b/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinished.js
index 3fdb9b015cbed73d066f536b374adc84544d570c..264a5ccce6961d44a68f795d4ebe2d23ae93e660 100644
--- a/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinished.js
+++ b/seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinished.js
@@ -66,8 +66,8 @@ layui.config({
 							if(thisRowValue == bean.id){// 获取规格
 								// 获取当前行数量
 								var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-								$("#unitPrice" + thisRowNum).html(bean.retailPrice.toFixed(2));// 单价
-								$("#amountOfMoney" + thisRowNum).html((rkNum * parseFloat(bean.retailPrice)).toFixed(2));// 金额
+								$("#unitPrice" + thisRowNum).html(bean.normsRetailPrice.toFixed(2));// 单价
+								$("#amountOfMoney" + thisRowNum).html((rkNum * parseFloat(bean.normsRetailPrice)).toFixed(2));// 金额
 								return false;
 							}
 						});