MES-WEB-LayUI.git

			@@ -213,7 +213,7 @@
			var sWhere = "";
			var sBillType = "3801";
			var HModName = "Gy_BarCodeBill";
			var titleData = ["ç©æID", "æºåä¸»åç ", "æºåååç ", "è¾å©å±æ§ID", "è®¡éåä½ID", "å®¢æ·ID", "HItemID", "hmainid", "hsubid", "HinterID", "è½¦é´ID", "ä¾åºåID", "HSTOCKORGID","æä½åID","çç»ID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["ç©æID", "æºåä¸»åç ", "æºåååç ", "è¾å©å±æ§ID", "è®¡éåä½ID", "å®¢æ·ID", "HItemID", "hmainid", "hsubid", "HinterID", "è½¦é´ID", "ä¾åºåID", "HSTOCKORGID", "æä½åID", "çç»ID", "å¤ç®±æ°", "é¢å·æåå·", "çå·", "åå", "å®¢æ·ä»£ç ", "å®¢æ·åç§°", "éå®è®¢åå·", "çäº§æ¥æ", "ä¿è´¨æè³", "çå¤ç", "è¾å©å±æ§ä»£ç ", "è¾å©å±æ§åç§°", "è¾åä½æ°é", "æ¯å¦å¯ç¨ä¿è´¨æ", "æ¯å¦èµ å","è¿ææ¥æ"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			var HMaterID = "";
			var HBatchNo = "";
			@@ -267,7 +267,7 @@

			var rowdata = [{
			"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "","HMTONo": ""
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
			}];
			//åå§åè¡¨æ ¼
			set_InitGrid();
			@@ -299,7 +299,7 @@

			var NewRow = {
			"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
			};
			//console.log(NewRow);
			switch (obj.event) {
			@@ -626,7 +626,7 @@
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //åæ®æ¥æ
			$("#HSourceBillType").val('1'); //éæ©ä¸ææ¡é»è®¤ç¬¬ä¸ä¸ªéé¡¹
			$("#HBarCodeType").val('0');
			var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: ''}]
			var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "" }]
			table.reload('mainTable', {
			data: arr // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			});
			@@ -634,7 +634,7 @@
			"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
			, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
			, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
			, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
			, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
			}]
			table.reload('mainTable1', {
			data: arr1 // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			@@ -670,7 +670,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].ç©æä»£ç , HMaterName: checkStatus.data[0].ç©æåç§°, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].è®¡éåä½ä»£ç , HUnitName: checkStatus.data[0].è®¡éåä½, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].æ°é.toString("#0.00"), HMinQty: checkStatus.data[0].æå°åè£æ°, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '' }]
			var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].ç©æä»£ç , HMaterName: checkStatus.data[0].ç©æåç§°, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].è®¡éåä½ä»£ç , HUnitName: checkStatus.data[0].è®¡éåä½, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].æ°é.toString("#0.00"), HMinQty: checkStatus.data[0].æå°åè£æ°, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', "HCusModel": "", "HCusMaterName": "" }]
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			table.reload('mainTable', {
			data: arr // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			@@ -833,9 +833,11 @@
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterNumber', width: 200 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 200 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 200 }
			, { field: 'HCusModel', title: 'å®¢æ·è§æ ¼åå·', edit: 'text', width: 200 }
			, { field: 'HCusMaterName', title: 'å®¢æ·ç©æåç§°', edit: 'text', width: 200 }
			, { field: 'HEmpID', title: 'æä½åID', width: 100, hide: true }
			, { field: 'HEmpNumber', title: 'æä½åä»£ç ', edit: 'text', width: 200, event: 'HEmpNumber'}
			, { field: 'HEmpName', title: 'æä½å', width: 200 }
			, { field: 'HEmpNumber', title: 'æä½åä»£ç ', edit: 'text', width: 200, event: 'HEmpNumber' }
			, { field: 'HEmpName', title: 'æä½å', width: 200 }
			, { field: 'HGroupID', title: 'çç»ID', width: 100, hide: true }
			, { field: 'HGroupNumber', title: 'çç»ä»£ç ', edit: 'text', width: 200, event: 'HGroupNumber' }
			, { field: 'HGroupName', title: 'çç»åç§°', width: 200 }
			@@ -999,7 +1001,7 @@
			, "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
			, "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
			, "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
			}];
			table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			@@ -1013,7 +1015,7 @@
			"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
			, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
			, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
			, "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
			, "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HCusModel": "", "HCusMaterName": ""
			}];
			table.render(option1);
			//å·æ°è¡¨æ ¼æ°æ®
			@@ -1156,7 +1158,7 @@
			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;