MES-WEB-LayUI.git

			@@ -63,11 +63,11 @@
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<h1 style="text-align:center;"><b>å·¥åºæµè½¬å¡</b></h1>
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="5" style="padding:1px;">ç¾æ¯ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">æ£ç§»ç¥¨ä¿¡æ¯</li>
			<li lay-id="4" style="padding:1px;">å¶åä¿¡æ¯</li>
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<!--<li lay-id="5" style="padding:1px;">ç¾æ¯ä¿¡æ¯</li>-->
			<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">æ£ç§»ç¥¨ä¿¡æ¯</li>
			<li lay-id="4" style="padding:1px;">å¶åä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			@@ -174,12 +174,18 @@
			<input type="hidden" name="HUnitID" id="HUnitID" value="0">
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æè´¨</label>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¹æ¬¡å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
			<input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
			</div>
			</div>-->
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æè´¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<!--<div class="layui-col-xs3 layui-inline">
			@@ -237,20 +243,20 @@

			<div class="layui-row">
			<!--<div class="layui-col-xs6 layui-inline">
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width:610px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width:610px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¾æ°é</label>
			<div class="layui-input-inline">
			@@ -269,7 +275,12 @@
			<input type="text" class="layui-input" name="HSplitColorQty" id="HSplitColorQty" style="float: left;" value="0">
			</div>
			</div>

			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¨¡ç©´å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="float: left;" value="">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -1024,7 +1035,7 @@
			//å¤ææä½ç±»å
			if (OperationType == 1 ) {//æ æºåæ°å¢
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			url: GetWEBURL() + "/Web/GetMAXNumPDA",
			type: "GET",
			data: { "HBillType": '3772' },
			success: function (d) {
			@@ -1062,7 +1073,7 @@
			layer.alert(result.Message, { icon: 5 });
			} else {
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			url: GetWEBURL() + "/Web/GetMAXNumPDA",
			type: "GET",
			data: { "HBillType": '3772' },
			success: function (d) {
			@@ -1879,7 +1890,7 @@
			}
			$.ajax({
			type: "get",
			url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
			url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
			async: true,
			data: { "sWhere": " and åæ®å·='" + HBillNo + "'" + " and å·¥åºä»£ç !='" + 9999 + "'", "user": sessionStorage["HUserName"], "HBillSubType": HRoutType },
			success: function (result) {
			@@ -1918,7 +1929,7 @@
			form.render('checkbox');
			},
			error: function (result) {
			layer.close(index);
			//layer.close(index);
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}
			@@ -1932,6 +1943,10 @@
			layer.msg("è¯·éæ©ä»»å¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HBatchNo").val() == "" ) {
			// layer.msg("è¯·è¾å¥æ¹æ¬¡å·ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			if ($("#HQty").val() == "" \|\| $("#HQty").val() <= 0) {
			layer.msg("åºæ¬ä¿¡æ¯ä¸æµè½¬å¡æ°éä¸è½ä¸ºç©ºä¸ä¸è½å°äºçäº0ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			@@ -2016,6 +2031,13 @@
			return;
			}
			}

			var HMouldNum = $('#HMouldNum').val();

			//if (HMouldNum == "") {
			// layer.msg("æ¨¡ç©´å·ä¸è½ä¸ºç©ºï¼");
			// return;
			//}



			@@ -2269,6 +2291,7 @@
			, "HMaterModel": data.ææè§æ ¼
			, "HWidth": data.å¹å®½
			, "HWeight": data.åé
			, "HBatchNo": data.æ¹å·

			, "HAuxQty": data.è¾æ°é
			, "HAuxUnit": data.HAuxUnit
			@@ -2277,6 +2300,7 @@
			, "HAuxQty2": data.è¾æ°é2
			, "HAuxUnit2": data.HAuxUnit2
			, "HAuxUnitName2": data.è¾å©åä½2
			, "HMouldNum": data.æ¨¡ç©´å·


			, "HName": data.è®¢åççº§
			@@ -2655,7 +2679,7 @@
			$("#HMaterNumber2").val(data.ç©æä»£ç );
			$("#HMaterModel").val(data.è§æ ¼åå·);
			$("#HMaterModel2").val(data.è§æ ¼åå·);
			$("#HBatchNo").val(data.æ¹å·);
			$("#HBatchNo").val();
			$("#HUnitID").val(data.hunitid);
			$("#HUnitName").val(data.è®¡éåä½åç§°);
			$("#HUnitNumber").val(data.è®¡éåä½ä»£ç );
			@@ -2739,7 +2763,7 @@
			function getRoutingBillList(sWhere) {
			$.ajax({
			type: "get",
			url: GetWEBURL() + "LEMS/Gy_RoutingBillList",
			url: GetWEBURL() + "/LEMS/Gy_RoutingBillList",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (result) {
			@@ -2762,7 +2786,7 @@
			}
			},
			error: function (result) {
			layer.close(index);
			//layer.close(index);
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}