MES-WEB-LayUI.git

			@@ -310,6 +310,8 @@
			var year = date.getFullYear();
			var shijian = year + "-" + month + "-" + day;
			var allVal;
			//åå»è¿åå¨å±åé
			window.OptionData = {};
			//#endregion


			@@ -756,15 +758,19 @@
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HMaterID" :OptionData.HMaterID
			,"ç©æä»£ç " : OptionData.ç©æä»£ç
			, "ç©æåç§°" :OptionData.ç©æåç§°
			,"è§æ ¼åå·" : OptionData.è§æ ¼åå·
			,"HUnitID" :OptionData.HUnitID
			,"è®¡éåä½" : OptionData.è®¡éåä½åç§°
			})
			, end: function () {
			if (OptionData.length>0) {
			obj.update({
			"HMaterID": OptionData.HMaterID
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			OptionData = [];
			}

			}
			})
			}
			@@ -795,11 +801,15 @@
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HUnitID": OptionData.HItemID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			, end: function () {
			if (OptionData.length > 0) {
			obj.update({
			"HUnitID": OptionData.HItemID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			OptionData = [];
			}

			}
			})
			}
			@@ -830,11 +840,15 @@
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HSecUnitID": OptionData.HItemID
			, "è¾å©è®¡éåä½": OptionData.è¾å©å±æ§åç§°
			})
			, end: function () {
			if (OptionData.length > 0) {
			obj.update({
			"HSecUnitID": OptionData.HItemID
			, "è¾å©è®¡éåä½": OptionData.è¾å©å±æ§åç§°
			})
			OptionData = [];
			}

			}
			})
			}
			@@ -848,7 +862,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?type=Warehouse', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -865,11 +879,15 @@
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HWHID": OptionData.HItemID
			, "è°å¥ä»åº": OptionData.ä»åºåç§°
			})
			, end: function () {
			if (OptionData.length > 0) {
			obj.update({
			"HWHID": OptionData.HItemID
			, "è°å¥ä»åº": OptionData.ä»åºåç§°
			})
			OptionData = [];
			}

			}
			})
			}
			@@ -883,7 +901,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?type=HWHSub', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -900,11 +918,15 @@
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HSCWHID": OptionData.HItemID
			, "è°åºä»åº": OptionData.ä»åºåç§°
			})
			, end: function () {
			if (OptionData.length > 0) {
			obj.update({
			"HSCWHID": OptionData.HItemID
			, "è°åºä»åº": OptionData.ä»åºåç§°
			})
			OptionData = [];
			}

			}
			})
			}
			@@ -954,7 +976,29 @@
			if (checkStatus.data.length == 0) {
			return layer.msg("è¯·è³å°éæ©ä¸æ¡æ°æ®!");
			}
			layer.alert("ä½ å·²éæ©" + checkStatus.data.length + "æ¡æ°æ®");
			//layer.alert("ä½ å·²éæ©" + checkStatus.data.length + "æ¡æ°æ®");

			//æªå®¡æ ¸ å·²å³éçååä¸åè®¸ä¸æ¨
			for (var i = 0; i < checkStatus.data.length; i++) {
			var temp = getPushSource_ICStockInBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
			if (temp != "none") {
			if (temp.ç¶æ != "å·²å®¡æ ¸") {
			layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + temp.åæ®å· + "ãåæ®ç¶æä¸ä¸ºå·²å®¡æ ¸ç¶æ!");
			layer.close(index);//å³éå¼¹çª
			return;
			}

			if (temp.è¡ç¶æ != "") {
			layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + temp.åæ®å· + "ãä¸éä¸çè®°å½ä¸åå¨å·²å³éç¶æçè®°å½!");
			layer.close(index);//å³éå¼¹çª
			return;
			}

			} else {
			return;
			}
			}

			//è·ååæ¥å¼è°å¥åéç¥åä»£ç
			var ProcessNumber = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			@@ -988,7 +1032,7 @@
			, "HSecManagerName": data.éªæ¶
			, "HKeeperID": data.HKeeperID
			, "HKeeperName": data.ä¿ç®¡å
			, "HSourceBillType": data.æºåç±»å
			//, "HSourceBillType": data.åæ®ç±»å
			});


			@@ -999,7 +1043,7 @@
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½, "HQtyMust": checkStatus.data[j].åºæ¶æ°é,
			"HQty": checkStatus.data[j].å®æ¶æ°é, "HPrice": checkStatus.data[j].åä»·, "HBatchNo": checkStatus.data[j].æ¹æ¬¡, "HRemark": checkStatus.data[j].è¡¨ä½å¤æ³¨,
			"HMoney": checkStatus.data[j].éé¢, "HOrderPrice": checkStatus.data[j].éè´éé¢, "HWHID": checkStatus.data[j].HWHID, "è°å¥ä»åº": checkStatus.data[j].è°å¥ä»åº, "HSCWHID": checkStatus.data[j].HSCWHID, "è°åºä»åº": checkStatus.data[j].è°åºä»åº,
			"HSourceBillNo": checkStatus.data[j].åæ®å·, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
			"HSourceBillNo": checkStatus.data[j].åæ®å·, "HSourceBillType": checkStatus.data[j].åæ®ç±»å, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
			})
			j++;
			}
			@@ -1252,7 +1296,7 @@
			$.ajax({
			type: "get",
			async: false,
			data: { "HName": HName },
			data: { "HName": HName, "Num": 2 }, //0èå 1çº¢å 2ä¸åçº¢èå
			url: GetWEBURL() + "/Web/GetHSourceBillType",
			success: function (result) {
			var HSourceBillTypes = "";
			@@ -1266,6 +1310,33 @@
			}
			}
			})
			}
			//#endregion

			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåéè´å¥åºåæ°æ®
			function getPushSource_ICStockInBillInit(HSourceInterID, HSourceEntryID) {
			var res = "none";
			$.ajax({
			url: GetWEBURL() + "/Kf_StepFoldInBill/loadKf_ICStockBillMain_Push",
			async: false,
			type: "GET",
			data: {
			"HInterID": HSourceInterID
			, "HSubID": HSourceEntryID
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			res = result.data[0];
			} else {
			res = result.data;
			//layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			res = "none";
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			return res;
			}
			//#endregion

			@@ -1332,10 +1403,14 @@
			OptionData = data
			}

			//åå»è¿åæ¶æä»åº
			function GetGyWarehouse(data) {
			OptionData = data
			}
			//åå»è¿åè°å¥ä»åº
			function GetGyWarehouse(data) {
			OptionData = data[0]
			}
			//åå»è¿åè°åºä»åº
			function GetHWHSubValue(data) {
			OptionData = data[0]
			}
			</script>
			</body>
			</html>