MES-WEB-LayUI.git

			@@ -272,7 +272,7 @@
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "../../user/login_pda.html"; });
			}, function () { window.location.href = "../../user/login.html"; });
			}

			//å¤±è´¥æç¤ºé³
			@@ -844,80 +844,96 @@
			if (sBarCode != "") {
			$('#HBarCode').val("");
			}
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/Get_Gy_BarCodeBill_CusList",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HBarCode": sBarCode, "user": HMaker },
			success: function (result) {
			if (result.count == 1) {
			if ($("#HSourceBillNo").val() != result.data[0].HSourceBillNo) {
			playSound();
			layer.msg("æ¡ç å¯¹åºççäº§è®¢åä¸å½åè®¢åä¸ä¸è´", {
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			}
			else {
			var exists = BarCodelistOption.data.some(function (item) {
			return item.HBarCode === sBarCode;
			});
			if (exists) {
			playSound();
			layer.msg("è¯¥æ¡ç å·²è¢«æ«æï¼ä¸è½éå¤æ«æ", {
			icon: 5, time: 3000, offset: 'auto', skin: 'layui-layer-lan', title: "æç¤º"
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			return; // éåºï¼ä¸åæ§è¡åç»æ·»å é»è¾
			}
			var saveSuccess = save_sub($('#HInterID').val(), sBarCode, $('#HSourceID').val());
			if (!saveSuccess) {
			// å¦æä¿åå¤±è´¥ï¼ç´æ¥éåºï¼ä¸æ§è¡åé¢ä»»ä½é»è¾
			return;
			}
			var subarr = BarCodelistOption.data;
			subarr.push({
			"HQty": 1, "HBarCode": sBarCode, "HMaterID": result.data[0].HItemID, "HMaterNumber": result.data[0].HNumber, "HMaterName": result.data[0].HName, "HMaterModel": result.data[0].HModel,
			"HSourceBillNo": result.data[0].HSourceBillNo, "HSourceInterID": result.data[0].HSourceInterID,
			"HSourceEntryID": result.data[0].HSourceEntryID, "HInterID": $("#HInterID").val()
			});

			BarCodelistOption.data = subarr;
			table.render(BarCodelistOption);
			listOption.data.forEach(function (item) {
			item.æ°é = (parseFloat(item.æ°é) \|\| 0) + 1;
			item.æ¡ç ä¸ªæ° = (parseFloat(item.æ¡ç ä¸ªæ°) \|\| 0) + 1;
			});
			table.render(listOption);
			$("#HQty").val((parseFloat($("#HQty").val()) \|\| 0) + 1);
			}
			}
			else {
			playSound();
			layer.msg(result.Message, {
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			playSound();
			layer.msg("éè¯¯ï¼" + err, {
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			}
			var exists = BarCodelistOption.data.some(function (item) {
			return item.HBarCode === sBarCode;
			});
			layer.closeAll("loading");
			if (exists) {
			playSound();
			layer.msg("è¯¥æ¡ç å·²è¢«æ«æï¼ä¸è½éå¤æ«æ", {
			icon: 5, time: 3000, offset: 'auto', skin: 'layui-layer-lan', title: "æç¤º"
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			return; // éåºï¼ä¸åæ§è¡åç»æ·»å é»è¾
			}
			save_sub($('#HInterID').val(), sBarCode, $('#HSourceID').val());

			//$.ajax({
			// type: "GET",
			// url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/Get_Gy_BarCodeBill_CusList",
			// async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			// data: { "HBarCode": sBarCode, "user": HMaker },
			// success: function (result) {
			// if (result.count == 1) {
			// if ($("#HSourceBillNo").val() != result.data[0].HSourceBillNo) {
			// playSound();
			// layer.msg("æ¡ç å¯¹åºççäº§è®¢åä¸å½åè®¢åä¸ä¸è´", {
			// icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			// }, function () {
			// $("#HBarCode").select();
			// $("#HBarCode").focus();
			// });
			// }
			// else {
			// var exists = BarCodelistOption.data.some(function (item) {
			// return item.HBarCode === sBarCode;
			// });
			// if (exists) {
			// playSound();
			// layer.msg("è¯¥æ¡ç å·²è¢«æ«æï¼ä¸è½éå¤æ«æ", {
			// icon: 5, time: 3000, offset: 'auto', skin: 'layui-layer-lan', title: "æç¤º"
			// }, function () {
			// $("#HBarCode").select();
			// $("#HBarCode").focus();
			// });
			// return; // éåºï¼ä¸åæ§è¡åç»æ·»å é»è¾
			// }
			// var saveSuccess = save_sub($('#HInterID').val(), sBarCode, $('#HSourceID').val());
			// if (!saveSuccess) {
			// // å¦æä¿åå¤±è´¥ï¼ç´æ¥éåºï¼ä¸æ§è¡åé¢ä»»ä½é»è¾
			// return;
			// }
			// var subarr = BarCodelistOption.data;
			// subarr.push({
			// "HQty": 1, "HBarCode": sBarCode, "HMaterID": result.data[0].HItemID, "HMaterNumber": result.data[0].HNumber, "HMaterName": result.data[0].HName, "HMaterModel": result.data[0].HModel,
			// "HSourceBillNo": result.data[0].HSourceBillNo, "HSourceInterID": result.data[0].HSourceInterID,
			// "HSourceEntryID": result.data[0].HSourceEntryID, "HInterID": $("#HInterID").val()
			// });

			// BarCodelistOption.data = subarr;
			// table.render(BarCodelistOption);
			// listOption.data.forEach(function (item) {
			// item.æ°é = (parseFloat(item.æ°é) \|\| 0) + 1;
			// item.æ¡ç ä¸ªæ° = (parseFloat(item.æ¡ç ä¸ªæ°) \|\| 0) + 1;
			// });
			// table.render(listOption);
			// $("#HQty").val((parseFloat($("#HQty").val()) \|\| 0) + 1);
			// }
			// }
			// else {
			// playSound();
			// layer.msg(result.Message, {
			// icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			// }, function () {
			// $("#HBarCode").select();
			// $("#HBarCode").focus();
			// });
			// }
			// },
			// complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			// error: function (err) {
			// playSound();
			// layer.msg("éè¯¯ï¼" + err, {
			// icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			// }, function () {
			// $("#HBarCode").select();
			// $("#HBarCode").focus();
			// });
			// }
			//});

			//layer.closeAll("loading");
			}


			@@ -961,9 +977,7 @@
			}
			//æ«ææ¡ç ä¿åæ°æ®å°ä¸´æ¶è¡¨
			function save_sub(HInterID, HBarCode, HSourceID) {
			var index = layer.load();
			var isSuccess = false; // é»è®¤å¤±è´¥

			var index = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Sc_MESBeginStepWorkBill/savrSc_ICMOBillWorkQtyStatus_Tmp_Sub",
			@@ -976,27 +990,41 @@
			},
			success: function (data) {
			if (data.count == 1) {

			var subarr = BarCodelistOption.data;
			subarr.push({
			"HQty": 1, "HBarCode": HBarCode, "HMaterID": data.data[0].HItemID, "HMaterNumber": data.data[0].HNumber, "HMaterName": data.data[0].HName, "HMaterModel": data.data[0].HModel,
			"HSourceBillNo": data.data[0].HICMOBillNo, "HSourceInterID": data.data[0].HICMOEntryID,
			"HSourceEntryID": data.data[0].HICMOInterID, "HInterID": $("#HInterID").val()
			});

			BarCodelistOption.data = subarr;
			table.render(BarCodelistOption);
			listOption.data.forEach(function (item) {
			item.æ°é = (parseFloat(item.æ°é) \|\| 0) + 1;
			item.æ¡ç ä¸ªæ° = (parseFloat(item.æ¡ç ä¸ªæ°) \|\| 0) + 1;
			});
			table.render(listOption);
			$("#HQty").val((parseFloat($("#HQty").val()) \|\| 0) + 1);
			$("#HBarCode").select();
			$("#HBarCode").focus();

			layer.close(index);
			layer.msg("æ«ææå", { icon: 1, time: 1500 });
			isSuccess = true;
			layer.msg("æ«ææå", { icon: 1, time: 1500 });
			} else {
			layer.close(index);
			layer.msg(data.Message, {
			icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º"
			});
			isSuccess = false;
			});
			}
			},
			error: function (err) {
			layer.close(index);
			layer.msg("ä¿åæ¡ç å¤±è´¥ï¼" + err.statusText, {
			icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "ç³»ç»éè¯¯"
			});
			isSuccess = false;
			});
			}
			});

			return isSuccess; // åæ¥è¿åç»æ
			}
			//#endregion