MES-WEB-LayUI.git

			@@ -39,6 +39,7 @@
			</div>
			</div>
			<button type="button" lay-submit="" lay-filter="Print" id="Print" class="layui-btn layui-btn-radius">æå°</button>
			<button type="button" lay-submit="" lay-filter="Print2" id="Print2" hidden="hidden" ></button>
			<div class="layui-inline" style="width: 200px;">
			<div class="layui-input-block">
			<select name="PrintName" lay-verify="required" id="PrintName">
			@@ -52,6 +53,7 @@
			<select name="LDM" lay-verify="required" id="LDM">
			<option value="DU3" selected>DU3</option>
			<option value="QDR">QDR</option>
			<option value="AAA">15è½¦é´</option>
			<option value="å¶ä»">å¶ä»</option>
			</select>
			</div>
			@@ -64,6 +66,8 @@
			<option value="1607222-00-B">1607222-00-B</option>
			<option value="1943600-00-B">1943600-00-B</option>
			<option value="1941600-00-B">1941600-00-B</option>
			<option value="1941600-00-C">1941600-00-C</option>
			<option value="1943600-00-C">1943600-00-C</option>
			<option value="å¶ä»" selected>å¶ä»</option>
			</select>
			</div>
			@@ -96,6 +100,12 @@
			<label class="layui-inline" style="width:60px;">åä»¶æ¡ç </label>
			<div class="layui-inline">
			<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>
			@@ -437,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 }
			@@ -522,7 +533,7 @@
			return;
			}
			//å¤æè£ç®±æ°éä¸è½å¤§äºå©ä½æ°é
			if (zxQty > icmoQtyNow) {
			if (zxQty > icmoQtyNow && $("#HMixedBox").val()=="") {
			playSound();
			layer.msg("è£ç®±æ°éä¸åè®¸å¤§äºæµè½¬å¡å©ä½æ°éï¼å©ä½æ°éä¸º" + icmoQtyNow, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			@@ -581,6 +592,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) { //æ«æ¡å½¢ç

			@@ -602,16 +631,30 @@
			return;
			}

			if (LDM == "AAA" && SubBarcode.length != 50) {
			playSound();
			layer.alert("åä»¶æ¡ç é¿åº¦ä¸ä¸º50ä½!", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			}

			if (SubBarcode.match(/[^\x00-\xff]/g) != null) {
			playSound();
			layer.alert("å¿é¡»æ¯åè§åç¬¦!", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			}

			if (LDM != "å¶ä»" && BBM != "å¶ä»" && reg.test(SubBarcode)) {
			playSound();
			layer.alert("è¯·æ¥çåä»¶æ¡ç å¤§åæ¯å¦æ£ç¡®!", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			if (SubBarcode.length == 50) {
			if (LDM != "å¶ä»" && reg.test(SubBarcode)) {
			playSound();
			layer.alert("è¯·æ¥çåä»¶æ¡ç å¤§åæ¯å¦æ£ç¡®!", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			}
			} else {
			if (LDM != "å¶ä»" && BBM != "å¶ä»" && reg.test(SubBarcode)) {
			playSound();
			layer.alert("è¯·æ¥çåä»¶æ¡ç å¤§åæ¯å¦æ£ç¡®!", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			}
			}

			if (LDM != "å¶ä»" && BBM != "å¶ä»" && SubBarcode.indexOf(BBM) == -1) {
			@@ -670,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;
			@@ -712,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();
			@@ -950,7 +1000,11 @@
			}
			});
			}
			$("#Print").click();
			if (LDM == "AAA") {
			$("#Print2").click();
			} else {
			$("#Print").click();
			}
			$("#HBarCode_White").val("");
			//åä»¶æ¡ç æ°éå·²æ«å® æ¡ç æ«å®å
			if (pcmQty == pcmQtyFlag) {
			@@ -972,6 +1026,9 @@
			//æ¸ç©ºæ«æè®°å½çè£ç®±æ°é
			zxQtyFlag = 0;
			pcmQtyFlag = 0;
			$("#HMixedBox").val("");
			$("input[name='HMixedBox']").prop("checked", false);
			form.render('checkbox');
			//è·ååæ®å·
			getBillno();
			//æ«ææ¡ç
			@@ -1028,7 +1085,7 @@
			});

			//æå°æé®
			form.on('submit(Print)', function (data) {//éåº
			form.on('submit(Print2)', function (data) {//éåº
			//æå¼æå°æ¨¡æ¿
			var linterid = $("#HInterID").val();
			//var linterid = "28973";
			@@ -1058,9 +1115,9 @@
			var report1 = "";
			var parintName = $("#PrintName").val();
			if (parintName == "æ¯è«å°") {
			report1 = urlAddRandomNo("../../views/grf/åè£åç©ææ è¯å¡(ç½é¡µç).grf");
			report1 = urlAddRandomNo("../../grf/åè£åç©ææ è¯å¡(ç½é¡µç).grf");
			} else {
			report1 = urlAddRandomNo("../../views/grf/åè£åç©ææ è¯å¡(ç½é¡µç)2.grf");
			report1 = urlAddRandomNo("../../grf/åè£åç©ææ è¯å¡(ç½é¡µç)2.grf");
			}

			var args = {
			@@ -1089,6 +1146,17 @@
			})
			});

			//æå°æé®
			form.on('submit(Print)', function (data) {//éåº
			//æå¼æå°æ¨¡æ¿
			var linterid = $("#HInterID").val();
			var Type = "HBarCodePrint";
			var OpenTmp = "ç½æ æå°1";
			//var ReportViewer = document.getElementById("ReportViewer");
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
			$("#Print2").click();
			});

			//çå¬è¡¨æ ¼ä¸è¡å·¥å·äºä»¶
			table.on('tool(smjl-table)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			var data = obj.data //è·å¾å½åè¡æ°æ®