1.采购收货BUG修复

src/main/webapp/HG/CG/HGCG003B.js

 $(function () {
 	var inventRecordBoxBlockId = __eiInfo.getBlock("invent_record_box_block_id").getMappedRows();
+
 	IPLATUI.EFGrid = {
 		"result": {
 			exportGrid: false, // 隐藏右侧自定义导出按钮
@@ -7,64 +8,61 @@ $(function () {
 				pageSize: 20,
 				pageSizes: [20, 50, 70, 100],
 			},
-			columns: [
-				{
-					field: "inventCode",
-					template: function (item) {
-						let template = item.inventCode;
-						if(item.inventCode){
-							for(let i=0;i<inventRecordBoxBlockId.length;i++){
-								if(item.inventCode === inventRecordBoxBlockId[i]['valueField']){
-									template = inventRecordBoxBlockId[i]['valueField'];
-								}else{
-									template = item.inventCode;
-								}
+			columns: [{
+				field: "inventCode",
+				template: function (item) {
+					let template = item.inventCode;
+					if (item.inventCode) {
+						for (let i = 0; i < inventRecordBoxBlockId.length; i++) {
+							if (item.inventCode === inventRecordBoxBlockId[i]['valueField']) {
+								template = inventRecordBoxBlockId[i]['valueField'];
+							} else {
+								template = item.inventCode;
 							}
 						}
-						return template;
-					},
-					editor: function (container, options) {
-						let inInfo = new EiInfo();
-						inInfo.set("field", options.field);
-						let dataSource = inventRecordBoxBlockId;
-						EiCommunicator.send("HGPZ005", "queryInventCodeProdTypeSixBox", inInfo, {
-							onSuccess: function (ei) {
-								dataSource = ei.getBlock("invent_record_box_block_id").getMappedRows();
-							},
-							onFail: function (ei) {
-							}
-						}, {async: false});
-						var input = $('<input />');
-						input.attr("name", options.field);
-						input.attr("id", options.field);
-						input.appendTo(container);
-						input.kendoDropDownList({
-							dataSource: dataSource,
-							minLength: 0,
-							dataTextField: "textField",
-							dataValueField: "valueField",
-							optionLabelTemplate: "[#:valueField#]#:textField#",
-							valueTemplate: "[#:valueField#]#:textField#",
-							template: "[#:valueField#]#:textField#|#:param4Field#",
-							filter: "contains"
-						});
 					}
+					return template;
 				},
-				{
-					field: "primaryId",
-					template: function (item) {
-						item['primaryId'] =$("#inqu_status-0-primaryId").val();
-						return $("#inqu_status-0-primaryId").val();
-					}
+				editor: function (container, options) {
+					let inInfo = new EiInfo();
+					inInfo.set("field", options.field);
+					let dataSource = inventRecordBoxBlockId;
+					EiCommunicator.send("HGPZ005", "queryInventCodeProdTypeSixBox", inInfo, {
+						onSuccess: function (ei) {
+							dataSource = ei.getBlock("invent_record_box_block_id").getMappedRows();
+						},
+						onFail: function (ei) {
+						}
+					}, {async: false});
+					var input = $('<input />');
+					input.attr("name", options.field);
+					input.attr("id", options.field);
+					input.appendTo(container);
+					input.kendoDropDownList({
+						dataSource: dataSource,
+						minLength: 0,
+						dataTextField: "textField",
+						dataValueField: "valueField",
+						optionLabelTemplate: "[#:valueField#]#:textField#",
+						valueTemplate: "[#:valueField#]#:textField#",
+						template: "[#:valueField#]#:textField#|#:param4Field#",
+						filter: "contains"
+					});
 				}
-			],
+			}, {
+				field: "primaryId",
+				template: function (item) {
+					item['primaryId'] = $("#inqu_status-0-primaryId").val();
+					return $("#inqu_status-0-primaryId").val();
+				}
+			}],
 			beforeEdit: function (e) {
 				var status = $("#status").val();
-				if(status != '0'){
+				if (status != '0') {
 					e.preventDefault();
 				}
 				var source = $("#source").val();
-				if(source === '0'){
+				if (source === '0') {
 					//选择合同的明细不能修改存货信息
 					for (let i = 0; i < e.sender.columns.length; i++) {
 						//指定的列不让修改
@@ -77,7 +75,6 @@ $(function () {
 						}
 					}
 				}
-
 			},
 			loadComplete: function (grid) {
 				// 此grid对象
@@ -170,22 +167,22 @@ $(window).load(function () {
  * @param coefficient
  */
 let calAmount = function (item) {
+	let price = item.price;
 	//计算方式为重量乘单价
-	if(item.calculationMethod == 1){
-		if(item.receiveWeight && item.price){
+	if (item.calculationMethod == 1) {
+		let receiveWeight = item.receiveWeight;
+		if (!isBlank(receiveWeight) && !isBlank(price)) {
 			// 重量*单价金额
-			let totalAmount = item.receiveWeight * item.price;
+			let totalAmount = parseFloat(receiveWeight) * parseFloat(price);
 			resultGrid.setCellValue(item, 'amount', totalAmount)
 		}
-	}else{
-		if(item.receiveQty && item.price){
-			if(item.receiveQty && item.price){
-				// 重量*单价金额
-				let totalAmount = item.receiveQty * item.price;
-				resultGrid.setCellValue(item, 'amount', totalAmount)
-			}
+	} else {
+		let receiveQty = item.receiveQty;
+		if (!isBlank(receiveQty) && !isBlank(price)) {
+			// 数量*单价金额
+			let totalAmount = parseFloat(receiveQty) * parseFloat(price);
+			resultGrid.setCellValue(item, 'amount', totalAmount)
 		}
-
 	}
 }
 

src/main/webapp/HG/CG/HGCG003B.jsp

@@ -51,7 +51,7 @@
 			             sumType="page"/>
 			<EF:EFColumn ename="receiveUnitWeight" cname="收货单重" enable="false" width="120" align="right" format="{0:N3}"
 			             hidden="true"/>
-			<EF:EFComboColumn ename="calculationMethod" cname="计算方式" enable="true" width="100" align="center" required="true">
+			<EF:EFComboColumn ename="calculationMethod" cname="计算方式" enable="true" width="120" align="center" required="true">
 				<EF:EFCodeOption codeName="hggp.cg.calculationMethod" />
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="price" cname="单价" width="120" align="right" format="{0:C3}" required="true"/>