ERP商品名称属性修改

erp-produce/src/main/resources/template/js/erpBom/erpBomAdd.js

@@ -57,7 +57,7 @@ layui.config({
             	
                 var params = {
                     bomTitle: $("#bomTitle").val(),
-                    materialId: isNull(erpOrderUtil.chooseProductMation.productId) ? '' : erpOrderUtil.chooseProductMation.productId,//商品id
+                    materialId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//商品id
                     normsId: $("#unitList").val(),
                     remark: $("#remark").val(),
                     sealPrice: getSealPrice(erpOrderUtil.chooseProductMation.unitList, $("#unitList").val()),
@@ -316,8 +316,8 @@ layui.config({
 	    // 商品选择
  	    $("body").on("click", "#productNameSel", function (e) {
 			erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
-				$("#productName").val(chooseProductMation.productName);
-				$("#productModel").val(chooseProductMation.productModel);
+				$("#productName").val(chooseProductMation.materialName);
+				$("#productModel").val(chooseProductMation.materialModel);
 				$("#unitList").html(getDataUseHandlebars(selTemplate, {rows: chooseProductMation.unitList}));
 				form.render("select");
 			});

erp-produce/src/main/resources/template/js/erpBom/erpBomEdit.js

@@ -20,18 +20,17 @@ layui.config({
         
         var ztreeNode = new Array();
         	
-	    //下拉框模板
 	    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) {
 			$("#showForm").html(getDataUseHandlebars($("#mainHtml").html(), json));
 			textool.init({eleId: 'remark', maxlength: 200});
 
-			//初始化父件商品信息
+			// 初始化父件商品信息
 			erpOrderUtil.chooseProductMation = {
-				productId: json.bean.productId,
-				productName: json.bean.productName,
-				productModel: json.bean.productModel,
+				materialId: json.bean.productId,
+				materialName: json.bean.productName,
+				materialModel: json.bean.productModel,
 				unitList: json.bean.unitList
 			};
 
@@ -79,7 +78,7 @@ layui.config({
             	
                 var params = {
                     bomTitle: $("#bomTitle").val(),
-                    materialId: isNull(erpOrderUtil.chooseProductMation.productId) ? '' : erpOrderUtil.chooseProductMation.productId,//商品id
+                    materialId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//商品id
                     normsId: $("#unitList").val(),
                     remark: $("#remark").val(),
                     sealPrice: getSealPrice(erpOrderUtil.chooseProductMation.unitList, $("#unitList").val()),
@@ -335,8 +334,8 @@ layui.config({
 	    // 商品选择
  	    $("body").on("click", "#productNameSel", function (e) {
 			erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
-				$("#productName").val(chooseProductMation.productName);
-				$("#productModel").val(chooseProductMation.productModel);
+				$("#productName").val(chooseProductMation.materialName);
+				$("#productModel").val(chooseProductMation.materialModel);
 				$("#unitList").html(getDataUseHandlebars(selTemplate, {rows: chooseProductMation.unitList}));
 				form.render("select");
 			});

erp-produce/src/main/resources/template/js/erpMachin/erpMachinAdd.js

@@ -103,14 +103,14 @@ layui.config({
 						return false;
 					}
 					// 商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#mUnitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#mUnitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
-						materialId: product.productId,
+						materialId: material.materialId,
 						mUnitId: $("#mUnitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						unitPrice: $("#unitPrice" + rowNum).val()
@@ -123,7 +123,7 @@ layui.config({
 				
 				var params = {
 			    	orderId: isNull(productionMation.id) ? '' : productionMation.id,
-			    	materialId: machinPro.productId,
+			    	materialId: machinPro.materialId,
 			    	normsId: $("#unitList").val(),
 			    	departmentId: $("#departmentId").val(),
 			    	number: $("#number").val(),
@@ -166,8 +166,8 @@ layui.config({
 				procedureMationList = [];
 				$("#procedureBody").html("");
 				//重置成品信息
-				$("#productName").val(machinPro.productName);
-				$("#productModel").val(machinPro.productModel);
+				$("#productName").val(machinPro.materialName);
+				$("#productModel").val(machinPro.materialModel);
 				$("#unitList").html(getDataUseHandlebars(selOption, {rows: machinPro.unitList}));
 				$("#number").val(1);
 				//重置单据信息
@@ -249,7 +249,7 @@ layui.config({
 				//商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				//表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				//表格单位赋值
 				$("#mUnitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');
@@ -267,15 +267,15 @@ layui.config({
  				area: ['90vw', '90vh'],
  				callBack: function (refreshCode) {
 					$("#productionOrder").val(productionMation.defaultNumber);
-					//加工产品信息
+					// 加工产品信息
 					machinPro = {
-						productId: productionMation.materialId,
-						productName: productionMation.materialName,
-						productModel: productionMation.materialModel,
+						materialId: productionMation.materialId,
+						materialName: productionMation.materialName,
+						materialModel: productionMation.materialModel,
 						unitList: productionMation.unitList
 					};
-					$("#productName").val(machinPro.productName);
-					$("#productModel").val(machinPro.productModel);
+					$("#productName").val(machinPro.materialName);
+					$("#productModel").val(machinPro.materialModel);
 					$("#unitList").html(getDataUseHandlebars(selOption, {rows: machinPro.unitList}));
 					$("#unitList").val(productionMation.normsId);
 					$("#number").val(productionMation.number);
@@ -309,7 +309,7 @@ layui.config({
 						$("#mUnitId" + (rowNum - 1)).html(getDataUseHandlebars(selOption, {rows: item.product.unitList}));
 						$("#mUnitId" + (rowNum - 1)).val(item.normsId);
 						//商品回显
-						$("#materialId" + (rowNum - 1)).val(item.product.productName + "(" + item.product.productModel + ")");
+						$("#materialId" + (rowNum - 1)).val(item.product.materialName + "(" + item.product.materialModel + ")");
 						$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显
 						//所需总数量
 						$("#productionNum" + (rowNum - 1)).html(item.productionNum);

erp-produce/src/main/resources/template/js/erpMachin/erpMachinEdit.js

@@ -59,13 +59,13 @@ layui.config({
 				}
 				//加工产品信息
 				machinPro = {
-					productId: data.materialId,
-					productName: data.materialName,
-					productModel: data.materialModel,
+					materialId: data.materialId,
+					materialName: data.materialName,
+					materialModel: data.materialModel,
 					unitList: data.unitList
 				};
-				$("#productName").val(machinPro.productName);
-				$("#productModel").val(machinPro.productModel);
+				$("#productName").val(machinPro.materialName);
+				$("#productModel").val(machinPro.materialModel);
 				$("#unitList").html(getDataUseHandlebars(selOption, {rows: machinPro.unitList}));
 				$("#unitList").val(data.normsId);
 				$("#number").val(data.needNum);
@@ -170,14 +170,14 @@ layui.config({
 						return false;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#mUnitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#mUnitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
-						materialId: product.productId,
+						materialId: material.materialId,
 						mUnitId: $("#mUnitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						unitPrice: $("#unitPrice" + rowNum).val()
@@ -190,7 +190,7 @@ layui.config({
 				
 				var params = {
 			    	orderId: isNull(productionMation.id) ? '' : productionMation.id,
-			    	materialId: machinPro.productId,
+			    	materialId: machinPro.materialId,
 			    	normsId: $("#unitList").val(),
 			    	departmentId: $("#departmentId").val(),
 			    	number: $("#number").val(),
@@ -234,8 +234,8 @@ layui.config({
 				procedureMationList = [];
 				$("#procedureBody").html("");
 				//重置成品信息
-				$("#productName").val(machinPro.productName);
-				$("#productModel").val(machinPro.productModel);
+				$("#productName").val(machinPro.materialName);
+				$("#productModel").val(machinPro.materialModel);
 				$("#unitList").html(getDataUseHandlebars(selOption, {rows: machinPro.unitList}));
 				$("#number").val(1);
 				//重置单据信息
@@ -317,7 +317,7 @@ layui.config({
 				//商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				//表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				//表格单位赋值
 				$("#mUnitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');
@@ -337,13 +337,13 @@ layui.config({
 					$("#productionOrder").val(productionMation.defaultNumber);
 					//加工产品信息
 					machinPro = {
-						productId: productionMation.materialId,
-						productName: productionMation.materialName,
-						productModel: productionMation.materialModel,
+						materialId: productionMation.materialId,
+						materialName: productionMation.materialName,
+						materialModel: productionMation.materialModel,
 						unitList: productionMation.unitList
 					};
-					$("#productName").val(machinPro.productName);
-					$("#productModel").val(machinPro.productModel);
+					$("#productName").val(machinPro.materialName);
+					$("#productModel").val(machinPro.materialModel);
 					$("#unitList").html(getDataUseHandlebars(selOption, {rows: machinPro.unitList}));
 					$("#unitList").val(productionMation.normsId);
 					$("#number").val(productionMation.number);
@@ -377,7 +377,7 @@ layui.config({
 						$("#mUnitId" + (rowNum - 1)).html(getDataUseHandlebars(selOption, {rows: item.product.unitList}));
 						$("#mUnitId" + (rowNum - 1)).val(item.normsId);
 						//商品回显
-						$("#materialId" + (rowNum - 1)).val(item.product.productName + "(" + item.product.productModel + ")");
+						$("#materialId" + (rowNum - 1)).val(item.product.materialName + "(" + item.product.materialModel + ")");
 						$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显
 						//所需总数量
 						$("#productionNum" + (rowNum - 1)).html(item.productionNum);

erp-produce/src/main/resources/template/js/erpPick/erpPatchAdd.js

@@ -90,14 +90,14 @@ layui.config({
 						return false;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#unitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#unitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
-						materialId: product.productId,
+						materialId: material.materialId,
 						mUnitId: $("#unitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						unitPrice: $("#unitPrice" + rowNum).val()
@@ -180,7 +180,7 @@ layui.config({
 				//商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				//表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				//表格单位赋值
 				$("#unitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');

erp-produce/src/main/resources/template/js/erpPick/erpPatchEdit.js

@@ -124,14 +124,14 @@ layui.config({
 						return false;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#unitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#unitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
-						materialId: product.productId,
+						materialId: material.materialId,
 						mUnitId: $("#unitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						unitPrice: $("#unitPrice" + rowNum).val()
@@ -215,7 +215,7 @@ layui.config({
 				//商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				//表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				//表格单位赋值
 				$("#unitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');

erp-produce/src/main/resources/template/js/erpPick/erpRequisitionAdd.js

@@ -90,14 +90,14 @@ layui.config({
 						return false;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#unitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#unitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
-						materialId: product.productId,
+						materialId: material.materialId,
 						mUnitId: $("#unitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						unitPrice: $("#unitPrice" + rowNum).val()
@@ -182,7 +182,7 @@ layui.config({
 				//商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				//表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				//表格单位赋值
 				$("#unitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');

erp-produce/src/main/resources/template/js/erpPick/erpRequisitionEdit.js

@@ -39,7 +39,7 @@ layui.config({
 		});
 
  		function loadData(){
-			AjaxPostUtil.request({url:flowableBasePath + "erppick007", params: {id: parent.rowId}, type: 'json', method: 'GET', callback: function (json) {
+			AjaxPostUtil.request({url: flowableBasePath + "erppick007", params: {id: parent.rowId}, type: 'json', method: 'GET', callback: function (json) {
 				var data = json.bean;
 				if (!isNull(data.machinId)){
 					$("#machinOrder").val(data.machinNum);
@@ -134,14 +134,14 @@ layui.config({
 						return false;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#unitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#unitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
-						materialId: product.productId,
+						materialId: material.materialId,
 						mUnitId: $("#unitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						unitPrice: $("#unitPrice" + rowNum).val()
@@ -227,7 +227,7 @@ layui.config({
 				//商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				//表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				//表格单位赋值
 				$("#unitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');

erp-produce/src/main/resources/template/js/erpPick/erpReturnAdd.js

@@ -86,14 +86,14 @@ layui.config({
 						return false;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#unitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#unitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
-						materialId: product.productId,
+						materialId: material.materialId,
 						mUnitId: $("#unitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						unitPrice: $("#unitPrice" + rowNum).val()
@@ -174,7 +174,7 @@ layui.config({
 				//商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				//表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				//表格单位赋值
 				$("#unitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');

erp-produce/src/main/resources/template/js/erpPick/erpReturnEdit.js

@@ -115,14 +115,14 @@ layui.config({
 						return false;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#unitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#unitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
-						materialId: product.productId,
+						materialId: material.materialId,
 						mUnitId: $("#unitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						unitPrice: $("#unitPrice" + rowNum).val()
@@ -204,7 +204,7 @@ layui.config({
 				//商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				//表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				//表格单位赋值
 				$("#unitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');

erp-produce/src/main/resources/template/js/erpProduction/erpProductionAdd.js

@@ -96,9 +96,9 @@ layui.config({
 	    	$.each(childProList, function(i, item) {
 	    		//单位所需数量*生产数量-库存抵扣数量
 	    		var proposal = number * parseInt(item.needNum) - parseInt(item.currentTock);
-				$("#proposal" + item.productId).val(proposal < 0 ? 0 : proposal);
+				$("#proposal" + item.materialId).val(proposal < 0 ? 0 : proposal);
 				//需求数量=单位所需数量*生产数量
-				$("#needNum" + item.productId).html(number * parseInt(item.needNum));
+				$("#needNum" + item.materialId).html(number * parseInt(item.needNum));
 			});
 	    }
 	    
@@ -116,7 +116,7 @@ layui.config({
 	        	}
 			    var params = {
 			    	orderId: isNull(salesOrder.orderHeaderId) ? '' : salesOrder.orderHeaderId,
-			    	materialId: erpOrderUtil.chooseProductMation.productId,
+			    	materialId: erpOrderUtil.chooseProductMation.materialId,
 			    	normsId: $("#unitList").val(),
 			    	number: $("#number").val(),
 			    	planStartDate: $("#planStartDate").val(),
@@ -132,9 +132,9 @@ layui.config({
  	        	var childList = [];
  	        	$.each(childProList, function(i, item) {
  	        		childList.push({
- 	        			materialId: item.productId,
+ 	        			materialId: item.materialId,
  	        			normsId: item.normsId,
- 	        			number: $("#proposal" + item.productId).val(),
+ 	        			number: $("#proposal" + item.materialId).val(),
  	        			unitNumber: item.needNum,
  	        			unitPrice: item.unitPrice
  	        		});
@@ -190,8 +190,8 @@ layui.config({
 	    // 商品选择
  	    $("body").on("click", "#productNameSel", function (e) {
 			erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
-				$("#materialName").val(chooseProductMation.productName);
-				$("#materialModel").val(chooseProductMation.productModel);
+				$("#materialName").val(chooseProductMation.materialName);
+				$("#materialModel").val(chooseProductMation.materialModel);
 				$("#unitList").html(getDataUseHandlebars(selTemplate, {rows: chooseProductMation.unitList}));
 				//重置单据信息
 				salesOrder = {};
@@ -211,12 +211,12 @@ layui.config({
  				area: ['90vw', '90vh'],
  				callBack: function (refreshCode) {
 					erpOrderUtil.chooseProductMation = {
-						productName: salesOrder.materialName,
-						productModel: salesOrder.materialModel,
-						productId: salesOrder.materialId
+						materialName: salesOrder.materialName,
+						materialModel: salesOrder.materialModel,
+						materialId: salesOrder.materialId
 					};
-					$("#materialName").val(erpOrderUtil.chooseProductMation.productName);
-					$("#materialModel").val(erpOrderUtil.chooseProductMation.productModel);
+					$("#materialName").val(erpOrderUtil.chooseProductMation.materialName);
+					$("#materialModel").val(erpOrderUtil.chooseProductMation.materialModel);
 					//加载数量
 					$("#number").val(salesOrder.operNum);
 					//单号

erp-produce/src/main/resources/template/js/erpProduction/erpProductionEdit.js

@@ -43,9 +43,9 @@ layui.config({
  		AjaxPostUtil.request({url: flowableBasePath + "erpproduction003", params: {id: parent.rowId}, type: 'json', method: "GET", callback: function (json) {
 			// 商品信息
 			erpOrderUtil.chooseProductMation = {
-				productId: json.bean.productId,
-				productName: json.bean.materialName,
-				productModel: json.bean.materialModel
+				materialId: json.bean.materialId,
+				materialName: json.bean.materialName,
+				materialModel: json.bean.materialModel
 			};
 			$("#materialName").val(json.bean.materialName);
 			$("#materialModel").val(json.bean.materialModel);
@@ -80,9 +80,9 @@ layui.config({
 			childProList = [].concat(json.bean.childList);
 			$("#tBody").html(getDataUseHandlebars($("#tableBody").html(), {rows: childProList}));
 			$.each(childProList, function(i, item) {
-				$("#proposal" + item.productId).val(item.number);
+				$("#proposal" + item.materialId).val(item.number);
 				//需求数量=生产数量*单位所需数量
-				$("#needNum" + item.productId).html(parseInt(json.bean.number) * parseInt(item.needNum));
+				$("#needNum" + item.materialId).html(parseInt(json.bean.number) * parseInt(item.needNum));
 			});
 			// 工艺路线赋值
 			wayProcedureMation.id = json.bean.wayProcedureId;
@@ -147,9 +147,9 @@ layui.config({
 	    	$.each(childProList, function(i, item) {
 	    		//单位所需数量*生产数量-库存抵扣数量
 	    		var proposal = number * parseInt(item.needNum) - parseInt(item.currentTock);
-				$("#proposal" + item.productId).val(proposal < 0 ? 0 : proposal);
+				$("#proposal" + item.materialId).val(proposal < 0 ? 0 : proposal);
 				//需求数量=单位所需数量*生产数量
-				$("#needNum" + item.productId).html(number * parseInt(item.needNum));
+				$("#needNum" + item.materialId).html(number * parseInt(item.needNum));
 			});
 	    }
 	    
@@ -165,7 +165,7 @@ layui.config({
 	        	}
 			    var params = {
 			    	orderId: isNull(salesOrder.orderHeaderId) ? '' : salesOrder.orderHeaderId,
-			    	materialId: erpOrderUtil.chooseProductMation.productId,
+			    	materialId: erpOrderUtil.chooseProductMation.materialId,
 			    	normsId: $("#unitList").val(),
 			    	number: $("#number").val(),
 			    	planStartDate: $("#planStartDate").val(),
@@ -182,9 +182,9 @@ layui.config({
  	        	var childList = [];
  	        	$.each(childProList, function(i, item) {
  	        		childList.push({
- 	        			materialId: item.productId,
+ 	        			materialId: item.materialId,
  	        			normsId: item.normsId,
- 	        			number: $("#proposal" + item.productId).val(),
+ 	        			number: $("#proposal" + item.materialId).val(),
  	        			unitNumber: item.needNum,
  	        			unitPrice: item.normsPurchasePrice
  	        		});
@@ -240,8 +240,8 @@ layui.config({
 	    //商品选择
  	    $("body").on("click", "#productNameSel", function (e) {
 			erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
-				$("#materialName").val(chooseProductMation.productName);
-				$("#materialModel").val(chooseProductMation.productModel);
+				$("#materialName").val(chooseProductMation.materialName);
+				$("#materialModel").val(chooseProductMation.materialModel);
 				$("#unitList").html(getDataUseHandlebars(selTemplate, {rows: chooseProductMation.unitList}));
 				//重置单据信息
 				salesOrder = {};
@@ -261,12 +261,12 @@ layui.config({
  				area: ['90vw', '90vh'],
  				callBack: function (refreshCode) {
 					erpOrderUtil.chooseProductMation = {
-						productName: salesOrder.materialName,
-						productModel: salesOrder.materialModel,
-						productId: salesOrder.materialId
+						materialName: salesOrder.materialName,
+						materialModel: salesOrder.materialModel,
+						materialId: salesOrder.materialId
 					};
-					$("#materialName").val(erpOrderUtil.chooseProductMation.productName);
-					$("#materialModel").val(erpOrderUtil.chooseProductMation.productModel);
+					$("#materialName").val(erpOrderUtil.chooseProductMation.materialName);
+					$("#materialModel").val(erpOrderUtil.chooseProductMation.materialModel);
 					//加载数量
 					$("#number").val(salesOrder.operNum);
 					//单号

erp-produce/src/main/resources/template/tpl/erpProduction/erpProductionEdit.html

@@ -141,9 +141,9 @@
 	
 	<script type="text/html" id="tableBody">
 		{{#each rows}}
-			<tr rowid="{{productId}}">
-               	<td id="name{{productId}}">{{materialName}}</td>
-               	<td id="model{{productId}}">{{materialModel}}</td>
+			<tr rowid="{{materialId}}">
+               	<td id="name{{materialId}}">{{materialName}}</td>
+               	<td id="model{{materialId}}">{{materialModel}}</td>
 				<td>{{categoryName}}</td>
                	<td>{{typeName}}</td>
 				<td>
@@ -152,11 +152,11 @@
 					{{/each}}
 				</td>
                	<td style="text-align: center;">{{needNum}}{{unitName}}</td>
-				<td style="text-align: center;" id="needNum{{productId}}">{{needNum}}</td>
+				<td style="text-align: center;" id="needNum{{materialId}}">{{needNum}}</td>
                	<td>{{currentTock}}</td>
 				<td>{{beWarehousedNum}}</td>
 				<td>
-					<input type="text" id="proposal{{productId}}" name="proposal{{productId}}" win-verify="required|number" placeholder="请输入采购或生产数量" class="layui-input"/>
+					<input type="text" id="proposal{{materialId}}" name="proposal{{materialId}}" win-verify="required|number" placeholder="请输入采购或生产数量" class="layui-input"/>
 				</td>
             </tr>
 		{{/each}}

erp/src/main/resources/template/js/allocation/allocationadd.js

@@ -129,13 +129,13 @@ layui.config({
 						return false;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + thisRowKey];
-					if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+					var material = allChooseProduct["tr" + thisRowKey];
+					if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
-					item["materialId"] = product.productId;
+					item["materialId"] = material.materialId;
 					item["depotId"] = $("#depotId").val();
 					item["anotherDepotId"] = $("#inDepotId").val(),
 					tableData.push(item);

erp/src/main/resources/template/js/allocation/allocationedit.js

@@ -59,7 +59,7 @@ layui.config({
 					"materialType": {
 						"value": item.mType
 					},
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -181,13 +181,13 @@ layui.config({
 						return false;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + thisRowKey];
-					if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+					var material = allChooseProduct["tr" + thisRowKey];
+					if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
-					item["materialId"] = product.productId;
+					item["materialId"] = material.materialId;
 					item["depotId"] = $("#depotId").val();
 					item["anotherDepotId"] = $("#inDepotId").val(),
 						tableData.push(item);

erp/src/main/resources/template/js/assemblysheet/assemblysheetadd.js

@@ -146,13 +146,13 @@ layui.config({
 						hasSplit = true;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + thisRowKey];
-					if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+					var material = allChooseProduct["tr" + thisRowKey];
+					if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
-					item["materialId"] = product.productId;
+					item["materialId"] = material.materialId;
 					item["depotId"] = $("#depotId").val();
 					tableData.push(item);
 				});

erp/src/main/resources/template/js/assemblysheet/assemblysheetedit.js

@@ -57,7 +57,7 @@ layui.config({
 					"materialType": {
 						"value": item.mType
 					},
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -199,13 +199,13 @@ layui.config({
 						hasSplit = true;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + thisRowKey];
-					if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+					var material = allChooseProduct["tr" + thisRowKey];
+					if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
-					item["materialId"] = product.productId;
+					item["materialId"] = material.materialId;
 					item["depotId"] = $("#depotId").val();
 					tableData.push(item);
 				});

erp/src/main/resources/template/js/erpcommon/loadStock.js

@@ -136,7 +136,7 @@ function initChooseProductBtnEnent (form, callback, calcPriceCallback) {
             // 获取表格行号
             var thisRowKey = trId.replace("tr", "");
             // 表格商品名称赋值
-            $("#materialId" + thisRowKey.toString()).val(chooseProductMation.productName + "(" + chooseProductMation.productModel + ")");
+            $("#materialId" + thisRowKey.toString()).val(chooseProductMation.materialName + "(" + chooseProductMation.materialModel + ")");
             // 表格单位赋值
             $("#mUnitId" + thisRowKey.toString()).html(getDataUseHandlebars(selOptionHtml, {rows: chooseProductMation.unitList}));
             form.render('select');

erp/src/main/resources/template/js/material/materialChoose.js

@@ -86,17 +86,17 @@ layui.config({
 			//初始化值
 			var ids = [];
 			$.each(parent.erpOrderUtil.chooseProductMation, function(i, item) {
-				ids.push(item.productId);
+				ids.push(item.materialId);
 			});
 			tableCheckBoxUtil.setIds({
 				gridId: 'messageTable',
-				fieldName: 'productId',
+				fieldName: 'materialId',
 				ids: ids
 			});
 			tableCheckBoxUtil.init({
 				gridId: 'messageTable',
 				filterId: 'messageTable',
-				fieldName: 'productId'
+				fieldName: 'materialId'
 			});
 		}
 			
@@ -113,10 +113,10 @@ layui.config({
 		    cols: [[
 		    	{ type: checkType == '1' ? 'radio' : 'checkbox'},
 		        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-		        { field: 'productName', title: '商品名称', align: 'left', width: 150, templet: function (d) {
-			        	return '<a lay-event="details" class="notice-title-click">' + d.productName + '</a>';
+		        { field: 'materialName', title: '商品名称', align: 'left', width: 150, templet: function (d) {
+			        	return '<a lay-event="details" class="notice-title-click">' + d.materialName + '</a>';
 			    }},
-		        { field: 'productModel', title: '型号', align: 'left', width: 150 },
+		        { field: 'materialModel', title: '型号', align: 'left', width: 150 },
 		        { field: 'categoryName', title: '所属类型', align: 'left', width: 100 },
 		        { field: 'typeName', title: '商品来源', align: 'left', width: 100 },
 		        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }
@@ -145,7 +145,7 @@ layui.config({
 		    		// 多选,设置选中
 		    		tableCheckBoxUtil.checkedDefault({
 						gridId: 'messageTable',
-						fieldName: 'productId'
+						fieldName: 'materialId'
 					});
 		    	}
 
@@ -169,7 +169,7 @@ layui.config({
 	
 	// 详情
 	function details(data) {
-		rowId = data.productId;
+		rowId = data.materialId;
 		_openNewWindows({
 			url: "../../tpl/material/materialdetails.html", 
 			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],

erp/src/main/resources/template/js/otheroutlets/otheroutletsadd.js

@@ -137,13 +137,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/otheroutlets/otheroutletsedit.js

@@ -78,7 +78,7 @@ layui.config({
 					$("#depotId").val(item.depotId);
 				}
 				var params = {
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -209,13 +209,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/otherwarehous/otherwarehousadd.js

@@ -130,13 +130,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/otherwarehous/otherwarehousedit.js

@@ -77,7 +77,7 @@ layui.config({
 					$("#depotId").val(item.depotId);
 				}
 				var params = {
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -201,13 +201,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js

@@ -124,13 +124,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			tableData.push(item);
 		});
 		if (noError) {
@@ -184,7 +184,7 @@ layui.config({
 				initTableChooseUtil.deleteAllRow('productList');
 				$.each(productionMation.norms, function(i, item) {
 					var params = {
-						"materialId": item.product.productName + "(" + item.product.productModel + ")",
+						"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 						"mUnitId": {
 							"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 							"value": item.normsId

erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js

@@ -80,7 +80,7 @@ layui.config({
 			initTableChooseUtil.deleteAllRow('productList');
 			$.each(json.bean.norms, function(i, item) {
 				var params = {
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -197,13 +197,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			tableData.push(item);
 		});
 		if (noError) {
@@ -258,7 +258,7 @@ layui.config({
 				initTableChooseUtil.deleteAllRow('productList');
 				$.each(productionMation.norms, function(i, item) {
 					var params = {
-						"materialId": item.product.productName + "(" + item.product.productModel + ")",
+						"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 						"mUnitId": {
 							"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 							"value": item.normsId

erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js

@@ -93,7 +93,7 @@ layui.config({
 			initTableChooseUtil.deleteAllRow('productList');
 			$.each(json.bean.items, function(i, item) {
 				var params = {
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -239,13 +239,13 @@ layui.config({
 			}
 
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/purchaseput/purchaseputadd.js

@@ -151,13 +151,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/purchaseput/purchaseputedit.js

@@ -82,7 +82,7 @@ layui.config({
 					$("#depotId").val(item.depotId);
 				}
 				var params = {
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -234,13 +234,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/purchasereturns/purchasereturnsadd.js

@@ -155,13 +155,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/purchasereturns/purchasereturnsedit.js

@@ -87,7 +87,7 @@ layui.config({
 					$("#depotId").val(item.depotId);
 				}
 				var params = {
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -239,13 +239,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/retailoutlet/retailoutletadd.js

@@ -179,13 +179,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/retailoutlet/retailoutletedit.js

@@ -79,7 +79,7 @@ layui.config({
 				$("#depotId").val(item.depotId);
 			}
 			var params = {
-				"materialId": item.product.productName + "(" + item.product.productModel + ")",
+				"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 				"mUnitId": {
 					"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 					"value": item.mUnitId
@@ -254,13 +254,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/retailreturns/retailreturnsadd.js

@@ -179,13 +179,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/retailreturns/retailreturnsedit.js

@@ -79,7 +79,7 @@ layui.config({
 				$("#depotId").val(item.depotId);
 			}
 			var params = {
-				"materialId": item.product.productName + "(" + item.product.productModel + ")",
+				"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 				"mUnitId": {
 					"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 					"value": item.mUnitId
@@ -254,13 +254,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/salesorder/salesorderadd.js

@@ -148,13 +148,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			tableData.push(item);
 		});
 		if (noError) {

erp/src/main/resources/template/js/salesorder/salesorderedit.js

@@ -85,7 +85,7 @@ layui.config({
 					$("#depotId").val(item.depotId);
 				}
 				var params = {
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -246,13 +246,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			tableData.push(item);
 		});
 		if (noError) {

erp/src/main/resources/template/js/salesorder/salesorderpurchase.js

@@ -259,13 +259,13 @@ layui.config({
 			}
 
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/salesoutlet/salesoutletadd.js

@@ -159,13 +159,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/salesoutlet/salesoutletedit.js

@@ -89,7 +89,7 @@ layui.config({
 					$("#depotId").val(item.depotId);
 				}
 				var params = {
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -255,13 +255,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/salesreturns/salesreturnsadd.js

@@ -161,13 +161,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/salesreturns/salesreturnsedit.js

@@ -89,7 +89,7 @@ layui.config({
 					$("#depotId").val(item.depotId);
 				}
 				var params = {
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -256,13 +256,13 @@ layui.config({
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + thisRowKey];
-			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+			var material = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			item["materialId"] = product.productId;
+			item["materialId"] = material.materialId;
 			item["depotId"] = $("#depotId").val();
 			tableData.push(item);
 		});

erp/src/main/resources/template/js/splitlist/splitlistadd.js

@@ -146,13 +146,13 @@ layui.config({
 						hasSplit = true;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + thisRowKey];
-					if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+					var material = allChooseProduct["tr" + thisRowKey];
+					if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
-					item["materialId"] = product.productId;
+					item["materialId"] = material.materialId;
 					item["depotId"] = $("#depotId").val();
 					tableData.push(item);
 				});

erp/src/main/resources/template/js/splitlist/splitlistedit.js

@@ -58,7 +58,7 @@ layui.config({
 					"materialType": {
 						"value": item.mType
 					},
-					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"materialId": item.product.materialName + "(" + item.product.materialModel + ")",
 					"mUnitId": {
 						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
 						"value": item.mUnitId
@@ -200,13 +200,13 @@ layui.config({
 						hasSplit = true;
 					}
 					//商品对象
-					var product = allChooseProduct["tr" + thisRowKey];
-					if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
+					var material = allChooseProduct["tr" + thisRowKey];
+					if (inTableDataArrayByAssetarId(material.materialId, item.mUnitId, tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
-					item["materialId"] = product.productId;
+					item["materialId"] = material.materialId;
 					item["depotId"] = $("#depotId").val();
 					tableData.push(item);
 				});

seal-service/src/main/resources/template/js/partsclaim/partsclaimadd.js

@@ -45,11 +45,11 @@ layui.config({
 		// 备件规格加载变化事件
 		form.on('select(selectUnitProperty)', function(data) {
 			var thisRowValue = data.value;
-			var thisRowNum = data.elem.id.replace("unitId", "");// 获取当前行
+			var thisRowNum = data.elem.id.replace("mUnitId", "");
 			// 当前当前行选中的商品信息
 			if (!isNull(thisRowValue) && thisRowValue != '请选择') {
-				var product = allChooseProduct["tr" + thisRowNum.toString()];
-				$.each(product.unitList, function(j, bean) {
+				var material = allChooseProduct["tr" + thisRowNum.toString()];
+				$.each(material.unitList, function(j, bean) {
 					if(thisRowValue == bean.id){// 获取规格
 						// 获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
@@ -132,16 +132,16 @@ layui.config({
 						return false;
 					}
 					// 商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#unitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#mUnitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的配件信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
 						depotId: $("#depotId").val(),
-						materialId: product.productId,
-						mUnitId: $("#unitId" + rowNum).val(),
+						materialId: material.materialId,
+						mUnitId: $("#mUnitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						remark: $("#remark" + rowNum).val()
 					};
@@ -168,10 +168,10 @@ layui.config({
 		});
 		
 		// 判断选中的备件是否也在数组中
-		function inTableDataArrayByAssetarId(materialId, unitId, array) {
+		function inTableDataArrayByAssetarId(materialId, mUnitId, array) {
 			var isIn = false;
 			$.each(array, function(i, item) {
-				if(item.mUnitId === unitId && item.materialId === materialId) {
+				if(item.mUnitId === mUnitId && item.materialId === materialId) {
 					isIn = true;
 					return false;
 				}
@@ -209,7 +209,7 @@ layui.config({
 				id: "row" + rowNum.toString(), // checkbox的id
 				trId: "tr" + rowNum.toString(), // 行的id
 				materialId: "materialId" + rowNum.toString(), // 商品id
-				unitId: "unitId" + rowNum.toString(), // 规格id
+				mUnitId: "mUnitId" + rowNum.toString(), // 规格id
 				currentTock: "currentTock" + rowNum.toString(), // 库存id
 				rkNum: "rkNum" + rowNum.toString(), // 数量id
 				unitPrice: "unitPrice"  + rowNum.toString(), // 单价id
@@ -258,9 +258,9 @@ layui.config({
 				//商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				//表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				//表格单位赋值
-				$("#unitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
+				$("#mUnitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');
 				//计算价格
 				calculatedTotalPrice();

seal-service/src/main/resources/template/js/partsclaim/partsclaimedit.js

@@ -33,7 +33,8 @@ layui.config({
 		showGrid({
 		 	id: "showForm",
 		 	url: flowableBasePath + "sealseservice026",
-		 	params: {rowId: parent.rowId},
+		 	params: {id: parent.rowId},
+			method: 'GET',
 		 	pagination: false,
 		 	template: beanTemplate,
 		 	ajaxSendAfter:function (json) {
@@ -73,8 +74,8 @@ layui.config({
 			$("#serviceId").val(orderObject.bean.orderNum);//工单单号
 			$("#remark").val(orderObject.bean.remark);//备注
 			$("#allPrice").html(orderObject.bean.allPrice.toFixed(2));//总金额
-			//渲染列表项
-			$.each(orderObject.bean.materials, function(i, item) {
+			// 渲染列表项
+			$.each(orderObject.bean.materialList, function(i, item) {
 				addRow();
 				if(i == 0){
 					$("#depotId").val(item.depotId);
@@ -82,10 +83,10 @@ layui.config({
 				//将规格所属的商品信息加入到对象中存储
 				allChooseProduct["tr" + (rowNum - 1)] = item;
 				// 单位回显
-				$("#unitId" + (rowNum - 1)).html(getDataUseHandlebars(selOption, {rows: item.unitList}));
-				$("#unitId" + (rowNum - 1)).val(item.normsId);
+				$("#mUnitId" + (rowNum - 1)).html(getDataUseHandlebars(selOption, {rows: item.unitList}));
+				$("#mUnitId" + (rowNum - 1)).val(item.normsId);
 				// 商品回显
-				$("#materialId" + (rowNum - 1)).val(item.productName + "(" + item.productModel + ")");
+				$("#materialId" + (rowNum - 1)).val(item.materialName + "(" + item.materialModel + ")");
 				$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显
 				$("#rkNum" + (rowNum - 1)).val(item.operNum);//数量回显
 				$("#unitPrice" + (rowNum - 1)).html(item.unitPrice.toFixed(2));//单价回显
@@ -95,7 +96,7 @@ layui.config({
 				$("tr[trcusid='tr" + (rowNum - 1) + "']").attr("thisid", item.id);
 			});
 			// 附件回显
-			skyeyeEnclosure.initTypeISData({'enclosureUpload': json.bean.enclosureInfo});
+			skyeyeEnclosure.initTypeISData({'enclosureUpload': orderObject.bean.enclosureInfo});
 			//渲染
  			form.render();
 		}
@@ -103,11 +104,11 @@ layui.config({
 		// 备件规格加载变化事件
 		form.on('select(selectUnitProperty)', function(data) {
 			var thisRowValue = data.value;
-			var thisRowNum = data.elem.id.replace("unitId", "");// 获取当前行
+			var thisRowNum = data.elem.id.replace("mUnitId", "");
 			// 当前当前行选中的商品信息
 			if (!isNull(thisRowValue) && thisRowValue != '请选择') {
-				var product = allChooseProduct["tr" + thisRowNum.toString()];
-				$.each(product.unitList, function(j, bean) {
+				var material = allChooseProduct["tr" + thisRowNum.toString()];
+				$.each(material.unitList, function(j, bean) {
 					if(thisRowValue == bean.id){// 获取规格
 						// 获取当前行数量
 						var rkNum = parseInt($("#rkNum" + thisRowNum).val());
@@ -189,16 +190,16 @@ layui.config({
 						return false;
 					}
 					// 商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#unitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#mUnitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的配件信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
 						depotId: $("#depotId").val(),
-						materialId: product.productId,
-						mUnitId: $("#unitId" + rowNum).val(),
+						materialId: material.materialId,
+						mUnitId: $("#mUnitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						remark: $("#remark" + rowNum).val()
 					};
@@ -226,10 +227,10 @@ layui.config({
 		});
 		
 		// 判断选中的备件是否也在数组中
-		function inTableDataArrayByAssetarId(materialId, unitId, array) {
+		function inTableDataArrayByAssetarId(materialId, mUnitId, array) {
 			var isIn = false;
 			$.each(array, function(i, item) {
-				if(item.mUnitId === unitId && item.materialId === materialId) {
+				if(item.mUnitId === mUnitId && item.materialId === materialId) {
 					isIn = true;
 					return false;
 				}
@@ -267,7 +268,7 @@ layui.config({
 				id: "row" + rowNum.toString(), // checkbox的id
 				trId: "tr" + rowNum.toString(), // 行的id
 				materialId: "materialId" + rowNum.toString(), //商品id
-				unitId: "unitId" + rowNum.toString(), // 规格id
+				mUnitId: "mUnitId" + rowNum.toString(), // 规格id
 				currentTock: "currentTock" + rowNum.toString(), // 库存id
 				rkNum: "rkNum" + rowNum.toString(), // 数量id
 				unitPrice: "unitPrice"  + rowNum.toString(), // 单价id
@@ -316,9 +317,9 @@ layui.config({
 				//商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				//表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				//表格单位赋值
-				$("#unitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
+				$("#mUnitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');
 				//计算价格
 				calculatedTotalPrice();

seal-service/src/main/resources/template/js/sealseservice/sealseserviceadd.js

@@ -81,7 +81,7 @@ layui.config({
         			areaId: areaId,//区县，可为空
         			townshipId: townshipId,//乡镇，可为空
         			addressDetailed: $("#addressDetailed").val(),//详细地址，不可为空
-        			productId: isNull(erpOrderUtil.chooseProductMation.productId) ? '' : erpOrderUtil.chooseProductMation.productId,//产品id，可为空
+        			productId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//产品id，可为空
         			productName: $("#productName").val(),//产品名称，可为空
         			productNorms: $("#productNorms").val(),//规格型号，可为空
         			productSerialNum: $("#productSerialNum").val(),//序列号，可为空
@@ -214,8 +214,8 @@ layui.config({
  	    //产品选择
  	    $("body").on("click", "#productNameSel", function (e) {
 			erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
-				$("#productName").val(chooseProductMation.productName);
-				$("#productNorms").val(chooseProductMation.productModel);
+				$("#productName").val(chooseProductMation.materialName);
+				$("#productNorms").val(chooseProductMation.materialModel);
 			});
  	    });
  	    

seal-service/src/main/resources/template/js/sealseservice/sealseserviceedit.js

@@ -30,7 +30,7 @@ layui.config({
 		 	ajaxSendLoadBefore: function(hdb) {
 		 	},
 		 	ajaxSendAfter: function (json) {
-				erpOrderUtil.chooseProductMation.productId = json.bean.productId;
+				erpOrderUtil.chooseProductMation.materialId = json.bean.materialId;
 		 		
 		 		textool.init({eleId: 'content', maxlength: 200});
 		 		// 报单时间
@@ -125,7 +125,7 @@ layui.config({
 		        			areaId: areaId,//区县，可为空
 		        			townshipId: townshipId,//乡镇，可为空
 		        			addressDetailed: $("#addressDetailed").val(),//详细地址，不可为空
-		        			productId: isNull(erpOrderUtil.chooseProductMation.productId) ? '' : erpOrderUtil.chooseProductMation.productId,//产品id，可为空
+		        			productId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//产品id，可为空
 		        			productName: $("#productName").val(),//产品名称，可为空
 		        			productNorms: $("#productNorms").val(),//规格型号，可为空
 		        			productSerialNum: $("#productSerialNum").val(),//序列号，可为空
@@ -318,8 +318,8 @@ layui.config({
  	    //产品选择
  	    $("body").on("click", "#productNameSel", function (e) {
 			erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
-				$("#productName").val(chooseProductMation.productName);
-				$("#productNorms").val(chooseProductMation.productModel);
+				$("#productName").val(chooseProductMation.materialName);
+				$("#productNorms").val(chooseProductMation.materialModel);
 			});
  	    });
  	    

seal-service/src/main/resources/template/js/stateisstayfinishedpro/stateisstayfinished.js

@@ -43,10 +43,10 @@ layui.config({
 				// 故障关键组件
 				if (!isNull(json.bean.faultKeyPartsId)){
 					faultKeyParts = {
-						productId: json.bean.faultKeyPartsId,
-						productName: json.bean.faultKeyPartsName
+						materialId: json.bean.faultKeyPartsId,
+						materialName: json.bean.faultKeyPartsName
 					};
-					$("#faultKeyPartsId").val(faultKeyParts.productName);
+					$("#faultKeyPartsId").val(faultKeyParts.materialName);
 				}
 				
 				// 加载配件使用明细
@@ -128,14 +128,14 @@ layui.config({
 						return false;
 					}
 					// 商品对象
-					var product = allChooseProduct["tr" + rowNum.toString()];
-					if(inTableDataArrayByAssetarId(product.productId, $("#unitId" + rowNum).val(), tableData)) {
+					var material = allChooseProduct["tr" + rowNum.toString()];
+					if(inTableDataArrayByAssetarId(material.materialId, $("#unitId" + rowNum).val(), tableData)) {
 						winui.window.msg('一张单中不允许出现相同单位的配件信息.', {icon: 2, time: 2000});
 						noError = true;
 						return false;
 					}
 					var row = {
-						materialId: product.productId,
+						materialId: material.materialId,
 						mUnitId: $("#unitId" + rowNum).val(),
 						rkNum: rkNum.val(),
 						remark: $("#remark" + rowNum).val()
@@ -158,7 +158,7 @@ layui.config({
 					coverCost: $("#coverCost").val(),
 					otherCost: $("#otherCost").val(),
 					comStarTime: $("#comStarTime").val(),
-					faultKeyPartsId: isNull(faultKeyParts.productId) ? "" : faultKeyParts.productId,
+					faultKeyPartsId: isNull(faultKeyParts.materialId) ? "" : faultKeyParts.materialId,
 					actualFailure: $("#actualFailure").val(),
 					solution: $("#solution").val(),
 					useStr: JSON.stringify(tableData),
@@ -194,7 +194,7 @@ layui.config({
 				$("#unitId" + (rowNum - 1)).val(item.normsId);
 				
 				// 商品回显
-				$("#materialId" + (rowNum - 1)).val(item.productName + "(" + item.productModel + ")");
+				$("#materialId" + (rowNum - 1)).val(item.materialName + "(" + item.materialModel + ")");
 				$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显
 				$("#rkNum" + (rowNum - 1)).val(item.operNumber);//数量回显
 				$("#unitPrice" + (rowNum - 1)).html(item.unitPrice.toFixed(2));//单价回显
@@ -307,7 +307,7 @@ layui.config({
 			erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
 				faultKeyParts = chooseProductMation;
 				// 重置故障组件信息
-				$("#faultKeyPartsId").val(faultKeyParts.productName);
+				$("#faultKeyPartsId").val(faultKeyParts.materialName);
 
 				form.render();
 			});
@@ -322,7 +322,7 @@ layui.config({
 				// 商品赋值
 				allChooseProduct[trId] = chooseProductMation;
 				// 表格商品名称赋值
-				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
+				$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].materialName + "(" + allChooseProduct[trId].materialModel + ")");
 				// 表格单位赋值
 				$("#unitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
 				form.render('select');

seal-service/src/main/resources/template/tpl/partsclaim/partsclaimadd.html

@@ -97,7 +97,7 @@
 				<input type="text" id="{{materialId}}" name="{{materialId}}" placeholder="请选择商品" class="layui-input" readonly="readonly"/>
 		        <i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i>
 			</td>
-			<td><select id="{{unitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td>
+			<td><select id="{{mUnitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td>
 			<td id="{{currentTock}}"></td>
 			<td><input type="text" class="layui-input rkNum" value="1" id="{{rkNum}}" win-verify="required|number"/></td>
 			<td id="{{unitPrice}}"></td>

seal-service/src/main/resources/template/tpl/partsclaim/partsclaimedit.html

@@ -21,7 +21,7 @@
 				<input type="text" id="{{materialId}}" name="{{materialId}}" placeholder="请选择商品" class="layui-input" readonly="readonly"/>
 		        <i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i>
 			</td>
-			<td><select id="{{unitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td>
+			<td><select id="{{mUnitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td>
 			<td id="{{currentTock}}"></td>
 			<td><input type="text" class="layui-input rkNum" value="1" id="{{rkNum}}" win-verify="required|number"/></td>
 			<td id="{{unitPrice}}"></td>

seal-service/src/main/resources/template/tpl/sealseservice/sealseserviceeditTemplate.tpl

@@ -65,14 +65,14 @@
     <div class="layui-form-item layui-col-xs6">
         <label class="layui-form-label">产品名称</label>
         <div class="layui-input-block">
-            <input type="text" id="productName" name="productName" placeholder="请输入产品名称" class="layui-input" maxlength="50" value="{{productName}}" readonly="readonly"/>
+            <input type="text" id="productName" name="productName" placeholder="请输入产品名称" class="layui-input" maxlength="50" value="{{materialName}}" readonly="readonly"/>
             <i class="fa fa-plus-circle input-icon" id="productNameSel"></i>
         </div>
     </div>
     <div class="layui-form-item layui-col-xs6">
         <label class="layui-form-label">规格型号</label>
         <div class="layui-input-block">
-            <input type="text" id="productNorms" name="productNorms" placeholder="请输入规格型号" class="layui-input" maxlength="50" value="{{productNorms}}"/>
+            <input type="text" id="productNorms" name="productNorms" placeholder="请输入规格型号" class="layui-input" maxlength="50" value="{{materialModel}}"/>
         </div>
     </div>
     <div class="layui-form-item layui-col-xs6">