MES-WEB-LayUI.git

			@@ -20,90 +20,104 @@
			<body>
			<div class="layui-fluid">
			<div class="layui-card">
			<!--<div class="layui-card-header"></div>-->
			<div class="layui-card-body" style="padding: 15px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-form-item" style="margin-bottom: 20px;">
			<button type="button" lay-submit="" lay-filter="HAddBT" class="layui-btn layui-btn-radius">æ°å¢</button>
			<!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">æ¸ç©º</button>-->
			<button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">ä¿å</button>
			<button type="button" lay-submit="" lay-filter="Close" class="layui-btn layui-btn-radius layui-btn-danger">éåº</button>
			<button type="button" lay-submit="" lay-filter="HAddPrint" class="layui-btn layui-btn-radius">æ°å¢æå°æ¨¡æ¿</button>

			<div class="layui-inline">
			<div class="layui-input-block">
			<select name="city" lay-verify="required" id="dymb">
			<!--<option value="æªéæ©">è¯·éæ©æå°æ¨¡æ¿</option>-->
			<option value="HBarCodePrint">ç©ææ¡ç æ¨¡æ¿</option>
			<!--<option value="HPOInStockBill">éè´§å</option>-->
			<!--<option value="HPOInStockBill">éè´§å(æ ç¾çº¸)</option>-->
			<label class="layui-form-label" style="width: 85px;">æå°æ¨¡æ¿</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="dymb" id="dymb" lay-verify="dymb" class="ForFilteringSchemes">
			<!--å¨ææ¸²ææ¨¡æ¿-->
			</select>
			</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">
			<option value="æ¯è«å°" selected>æ¯è«å°</option>
			<option value="æ®è²ç¹">æ®è²ç¹</option>
			</select>
			<button type="button" lay-submit="" lay-filter="Print2" id="Print2" hidden="hidden"></button>

			<div class="layui-row" style="margin-top:20px">
			<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="æ¯è«å°">æ¯è«å°</option>
			<option value="æ®è²ç¹">æ®è²ç¹</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block">
			<select name="LDM" lay-verify="required" id="LDM">
			<option value="HEJ" selected>HEJ</option>
			<option value="DU3">DU3</option>
			<option value="QDR">QDR</option>
			<option value="AAA">15è½¦é´</option>
			<option value="å¶ä»">å¶ä»</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">é¶é¨ä»¶å·</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="BBM" lay-verify="required" id="BBM">
			<option value="1099081-00-E">1099081-00-E</option>
			<option value="1786947-00-B">1786947-00-B</option>
			<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>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">é¡¹ç®å·</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="NBXMH" id="NBXMH" lay-verify="NBXMH" class="ForFilteringSchemes">
			<!--å¨ææ¸²æåé¨é¡¹ç®å·-->
			</select>
			</div>
			</div>
			</div>
			<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="QDR">QDR</option>
			<option value="AAA">15è½¦é´</option>
			<option value="å¶ä»">å¶ä»</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block">
			<select name="BBM" lay-verify="required" id="BBM">
			<option value="1099081-00-E">1099081-00-E</option>
			<option value="1786947-00-B">1786947-00-B</option>
			<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>
			</div>

			</div>
			<div class="layui-form-item">
			<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>
			<div class="">
			<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 +125,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 +159,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 +184,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 +250,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 +262,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>
			@@ -307,6 +318,7 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
			<script src="../../CreateControl.js"></script>
			<script src="../../../layuiadmin/MESLanguage.js"></script>
			<script>
			//CreateReport("Report");
			function getUrlVars() {
			@@ -346,42 +358,9 @@
			}
			var option = [];
			set_InitGrid();
			var HModName = "MES_ProductionLinePackaging_MXG";
			initFunction(1, HModName, sessionStorage["HTranSlate"]);

			//åå§åæç»è¡¨æ ¼
			function set_InitGrid() {
			columns = [
			{ type: 'numbers', title: 'åºå·' }
			, {
			field: time, title: 'æ«ç æ¥æ', width: 110, templet: function (d) {
			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 }
			, { field: 'HNumber', title: 'ç©æç¼ç ', width: 105 }
			, { field: 'HName', title: 'ç©æåç§°', width: 105 }
			, { field: 'HModel', title: 'è§æ ¼åå·', width: 105 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			//, { field: 'HWhID', title: 'ä»åº', width: 80 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 80 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 195 }
			, { toolbar: '#toolBar', width: 65, fixed: 'right' }
			];
			option = {
			id: 'smjl-table'
			, elem: '#smjl-table'
			//, toolbar: '#toolbarDemo'
			, page: false
			//, cellMinWidth: 120
			//, height: 500
			, cols: [columns]
			//, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			, done: function (res, curr, count) {
			}
			};
			}
			//å¨å±åé
			var ZJTMFlag = false;//åä»¶æ¡ç è¾å¥æ è®°
			//è·åå½åæ¶é´å¤ç
			@@ -398,15 +377,16 @@
			var pcmQtyFlag = 0;
			var icmoQty = 0;//æµè½¬å¡æ°é
			var icmoQtyNow = 0;//æµè½¬å¡å©ä½æ°é
			//console.log(sessionStorage);

			//é¡µé¢åå§åèµå¼
			layer.load(3);
			//è·ååæ®å·
			getBillno();

			var batch1 = ''; // ç¬¬ä¸ä¸ªæ¹æ¬¡
			var batch2 = ''; // ç¬¬äºä¸ªæ¹æ¬¡
			var batch3 = ''; // ç¬¬ä¸ä¸ªæ¹æ¬¡ï¼å¤ç¨ï¼
			var currentBatchCount = 0; // å½åå·²è®°å½çæ¹æ¬¡æ°é


			$("#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");
			@@ -416,6 +396,45 @@
			$("#HFbarcode").css("background-color", "#efefef4d");
			$("#pcmQty").attr("readonly", "readonly");//æ°éåªè¯»
			$("#pcmQty").css("background-color", "#efefef4d");

			//è·åæå°æ¨¡æ¿
			GetHBarCodePrint();
			//è·åé¡¹ç®å·
			GetHProject();

			//åå§åæç»è¡¨æ ¼
			function set_InitGrid() {
			columns = [
			{ type: 'numbers', title: 'åºå·' }
			, {
			field: time, title: 'æ«ç æ¥æ', width: 110, templet: function (d) {
			return util.toDateString(time, "yyyy-MM-dd");
			}
			}
			, { field: 'HSourceBillNo', title: 'æ¡å½¢ç ', width: 145 }
			, { field: 'HBillNo', title: 'æºååå·', width: 125 }
			, { field: 'HBarCode', title: 'å¯ä¸ç ', width: 125 }
			, { field: 'HNumber', title: 'ç©æç¼ç ', width: 105 }
			, { field: 'HName', title: 'ç©æåç§°', width: 105 }
			, { field: 'HModel', title: 'è§æ ¼åå·', width: 105 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 80 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 195 }
			, { toolbar: '#toolBar', width: 65, fixed: 'right' }
			];
			option = {
			id: 'smjl-table'
			, elem: '#smjl-table'
			, page: false
			, cols: [columns]
			, done: function (res, curr, count) {
			}
			};
			}

			//è·ååæ®å·
			getBillno();



			//å¡«åè£ç®±æ°éååæ è·³èµ°
			@@ -427,7 +446,7 @@
			layer.msg("è¯·è¾å¥æ£ç¡®çæ´æ°ï¼");
			return;
			}


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


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


			//æ²¡ææµè½¬å¡å¯ç¨ç
			form.on('checkbox(HMixedBox)', function (obj) {
			if (icmoQtyNow == 0) {
			if (zxQty == 0) {
			playSound();
			layer.msg("å©ä½æ°éä¸º" + icmoQtyNow + ",ä¸åè®¸æ··ç®±ï¼", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			layer.msg("è£ç®±æ°éä¸º" + zxQty + ",ä¸åè®¸æ··ç®±ï¼", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			$("input[name='HMixedBox']").prop("checked", false);
			form.render('checkbox');
			return;
			@@ -495,7 +514,23 @@
			}

			});

			//ææµè½¬å¡å¯ç¨ç
			//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) { //æ«æ¡å½¢ç
			@@ -570,6 +605,88 @@
			if (pcmQty == pcmQtyFlag) {
			playSound();
			layer.alert("åä»¶æ¡ç æ°éå·²æ«å®ï¼è¯·ç¹å»ä¿åï¼", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			}
			//å¤ææ¹æ¬¡æ¯å¦è¶è¿3ä¸ª
			if (zxQty == zxQtyFlag) {
			playSound();
			layer.alert("è£ç®±æ°éå·²æ«å®ï¼è¯·ç¹å»ä¿åï¼", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			$("#HRemark").attr("readonly", "readonly");//ä¸æ»¡ç®±æ è¯åªè¯»
			$("#HRemark").css("background-color", "#efefef4d");
			return;
			}
			// ç´æ¥ä½¿ç¨åºå®ä½ç½®æªåæ¹æ¬¡ä¿¡æ¯
			var batchInfo = '';
			var SubBarcode = $('#SubBarcode').val();

			// ç´æ¥ä»ç¬¬16-23ä¸ªåç¬¦æªåæ¹æ¬¡ä¿¡æ¯ï¼ç´¢å¼ä»0å¼å§ï¼
			// ç¬¬16ä¸ªåç¬¦ç´¢å¼æ¯16ï¼ç¬¬23ä¸ªåç¬¦ç´¢å¼æ¯23ï¼éè¦æªå8ä¸ªåç¬¦
			if (SubBarcode.length >= 24) { // ç¡®ä¿æ¡ç é¿åº¦è¶³å¤
			batchInfo = SubBarcode.substring(18, 26); // ç´æ¥æªååºå®ä½ç½®
			console.log("æ¹æ¬¡ä¿¡æ¯(18, 26):", batchInfo);
			} else {
			playSound();
			layer.alert("æ¡ç é¿åº¦ä¸è¶³24ä½ï¼æ æ³æåæ¹æ¬¡ä¿¡æ¯", {
			icon: 5,
			btn: ['éåº'],
			time: 100000,
			offset: 't'
			});
			return;
			}

			// æ¹æ¬¡æ£æ¥é»è¾
			if (batchInfo && batchInfo.length === 8) {
			// æ£æ¥æ¯å¦æ··ç®±
			if ($("#HMixedBox").val() == "") { // ä¸æ··ç®±
			if (batch1 === '') {
			// ç¬¬ä¸ä¸ªæ¹æ¬¡
			batch1 = batchInfo;
			currentBatchCount = 1;
			} else {
			// æ£æ¥æ¹æ¬¡æ¯å¦ä¸è´
			if (batchInfo !== batch1) {
			playSound();
			layer.alert("ä¸åè®¸æ··ç®±ï¼å½åæ¹æ¬¡ä¸ºï¼" + batch1 + "ï¼æ«æçæ¹æ¬¡ä¸ºï¼" + batchInfo, {
			icon: 5,
			btn: ['éåº'],
			time: 100000,
			offset: 't'
			});
			return;
			}
			}
			}
			else { // åè®¸æ··ç®±
			if (batch1 === '') {
			// ç¬¬ä¸ä¸ªæ¹æ¬¡
			batch1 = batchInfo;
			currentBatchCount = 1;
			} else if (batch2 === '' && batchInfo !== batch1) {
			// ç¬¬äºä¸ªä¸åæ¹æ¬¡
			batch2 = batchInfo;
			currentBatchCount = 2;
			} else if (batchInfo !== batch1 && batchInfo !== batch2) {
			// ç¬¬ä¸ä¸ªä¸åæ¹æ¬¡
			playSound();
			layer.alert("å·²åå¨ä¸¤ä¸ªä¸åçæ¹æ¬¡ï¼ä¸åè®¸ç¬¬ä¸ä¸ªæ¹æ¬¡ï¼\næ¹æ¬¡1: " + batch1 + "\næ¹æ¬¡2: " + (batch2 \|\| "æ ") + "\nå½åæ¹æ¬¡: " + batchInfo, {
			icon: 5,
			btn: ['éåº'],
			time: 100000,
			offset: 't'
			});
			return;
			}
			}
			} else {
			// æ¹æ¬¡ä¿¡æ¯æ æ
			playSound();
			layer.alert("æ¹æ¬¡ä¿¡æ¯æ ¼å¼ä¸æ£ç¡®ï¼åºä¸º8ä¸ªåç¬¦", {
			icon: 5,
			btn: ['éåº'],
			time: 100000,
			offset: 't'
			});
			return;
			}
			//var a = 0;
			@@ -649,6 +766,7 @@
			, "HNumber": $("#HNumber").val()
			, "HName": $("#HMaterName").val()
			, "HModel": $("#HModel").val()
			, "HOrgID": $("#HOrgID").val()
			},
			success: function (result) {
			var data = result.data;
			@@ -660,7 +778,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
			@@ -743,12 +861,19 @@
			var LDM = $("#LDM").val();//
			var BBM = $("#BBM").val();//
			var HBarCode_White = $("#HBarCode_White").val();//ç½æ å·
			var NBXMH = $("#NBXMH").val();//åé¨é¡¹ç®å·

			if (HBarCode_White == "") {
			if (NBXMH == "" \|\| NBXMH == "å¶ä»") {
			playSound();
			layer.alert("ç½æ å·ä¸è½ä¸ºç©º!", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			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 +914,8 @@
			, "BBM": BBM
			, "LDM": LDM
			, "HMaterNumber": $("#HNumber").val()
			, "HOrgID": $("#HOrgID").val()
			, "NBXMH": $("#NBXMH").val()
			},
			success: function (result) {
			var data = result.data;
			@@ -796,9 +923,7 @@
			playSound();
			layer.msg("æ«ææå", { time: 5000, icon: 6 });
			} else {
			playSound();
			// $("#verifycode").click();
			//layer.msg(result.Message, { icon: 5 });
			playSound();
			layer.alert("æå¥ä¸»è¡¨å¤±è´¥", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			}
			@@ -808,53 +933,52 @@
			return;
			}
			});

			var HItemID = "";
			var AllHItemID = "";
			var HRemark = $("#HRemark").val() \|\| "æ ";

			for (var i = 0; i < datas.length; i++) {
			var HitemID = datas[i].HitemID;
			var HBillType = datas[i].HBillType;
			if (HBillType != 3772) {
			var HRemark = $("#HRemark").val();
			if (!HRemark) {
			HRemark = "æ ";
			}
			$.ajax({//æå¥åè¡¨
			url: GetWEBURL() + "/LEMS/SaveToSc_PackUnionBillSub",
			type: "GET",
			async: false,
			data: {
			"HitemID": HitemID
			, "HRemark": HRemark
			},
			success: function (result) {
			var data = result.data;
			if (result.count == 1) {
			//layer.msg("æ«ææå", { time: 5000, icon: 6 });
			} else {
			playSound();
			// $("#verifycode").click();
			//layer.msg(result.Message, { icon: 5 });
			layer.alert("æå¥åè¡¨å¤±è´¥", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			}
			}, error: function () {
			playSound();
			layer.alert("æå¥åè¡¨æ¹æ³åçéè¯¯!", { icon: 5 });
			}
			});
			AllHItemID += (AllHItemID ? "," : "") + datas[i].HitemID;
			if (datas[i].HBillType != 3772) {
			HItemID += (HItemID ? "," : "") + datas[i].HitemID;
			}
			}
			for (var i = 0; i < datas.length; i++) {
			var HitemID = datas[i].HitemID
			$.ajax({//æ´æ°tempè¡¨æ è®°åæ®µ
			url: GetWEBURL() + "/LEMS/Update_Flag_HRelationInterID",

			// === æ¹éè¯·æ±1ï¼æå¥åè¡¨ ===
			if (HItemID.length > 0) {
			$.ajax({
			url: GetWEBURL() + "/LEMS/SaveToSc_PackUnionBillSub_Batch",
			type: "GET",
			async: false,
			data: {
			"HitemID": HitemID
			},
			data: { HitemID: HItemID, HRemark: HRemark },
			success: function (result) {
			var data = result.data;
			if (result.count == 1) {
			//layer.msg("æ«ææå", { time: 5000, icon: 6 });
			} else {
			playSound();

			layer.alert("æå¥åè¡¨å¤±è´¥", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			return;
			}
			}, error: function () {
			playSound();
			layer.alert("æå¥åè¡¨æ¹æ³åçéè¯¯!", { icon: 5 });
			}
			});
			}

			// === æ¹éè¯·æ±2ï¼æ´æ°æ è®° ===
			if (AllHItemID.length > 0) {
			$.ajax({
			url: GetWEBURL() + "/LEMS/Update_Flag_HRelationInterID_Batch",
			type: "GET",
			async: false,
			data: { HitemID: AllHItemID },
			success: function (result) {
			var data = result.data;
			if (result.count == 1) {
			} else {
			playSound();
			layer.alert("æå¥ä¸»è¡¨å¤±è´¥", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			@@ -865,7 +989,69 @@
			}
			});
			}
			$("#Print2").click();

			//for (var i = 0; i < datas.length; i++) {
			// var HitemID = datas[i].HitemID;
			// var HBillType = datas[i].HBillType;
			// if (HBillType != 3772) {
			// var HRemark = $("#HRemark").val();
			// if (!HRemark) {
			// HRemark = "æ ";
			// }
			// $.ajax({//æå¥åè¡¨
			// url: GetWEBURL() + "/LEMS/SaveToSc_PackUnionBillSub",
			// type: "GET",
			// async: false,
			// data: {
			// "HitemID": HitemID
			// , "HRemark": HRemark
			// },
			// success: function (result) {
			// var data = result.data;
			// if (result.count == 1) {
			// //layer.msg("æ«ææå", { time: 5000, icon: 6 });
			// } else {
			// playSound();
			// // $("#verifycode").click();
			// //layer.msg(result.Message, { icon: 5 });
			// layer.alert("æå¥åè¡¨å¤±è´¥", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			// return;
			// }
			// }, error: function () {
			// playSound();
			// layer.alert("æå¥åè¡¨æ¹æ³åçéè¯¯!", { icon: 5 });
			// }
			// });
			// }
			//}
			//for (var i = 0; i < datas.length; i++) {
			// var HitemID = datas[i].HitemID
			// $.ajax({//æ´æ°tempè¡¨æ è®°åæ®µ
			// url: GetWEBURL() + "/LEMS/Update_Flag_HRelationInterID",
			// type: "GET",
			// async: false,
			// data: {
			// "HitemID": HitemID
			// },
			// success: function (result) {
			// var data = result.data;
			// if (result.count == 1) {
			// //layer.msg("æ«ææå", { time: 5000, icon: 6 });
			// } else {
			// playSound();
			// layer.alert("æå¥ä¸»è¡¨å¤±è´¥", { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			// }
			// }, error: function () {
			// playSound();
			// layer.alert("æ´æ°æ è®°æ¹æ³åçéè¯¯!", { icon: 5 });
			// }
			// });
			//}
			if (LDM == "AAA") {
			$("#Print2").click();
			} else {
			$("#Print").click();
			}
			$("#HBarCode_White").val("");
			//åä»¶æ¡ç æ°éå·²æ«å® æ¡ç æ«å®å
			if (pcmQty == pcmQtyFlag) {
			@@ -890,7 +1076,7 @@
			$("#HMixedBox").val("");
			$("input[name='HMixedBox']").prop("checked", false);
			form.render('checkbox');


			//åæ¶æµè½¬å¡å·åªè¯»(åæ¶åä¼æ°æ®éå¤)
			//$("#HFbarcode").removeAttr("readonly", "readonly");//æµè½¬å¡å·åªè¯»
			//$("#HFbarcode").css("background-color", "white");
			@@ -906,19 +1092,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();
			// }
			//);
			});

			//å¤±è´¥æç¤ºé³
			@@ -945,13 +1131,7 @@
			//æå°æé®
			form.on('submit(Print2)', function (data) {//éåº
			//æå¼æå°æ¨¡æ¿
			var linterid = $("#HInterID").val();
			//var linterid = "28973";
			//var Type = "HBarCodePrint";
			//var OpenTmp = "åè£åç©ææ è¯å¡(ç½é¡µç)";
			//var ReportViewer = document.getElementById("ReportViewer");
			//window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());

			var linterid = $("#HInterID").val();
			var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by ç©æä»£ç ";
			$.ajax({
			type: "GET",
			@@ -974,7 +1154,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");
			@@ -985,11 +1167,7 @@
			showOptionDlg: false, //å¦æä¸æ¾ç¤ºæå°å¯¹è¯æ¡èç´æ¥æå°ï¼å°æ¤è¡æ³¨éå»æå³å¯
			report: report1,
			data: Customer
			};
			//var args = {
			// report: urlAddRandomNo("../../views/grf/åè£åç©ææ è¯å¡(ç½é¡µç).grf"),
			// data: Customer
			//};
			};
			webapp_ws_ajax_run(args);
			} else {
			layer.msg("æ¥æ æ°æ®!");
			@@ -1011,9 +1189,9 @@
			//æå¼æå°æ¨¡æ¿
			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());
			var HOrgID = $("#HOrgID").val();
			var OpenTmp = $("#dymb").val();
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + linterid.toString() + "\|" + HOrgID + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
			$("#Print2").click();
			});

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


			icmoQty = 20;
			icmoQtyNow = 20;
			//
			@@ -1105,7 +1283,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 +1314,8 @@
			, "HNumber": $("#HNumber").val()
			, "HName": $("#HMaterName").val()
			, "HModel": $("#HModel").val()
			, "NBXMH": $("#NBXMH").val()
			, "HOrgID": $("#HOrgID").val()
			},
			success: function (result) {
			var data = result.data;
			@@ -1193,6 +1374,54 @@
			}
			});
			}

			//è·åæå°æ¨¡æ¿
			function GetHBarCodePrint() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			async: false,
			url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
			data: { "HNumber": HModName },
			success: function (result) {
			var HBarCodePrint = "";
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HBarCodePrint += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
			}
			$("#dymb").append(HBarCodePrint);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}


			//è·åé¡¹ç®å·
			function GetHProject() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			async: false,
			url: GetWEBURL() + "/LEMS/GetHProject_MXG",
			data: { "HOrgID": $("#HOrgID").val() },
			success: function (result) {
			var NBXMH = "";
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			NBXMH += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
			}
			$("#NBXMH").append(NBXMH);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});