MES-WEB-LayUI.git

			@@ -102,6 +102,12 @@
			<input type="text" style="border-radius: 50px;width: 140%;" name="åä»¶æ¡ç " id="SubBarcode" autocomplete="off" placeholder="è¯·è¾å¥åä»¶æ¡ç " class="layui-input">
			</div>
			</div>
			<div class="">
			<label class="layui-inline" style="width:60px;">æ¯å¦æ··ç®±</label>
			<div class="layui-inline">
			<input type="checkbox" id="HMixedBox" name="HMixedBox" lay-skin="primary" value="" lay-filter="HMixedBox">
			</div>
			</div>
			</div>
			<div class="layui-inline">
			<div class="">
			@@ -441,6 +447,7 @@
			return util.toDateString(time, "yyyy-MM-dd");
			}
			}
			//, { field: 'HBarCode_Pack', title: 'æ¡å½¢ç ', width: 145 }
			, { field: 'HSourceBillNo', title: 'æ¡å½¢ç ', width: 145 }
			, { field: 'HBillNo', title: 'æºååå·', width: 125 }
			, { field: 'HBarCode', title: 'å¯ä¸ç ', width: 125 }
			@@ -526,7 +533,7 @@
			return;
			}
			//å¤æè£ç®±æ°éä¸è½å¤§äºå©ä½æ°é
			if (zxQty > icmoQtyNow) {
			if (zxQty > icmoQtyNow && $("#HMixedBox").val()=="") {
			playSound();
			layer.msg("è£ç®±æ°éä¸åè®¸å¤§äºæµè½¬å¡å©ä½æ°éï¼å©ä½æ°éä¸º" + icmoQtyNow, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			@@ -584,6 +591,24 @@
			}
			}
			});


			form.on('checkbox(HMixedBox)', function (obj) {
			if (icmoQtyNow == 0) {
			playSound();
			layer.msg("å©ä½æ°éä¸º" + icmoQtyNow + ",ä¸åè®¸æ··ç®±ï¼", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			$("input[name='HMixedBox']").prop("checked", false);
			form.render('checkbox');
			return;
			}
			if (obj.value == "") {
			$("#HMixedBox").val("1");
			} else {
			$("#HMixedBox").val("");
			}

			});


			//åä»¶æ¡ç åè½¦æ¹æ³
			$('#SubBarcode').on('keydown', function (event) { //æ«æ¡å½¢ç
			@@ -688,7 +713,7 @@
			url: GetWEBURL() + "/LEMS/SNBarcodeProcCtrl",
			type: "GET",
			async: false,
			data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo },
			data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo, "HMixedBox": $("#HMixedBox").val(), "HBillNo": HBillNo2 },
			success: function (result) {
			if (result.count == 0) {
			a = 1;
			@@ -730,86 +755,93 @@
			layer.alert("åè£æ°éå·²çäºæµè½¬å¡æ°éï¼ä¸åè®¸æ«ç ï¼", { icon: 1 });
			return;
			} else {
			$.ajax({//è¡¨ä½åtempè¡¨
			url: GetWEBURL() + "/LEMS/SaveSubBarcode_Json",
			type: "GET",
			async: false,
			data: {
			"HBillNo": HBillNo
			, "SubBarcode": SubBarcode
			, "HInterID": HInterID
			, "HBillNo2": HBillNo2
			, "HBillType": HBillType
			, "sMaker": sMaker
			, "HBarCode": $("#HBarCode_wym").val()
			, "HNumber": $("#HNumber").val()
			, "HName": $("#HMaterName").val()
			, "HModel": $("#HModel").val()
			},
			success: function (result) {
			var data = result.data;
			if (result.Message == "è¯¥åä»¶æ¡ç å·²åå¨") {
			playSound();
			layer.alert("è¯¥åä»¶æ¡ç å·²åå¨", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			} else {
			if (data[0].Column1 == 1) { // è¯´æéªè¯æåäºï¼
			$('#SubBarcode').val("");
			$("#SubBarcode").focus();
			table.reload('smjl-table', {
			url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
			, where: {
			HBillNo: HBillNo2
			, HBarCode: HBillNo
			}
			});
			zxQtyFlag++;
			pcmQtyFlag++
			$("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
			$("#pcmQty").val("" + pcmQtyFlag + "/" + pcmQty + "");
			layer.msg("æ«ææå", { time: 5000, icon: 6 });
			$.ajax({//æ¥è¯¢æ¡ç æ¡£æ¡è¡¨éçééæ¡ç çåè®¡æ°éæ¹æ³
			url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
			type: "GET",
			async: false,
			data: {
			"HBarCode": $("#HBarCode_wym").val()
			},
			success: function (result) {
			var HQty = result.data[0].HQty;
			HQty++;
			$.ajax({//æ´æ°æ¡ç æ¡£æ¡è¡¨éçééæ¡ç çåè®¡æ°éæ¹æ³
			url: GetWEBURL() + "/LEMS/Update_Gy_BarCodeBill_HQty",
			type: "GET",
			async: false,
			data: {
			"HBarCode": $("#HBarCode_wym").val(),
			"HQty": HQty
			},
			success: function (result) {
			var HQty = result.data;
			ZJTMFlag = true;
			}, error: function () {
			playSound();
			layer.alert("æ´æ°æ¡ç æ¡£æ¡è¡¨éçééæ¡ç çåè®¡æ°éæ¹æ³åçéè¯¯!", { icon: 5 });
			}
			});
			}, error: function () {
			playSound();
			layer.alert("æ¥è¯¢æ¡ç æ¡£æ¡è¡¨éçééæ¡ç çåè®¡æ°éæ¹æ³åçéè¯¯!", { icon: 5 });
			}
			});
			} else {
			//å¤æè£ç®±æ°éä¸è½å¤§äºå©ä½æ°é
			if (AllHqty > icmoQtyNow && $("#HMixedBox").val() == "") {
			playSound();
			layer.msg("è£ç®±æ°éä¸åè®¸å¤§äºæµè½¬å¡å©ä½æ°éï¼å©ä½æ°éä¸º" + icmoQtyNow, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			} else {
			$.ajax({//è¡¨ä½åtempè¡¨
			url: GetWEBURL() + "/LEMS/SaveSubBarcode_Json",
			type: "GET",
			async: false,
			data: {
			"HBillNo": HBillNo
			, "SubBarcode": SubBarcode
			, "HInterID": HInterID
			, "HBillNo2": HBillNo2
			, "HBillType": HBillType
			, "sMaker": sMaker
			, "HBarCode": $("#HBarCode_wym").val()
			, "HNumber": $("#HNumber").val()
			, "HName": $("#HMaterName").val()
			, "HModel": $("#HModel").val()
			},
			success: function (result) {
			var data = result.data;
			if (result.Message == "è¯¥åä»¶æ¡ç å·²åå¨") {
			playSound();
			// $("#verifycode").click();
			//layer.msg(result.Message, { icon: 5 });
			layer.alert("æå¥ç¼åè¡¨å¤±è´¥", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			layer.alert("è¯¥åä»¶æ¡ç å·²åå¨", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			} else {
			if (data[0].Column1 == 1) { // è¯´æéªè¯æåäºï¼
			$('#SubBarcode').val("");
			$("#SubBarcode").focus();
			table.reload('smjl-table', {
			url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
			, where: {
			HBillNo: HBillNo2
			, HBarCode: HBillNo
			}
			});
			zxQtyFlag++;
			pcmQtyFlag++
			$("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
			$("#pcmQty").val("" + pcmQtyFlag + "/" + pcmQty + "");
			layer.msg("æ«ææå", { time: 5000, icon: 6 });
			$.ajax({//æ¥è¯¢æ¡ç æ¡£æ¡è¡¨éçééæ¡ç çåè®¡æ°éæ¹æ³
			url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
			type: "GET",
			async: false,
			data: {
			"HBarCode": $("#HBarCode_wym").val()
			},
			success: function (result) {
			var HQty = result.data[0].HQty;
			HQty++;
			$.ajax({//æ´æ°æ¡ç æ¡£æ¡è¡¨éçééæ¡ç çåè®¡æ°éæ¹æ³
			url: GetWEBURL() + "/LEMS/Update_Gy_BarCodeBill_HQty",
			type: "GET",
			async: false,
			data: {
			"HBarCode": $("#HBarCode_wym").val(),
			"HQty": HQty
			},
			success: function (result) {
			var HQty = result.data;
			ZJTMFlag = true;
			}, error: function () {
			playSound();
			layer.alert("æ´æ°æ¡ç æ¡£æ¡è¡¨éçééæ¡ç çåè®¡æ°éæ¹æ³åçéè¯¯!", { icon: 5 });
			}
			});
			}, error: function () {
			playSound();
			layer.alert("æ¥è¯¢æ¡ç æ¡£æ¡è¡¨éçééæ¡ç çåè®¡æ°éæ¹æ³åçéè¯¯!", { icon: 5 });
			}
			});
			} else {
			playSound();
			// $("#verifycode").click();
			//layer.msg(result.Message, { icon: 5 });
			layer.alert("æå¥ç¼åè¡¨å¤±è´¥", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}
			}, error: function () {
			playSound();
			layer.alert("åä»¶æ¡ç æ¹æ³åçéè¯¯!", { icon: 5 });
			}
			}, error: function () {
			playSound();
			layer.alert("åä»¶æ¡ç æ¹æ³åçéè¯¯!", { icon: 5 });
			}
			});
			});
			}
			}
			}, error: function () {
			playSound();
			@@ -994,6 +1026,9 @@
			//æ¸ç©ºæ«æè®°å½çè£ç®±æ°é
			zxQtyFlag = 0;
			pcmQtyFlag = 0;
			$("#HMixedBox").val("");
			$("input[name='HMixedBox']").prop("checked", false);
			form.render('checkbox');
			//è·ååæ®å·
			getBillno();
			//æ«ææ¡ç