MES-WEB-LayUI.git

			@@ -39,11 +39,12 @@
			</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>
			<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">
			<option value="æ¯è«å°" selected>æ¯è«å°</option>
			<option value="å¢¨è¥¿å¥" selected>å¢¨è¥¿å¥</option>
			<option value="æ¯è«å°">æ¯è«å°</option>
			<option value="æ®è²ç¹">æ®è²ç¹</option>
			</select>
			</div>
			@@ -51,7 +52,8 @@
			<div class="layui-inline">
			<div class="layui-input-block">
			<select name="LDM" lay-verify="required" id="LDM">
			<option value="DU3" selected>DU3</option>
			<option value="HEJ" selected>HEJ</option>
			<option value="DU3" >DU3</option>
			<option value="QDR">QDR</option>
			<option value="AAA">15è½¦é´</option>
			<option value="å¶ä»">å¶ä»</option>
			@@ -77,33 +79,34 @@
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs3 layui-inline">
			<fieldset class="layui-elem-field layui-field-title" style="text-align:center;">
			<legend>äº§çº¿åè£å</legend>
			<legend id="BT_CXBZD">äº§çº¿åè£å</legend>
			</fieldset>
			</div>
			<div class="layui-col-xs1 layui-inline">
			<img src="222.jpg" style="width:70%;height:50%;" />
			</div>
			<div class="layui-col-xs4 layui-inline" >
			<div class="layui-col-xs4 layui-inline">
			<div class="" hidden="hidden">
			<label class="layui-inline" style="width:60px;">æµè½¬å¡å·</label>
			<label class="layui-inline" style="width:60px;" id="BT_HFbarcode">æµè½¬å¡å·</label>
			<div class="layui-inline">
			<input type="text" style="border-radius: 50px;width: 140%;" name="æµè½¬å¡å·" id="HFbarcode" placeholder="è¯·è¾å¥æµè½¬å¡å·" autocomplete="off" class="layui-input">

			</div>
			</div>
			<div class="">
			<label class="layui-inline" style="width:60px;">åä»¶æ¡ç æ°é</label>
			<label class="layui-inline" style="width:60px;" id="BT_pcmQty">åä»¶æ¡ç æ°é</label>
			<div class="layui-inline">
			<input type="text" lay-verify="verifyPcmQty" style="border-radius: 50px;width: 140%;" name="åä»¶æ¡ç æ°é" id="pcmQty" autocomplete="off" placeholder="è¯·è¾å¥åä»¶æ¡ç æ°é" class="layui-input">
			</div>
			</div>
			<div class="">
			<label class="layui-inline" style="width:60px;">åä»¶æ¡ç </label>
			<label class="layui-inline" style="width:60px;" id="BT_SubBarcode">åä»¶æ¡ç </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="" hidden="hidden">
			<label class="layui-inline" style="width:60px;">æ¯å¦æ··ç®±</label>
			<label class="layui-inline" style="width:60px;" id="BT_HMixedBox"> æ¯å¦æ··ç®±</label>
			<div class="layui-inline">
			<input type="checkbox" id="HMixedBox" name="HMixedBox" lay-skin="primary" value="" lay-filter="HMixedBox">
			</div>
			@@ -111,19 +114,19 @@
			</div>
			<div class="layui-inline">
			<div class="">
			<label class="layui-inline" style="width:60px;">è£ç®±æ°é</label>
			<label class="layui-inline" style="width:60px;" id="BT_zxQty">è£ç®±æ°é</label>
			<div class="layui-inline">
			<input type="text" style="border-radius: 50px;" name="" id="zxQty" placeholder="è¯·è¾å¥è£ç®±æ°é" autocomplete="off" class="layui-input">
			</div>
			</div>
			<div class="" hidden="hidden">
			<label class="layui-inline" style="width:60px;">ä¸æ»¡ç®±æ è¯</label>
			<label class="layui-inline" style="width:60px;" id="BT_HRemark">ä¸æ»¡ç®±æ è¯</label>
			<div class="layui-inline">
			<input type="text" style="border-radius: 50px;" name="" id="HRemark" autocomplete="off" placeholder="è¯·è¾å¥ä¸æ»¡ç®±æ è¯" class="layui-input">
			</div>
			</div>
			<div class="">
			<label class="layui-inline" style="width:60px;">ç½æ å·</label>
			<label class="layui-inline" style="width:60px;" id="BT_HBarCode_White">ç½æ å·</label>
			<div class="layui-inline">
			<input type="text" style="border-radius: 50px;" name="" id="HBarCode_White" autocomplete="off" placeholder="ç½æ å·" class="layui-input">
			</div>
			@@ -145,13 +148,9 @@
			<table class="layui-hide" id="smjl-table" lay-filter="smjl-table"></table>
			<script type="text/html" id="smjl-toolbar">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>-->

			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>å è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>-->
			</div>
			</script>
			</div>
			@@ -174,64 +173,65 @@
			<table>
			<tbody>
			<tr>
			<th style="width:80px;padding:10px" hidden="hidden">æµè½¬å¡å·</th>
			<th style="width:80px;padding:10px" hidden="hidden" id="BT_HProcExchBillNo">æµè½¬å¡å·</th>
			<td hidden="hidden">
			<input type="text" name="æµè½¬å¡å·" id="HProcExchBillNo" lay-verify="" autocomplete="off" placeholder="æµè½¬å¡å·" class="layui-input" style="background-color:#efefef4d" readonly>
			<input type="hidden" name="æµè½¬å¡ID" id="HFbarcodeID">
			<input type="hidden" name="HOrgID" id="HOrgID">
			</td>
			<th style="width:80px;padding:10px">ç»è£æ¶é´</th>
			<th style="width:80px;padding:10px" id="BT_HDateNow">ç»è£æ¶é´</th>
			<td>
			<input type="text" name="ç»è£æ¶é´" class="layui-input" id="HDateNow" placeholder="ç»è£æ¶é´" style="background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th style="width:80px;padding:10px" hidden="hidden">çäº§è®¢åå·</th>
			<th style="width:80px;padding:10px" hidden="hidden" id="BT_HSourceBillNo">çäº§è®¢åå·</th>
			<td hidden="hidden">
			<input type="text" name="çäº§è®¢åå·" id="HSourceBillNo" lay-verify="" autocomplete="off" placeholder="çäº§è®¢åå·" class="layui-input" style="background-color:#efefef4d" readonly>
			</td>
			<th hidden="hidden" style="width:80px;padding:10px">äº§åä»£ç </th>
			<th hidden="hidden" style="width:80px;padding:10px" id="BT_HNumber">äº§åä»£ç </th>
			<td hidden="hidden">
			<input type="text" name="äº§åä»£ç " class="layui-input" id="HNumber" placeholder="äº§åä»£ç " style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="ç©æåç " id="HMaterID">
			</td>
			</tr>
			<tr>
			<th hidden="hidden" style="width:80px;padding:10px">äº§ååç§°</th>
			<th hidden="hidden" style="width:80px;padding:10px" id="BT_HMaterName">äº§ååç§°</th>
			<td hidden="hidden">
			<input type="text" name="äº§ååç§°" id="HMaterName" lay-verify="" autocomplete="off" placeholder="äº§ååç§°" class="layui-input" style="background-color:#efefef4d" readonly>
			</td>
			<th hidden="hidden" style="width:80px;padding:10px">è§æ ¼åå·</th>
			<th hidden="hidden" style="width:80px;padding:10px" id="BT_HModel">è§æ ¼åå·</th>
			<td hidden="hidden">
			<input type="text" name="è§æ ¼åå·" class="layui-input" id="HModel" placeholder="è§æ ¼åå·" style="background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th hidden="hidden" style="width:80px;padding:10px">è®¡éåä½</th>
			<th hidden="hidden" style="width:80px;padding:10px" id="BT_HUntil">è®¡éåä½</th>
			<td hidden="hidden">
			<input type="text" name="è®¡éåä½" id="" lay-verify="" autocomplete="off" placeholder="è®¡éåä½" class="layui-input" style="background-color:#efefef4d" readonly>
			</td>
			<th hidden="hidden" style="width:80px;padding:10px">æµè½¬å¡æ°é</th>
			<th hidden="hidden" style="width:80px;padding:10px" id="BT_HLZK">æµè½¬å¡æ°é</th>
			<td hidden="hidden">
			<input type="text" name="æµè½¬å¡æ°é" class="layui-input" id="" placeholder="æµè½¬å¡æ°é" style="background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th hidden="hidden" style="width:80px;padding:10px">çäº§è®¢åæ°é</th>
			<th hidden="hidden" style="width:80px;padding:10px" id="BT_SCDD">çäº§è®¢åæ°é</th>
			<td hidden="hidden">
			<input type="text" name="çäº§è®¢åæ°é" id="" lay-verify="" autocomplete="off" placeholder="çäº§è®¢åæ°é" class="layui-input" style="background-color:#efefef4d" readonly>
			</td>
			<th style="width:80px;padding:10px">åæ®å·</th>
			<th style="width:80px;padding:10px" id="BT_DJH">åæ®å·</th>
			<td>
			<input type="text" name="åæ®å·" class="layui-input" id="HBillNo2" placeholder="åæ®å·" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="åæ®å·ID" id="HInterID">
			</td>
			</tr>
			<tr>
			<th hidden="hidden" style="width:80px;padding:10px">è®¢åè·è¸ªå·</th>
			<th hidden="hidden" style="width:80px;padding:10px" id="BT_DDGZH">è®¢åè·è¸ªå·</th>
			<td hidden="hidden">
			<input type="text" name="è®¢åè·è¸ªå·" id="" lay-verify="" autocomplete="off" placeholder="è®¢åè·è¸ªå·" class="layui-input" style="background-color:#efefef4d" readonly>
			</td>
			<th style="width:80px;padding:10px">ææ¡ç </th>
			<th style="width:80px;padding:10px" id="BT_HBarCode_wym">ææ¡ç </th>
			<td>
			<input type="text" name="ææ¡ç " class="layui-input" id="HBarCode_wym" placeholder="ææ¡ç " style="background-color:#efefef4d;" readonly>
			<!--éèåæ®µ-->
			@@ -239,7 +239,7 @@
			</td>
			</tr>
			<tr>
			<th hidden="hidden" style="width:80px;padding:10px">é¡¹ç®å·</th>
			<th hidden="hidden" style="width:80px;padding:10px" id="BT_HProjectNum">é¡¹ç®å·</th>
			<td hidden="hidden">
			<input type="text" name="é¡¹ç®å·" id="HProjectNum" lay-verify="" autocomplete="off" placeholder="é¡¹ç®å·" class="layui-input" style="background-color:#efefef4d" readonly>
			</td>
			@@ -251,31 +251,31 @@
			<table>
			<tbody>
			<tr>
			<th style="width:80px;padding:10px">å¶åäºº</th>
			<th style="width:80px;padding:10px" id="BT_Hmaker">å¶åäºº</th>
			<td>
			<input type="text" name="å¶åäºº" id="" lay-verify="" autocomplete="off" placeholder="å¶åäºº" class="layui-input" style="background-color:#efefef4d" readonly>
			</td>
			<th style="width:80px;padding:10px">å¶åæ¥æ</th>
			<th style="width:80px;padding:10px" id="BT_Hmakerdate">å¶åæ¥æ</th>
			<td>
			<input type="text" name="å¶åæ¥æ" class="layui-input" id="" placeholder="å¶åæ¥æ" style="background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th style="width:80px;padding:10px">ä¿®æ¹äºº</th>
			<th style="width:80px;padding:10px" id="BT_HupdateMan">ä¿®æ¹äºº</th>
			<td>
			<input type="text" name="ä¿®æ¹äºº" id="" lay-verify="" autocomplete="off" placeholder="ä¿®æ¹äºº" class="layui-input" style="background-color:#efefef4d" readonly>
			</td>
			<th style="width:80px;padding:10px">ä¿®æ¹æ¥æ</th>
			<th style="width:80px;padding:10px" id="BT_Hupdate">ä¿®æ¹æ¥æ</th>
			<td>
			<input type="text" name="ä¿®æ¹æ¥æ" class="layui-input" id="" placeholder="ä¿®æ¹æ¥æ" style="background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th style="width:80px;padding:10px">å®¡æ ¸äºº</th>
			<th style="width:80px;padding:10px" id="BT_HCheckMan">å®¡æ ¸äºº</th>
			<td>
			<input type="text" name="å®¡æ ¸äºº" id="" lay-verify="" autocomplete="off" placeholder="å®¡æ ¸äºº" class="layui-input" style="background-color:#efefef4d" readonly>
			</td>
			<th style="width:80px;padding:10px">å®¡æ ¸æ¥æ</th>
			<th style="width:80px;padding:10px" id="BT_HCheckDate">å®¡æ ¸æ¥æ</th>
			<td>
			<input type="text" name="å®¡æ ¸æ¥æ" class="layui-input" id="" placeholder="å®¡æ ¸æ¥æ" style="background-color:#efefef4d;" readonly>
			</td>
			@@ -305,8 +305,9 @@
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../CreateControl.js"></script>
			<script src="../../../layuiadmin/MESLanguage.js"></script>
			<script>
			//CreateReport("Report");
			function getUrlVars() {
			@@ -346,7 +347,8 @@
			}
			var option = [];
			set_InitGrid();

			var HModName = "MES_ProductionLinePackaging_MXG";
			initFunction(1, HModName, sessionStorage["HTranSlate"]);
			//åå§åæç»è¡¨æ ¼
			function set_InitGrid() {
			columns = [
			@@ -404,9 +406,10 @@
			layer.load(3);
			//è·ååæ®å·
			getBillno();


			$("#HDateNow").val(time);//å è½½å½åæ¶é´
			$("#zxQty").focus();
			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			//$("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
			$("#SubBarcode").attr("readonly", "readonly");//åä»¶æ¡ç åªè¯»
			$("#SubBarcode").css("background-color", "#efefef4d");
			@@ -427,7 +430,7 @@
			layer.msg("è¯·è¾å¥æ£ç¡®çæ´æ°ï¼");
			return;
			}


			if (zxQty == "" \|\| zxQty <= 0) {
			playSound();
			layer.msg("è¯·è¾å¥æ£ç¡®çæ°éï¼", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			@@ -436,7 +439,7 @@
			$("#zxQty").attr("readonly", "readonly");//æ°éåªè¯»
			$("#zxQty").css("background-color", "#efefef4d");
			$("#zxQty").css("box-shadow", "none");


			pcmQty = zxQty;
			$("#pcmQty").val(zxQty);//åä»¶æ¡ç æ°é é»è®¤ä¸º = è£ç®±æ°é
			$("#SubBarcode").removeAttr("readonly");//ç§»é¤åä»¶æ¡ç åªè¯»
			@@ -495,7 +498,7 @@
			}

			});



			//åä»¶æ¡ç åè½¦æ¹æ³
			$('#SubBarcode').on('keydown', function (event) { //æ«æ¡å½¢ç
			@@ -649,6 +652,7 @@
			, "HNumber": $("#HNumber").val()
			, "HName": $("#HMaterName").val()
			, "HModel": $("#HModel").val()
			, "HOrgID": $("#HOrgID").val()
			},
			success: function (result) {
			var data = result.data;
			@@ -660,7 +664,7 @@
			$('#SubBarcode').val("");
			$("#SubBarcode").focus();
			table.reload('smjl-table', {
			url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
			url: GetWEBURL() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
			, where: {
			HBillNo: HBillNo2
			, HBarCode: HBillNo
			@@ -744,11 +748,11 @@
			var BBM = $("#BBM").val();//
			var HBarCode_White = $("#HBarCode_White").val();//ç½æ å·

			if (HBarCode_White == "") {
			playSound();
			layer.alert("ç½æ å·ä¸è½ä¸ºç©º!", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			}
			//if (HBarCode_White == "") {
			// playSound();
			// layer.alert("ç½æ å·ä¸è½ä¸ºç©º!", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			// return;
			//}

			//var BBMs = BBM.replace(/-/g, "");
			//if (LDM != "å¶ä»" && BBM != "å¶ä»" && HBarCode_White.indexOf(BBMs) == -1) {
			@@ -789,6 +793,7 @@
			, "BBM": BBM
			, "LDM": LDM
			, "HMaterNumber": $("#HNumber").val()
			, "HOrgID": $("#HOrgID").val()
			},
			success: function (result) {
			var data = result.data;
			@@ -865,7 +870,11 @@
			}
			});
			}
			$("#Print2").click();
			if (LDM == "AAA") {
			$("#Print2").click();
			} else {
			$("#Print").click();
			}
			$("#HBarCode_White").val("");
			//åä»¶æ¡ç æ°éå·²æ«å® æ¡ç æ«å®å
			if (pcmQty == pcmQtyFlag) {
			@@ -890,7 +899,7 @@
			$("#HMixedBox").val("");
			$("input[name='HMixedBox']").prop("checked", false);
			form.render('checkbox');


			//åæ¶æµè½¬å¡å·åªè¯»(åæ¶åä¼æ°æ®éå¤)
			//$("#HFbarcode").removeAttr("readonly", "readonly");//æµè½¬å¡å·åªè¯»
			//$("#HFbarcode").css("background-color", "white");
			@@ -906,19 +915,19 @@
			$("#SubBarcode").focus();
			$("#SubBarcode").css("box-shadow", "0 0 0 1px #00ff00");
			}
			layer.confirm(
			'ä¿åæåï¼è¯·ç»§ç»éæ©æä½ï¼',
			{
			skin: 'layui-layer-lan',
			closeBtn: 0,
			btn: ['æ°å¢', 'å³é'],
			btn2: function () {//æ°å¢
			parent.layui.admin.events.closeThisTabs();
			}
			}, function () {//å³é
			window.location.reload();
			}
			);
			//layer.confirm(
			// 'ä¿åæåï¼è¯·ç»§ç»éæ©æä½ï¼',
			// {
			// skin: 'layui-layer-lan',
			// closeBtn: 0,
			// btn: ['æ°å¢', 'å³é'],
			// btn2: function () {//æ°å¢
			// parent.layui.admin.events.closeThisTabs();
			// }
			// }, function () {//å³é
			// window.location.reload();
			// }
			//);
			});

			//å¤±è´¥æç¤ºé³
			@@ -974,7 +983,9 @@
			var parintName = $("#PrintName").val();
			if (parintName == "æ¯è«å°" && LDM != "AAA") {
			report1 = urlAddRandomNo("../../grf/åè£åç©ææ è¯å¡(ç½é¡µç).grf");
			} else if (LDM == "AAA") {
			} else if (parintName == "å¢¨è¥¿å¥" && LDM != "AAA") {
			report1 = urlAddRandomNo("../../grf/åè£åç©ææ è¯å¡(ç½é¡µç)_MXG.grf");
			}else if (LDM == "AAA") {
			report1 = urlAddRandomNo("../../grf/åè£åç©ææ è¯å¡(ç½é¡µç)_MXG.grf");
			} else {
			report1 = urlAddRandomNo("../../grf/åè£åç©ææ è¯å¡(ç½é¡µç)2.grf");
			@@ -1011,9 +1022,10 @@
			//æå¼æå°æ¨¡æ¿
			var linterid = $("#HInterID").val();
			var Type = "HBarCodePrint";
			var OpenTmp = "ç½æ æå°1";
			var HOrgID = $("#HOrgID").val();
			var OpenTmp = "ç½æ æå°15";
			//var ReportViewer = document.getElementById("ReportViewer");
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + linterid.toString() + "\|" + HOrgID + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
			$("#Print2").click();
			});

			@@ -1093,7 +1105,7 @@
			var HFbarcode = $('#HFbarcode').val();
			var HInterID = $("#HInterID").val();
			var HBillNo2 = $("#HBillNo2").val();//åæ®å·


			icmoQty = 20;
			icmoQtyNow = 20;
			//
			@@ -1105,7 +1117,8 @@
			"sHBarcodeNo": $("#HSourceBillNo").val(),
			"sHMaterID": $("#HMaterID").val(),
			"sHUnitID": $("#HUnitID").val(),
			"sHMaterName": $("#HMaterName").val()
			"sHMaterName": $("#HMaterName").val(),
			"HOrgID": $("#HOrgID").val()
			},
			success: function (result) {
			var data = result.data;
			@@ -1135,6 +1148,7 @@
			, "HNumber": $("#HNumber").val()
			, "HName": $("#HMaterName").val()
			, "HModel": $("#HModel").val()
			, "HOrgID": $("#HOrgID").val()
			},
			success: function (result) {
			var data = result.data;