MES-WEB-LayUI.git

			@@ -514,6 +514,11 @@
			content: [url, 'yes'],
			btn: [get_MessageError('[0000-2-051]ç¡®å®', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]åæ¶', sessionStorage["HTranSlate"])],
			btn1: function (index, layero) {
			HBarInfo = ""; //åå¨æ¡ç ä¿¡æ¯
			HFileList = ""; //åå¨æ¡£æ¡åè¡¨
			$('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//çææé®å¯ç¨
			element.tabChange('tab-TabTest', '1');

			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('layTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			@@ -658,32 +663,7 @@
			title: get_MessageError("[0000-2-009]æç¤º", sessionStorage["HTranSlate"]),
			icon: 3,
			}, function (index) {
			$("#HOrgID").find("option").remove(); //æ¸é¤æºåç±»åéæ©ä¸ææ¡ä¸çå¼
			set_HOrg(); //è°ç¨è·åæºåç±»åéæ©ä¸ææ¡çå¼
			$("#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: '', HCusModel: "", HCusMaterName: "", "HCheckEmpName": "" }]
			table.reload('mainTable', {
			data: arr // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			});
			var arr1 = [{
			"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": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
			}]
			table.reload('mainTable1', {
			data: arr1 // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			});

			//çææåè·³è½¬å°æ¡ç ä¿¡æ¯æ ç¾é¡µ
			element.tabChange('tab-TabTest', '1');
			//å è½½æ¡£æ¡åè¡¨
			table.reload('mainTable2', {
			data: [] // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			});
			layer.close(index)
			location.replace('Gy_BarCodeBill.html?OperationType=1');
			})
			})

			@@ -888,6 +868,7 @@
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 75 }
			, { field: 'HMainID', title: 'æºåä¸»åç ', width: 100, hide: true }
			, { field: 'HSubID', title: 'æºåååç ', width: 100, hide: true }
			, { field: 'HSourceBillSEQ', title: 'æºåè¡å·', width: 100, hide: true }
			, { field: 'HBillNo', title: 'æºååå·', width: 200 }
			, { field: 'HMaterID', title: 'ç©æID', width: 100, hide: true }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterNumber', width: 200 }
			@@ -903,6 +884,7 @@
			, { field: 'HGroupName', title: 'çç»åç§°', width: 200 }
			, { field: 'HCheckEmpName', title: 'æ£éªå', width: 200, edit: 'text' }
			, { field: 'HBatchNo', title: 'æ¹å·', edit: 'text', width: 100 }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100, edit: 'text' }
			, { field: 'HQty', title: 'æ°é', edit: 'text', width: 100, totalRow: true }
			, { field: 'HMinQty', title: 'æå°åè£æ°', edit: 'text', totalRow: true, width: 100 }
			, { field: 'HBQty', title: 'ç®±æ°', width: 100, totalRow: true }
			@@ -928,7 +910,6 @@
			, { field: 'HExpirationDateFlag', title: 'æ¯å¦å¯ç¨ä¿è´¨æ', width: 100, templet: '#switchTp3', unresize: false }
			, { field: 'HGiveAwayFlag', title: 'æ¯å¦èµ å', width: 100, templet: '#switchTpl', unresize: false }
			, { field: 'HDate', title: 'æ¡ç æ¥æ', width: 100, hide: true }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100, edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			];
			option = {
			@@ -1058,7 +1039,7 @@
			//æ æºåæ°å¢
			function set_AddFNew() {
			option.data = [{
			"HMainID": 0, "HSubID": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
			"HMainID": 0, "HSubID": 0, "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
			, "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": "",
			@@ -1600,6 +1581,8 @@
			//ç©æä¿¡æ¯ å¦æå¨ç©æä»£ç å æF7
			if (obj.event === 'HMaterNumber') //ç©æä¿¡æ¯ å¦æå¨æ¨¡å·ä»£ç å æF7
			{
			//è·åç»ç»ID
			var HOrgID = $("#HOrgID").find("option:selected").val();
			//é¡µé¢å±-èªå®ä¹ //F7éæ©æ¨¡å·
			layer.open({
			type: 2,
			@@ -1609,7 +1592,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'],
			btn: [get_MessageError('[0000-2-051]ç¡®å®', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]åæ¶', sessionStorage["HTranSlate"])]
			, btn1: function (index, layero) {

			@@ -1619,26 +1602,41 @@
			if (checkStatus.data.length === 0) {
			return layer.msg(get_MessageError('[0000-1-020]è¯·éæ©æ°æ®', sessionStorage["HTranSlate"]));
			}
			//console.log(obj.data);
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HMaterID: checkStatus.data[0].HItemID,
			HMaterNumber: checkStatus.data[0].HNumber,
			HMaterName: checkStatus.data[0].HName,
			HMaterModel: checkStatus.data[0].HModel,
			HUnitID: checkStatus.data[0].HUnitID,
			HUnitNumber: checkStatus.data[0].HUnitNumber,
			HUnitName: checkStatus.data[0].HUnitName
			});
			OptionData = checkStatus.data[0];
			if (checkStatus.data.length >= 1) {
			var rowIndex = $(obj.tr).attr("data-index") * 1;
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			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": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
			};

			if ($("#HBarCodeType").find("option:selected").html() == 'æçæ¡ç ') {
			obj.update({
			HQty: 1, //æ°é
			HMinQty: 1, //æå°åè£æ°é
			HBQty: 1 //ç®±æ°
			});
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];

			table.render(option);
			}

			var HMaterID = checkStatus.data[i].HItemID;
			var resultData = getMaterialByMaterID(HMaterID);
			option.data[rowIndex + i].HMaterID = resultData.HMaterID;
			option.data[rowIndex + i].HMaterNumber = resultData.HMaterNumber;
			option.data[rowIndex + i].HMaterName = resultData.HMaterName;
			option.data[rowIndex + i].HMaterModel = resultData.HMaterModel;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].HUnitNumber = resultData.HUnitNumber;
			option.data[rowIndex + i].HUnitName = resultData.HUnitName;

			if ($("#HBarCodeType").find("option:selected").html() == 'æçæ¡ç ') {
			option.data[rowIndex + i].HQty = 1; //æ°é
			option.data[rowIndex + i].HMinQty = 1; //æå°åè£æ°é
			option.data[rowIndex + i].HBQty = 1; //ç®±æ°
			}
			}
			table.render(option);
			}
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			layer.closeAll();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -1873,6 +1871,31 @@

			}

			//#region æ ¹æ®ç©æIDè·åç©æè¯¦ç»ä¿¡æ¯
			function getMaterialByMaterID(HMaterID) {
			var resultData = {};
			$.ajax({
			url: GetWEBURL() + "Cg_ContractBill/getMaterialByMaterID",
			async: false,
			type: "GET",
			data: {
			"HMaterID": HMaterID
			},
			success: function (result) {
			if (result.code == 1) {
			var data = result.data;
			resultData = data[0];
			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			return resultData;
			}
			//#endregion

			//æ¡ç çæ
			function SaveBarCodeCreate(sMainSub, CampanyName) {
			$.ajax(