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">
			<!--åºæ¬ä¿¡æ¯-->
			@@ -243,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">
			@@ -275,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">
			@@ -338,6 +343,12 @@
			<label class="layui-form-label"> ææè§æ ¼</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
			</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="HMateOutBatchNo" id="HMateOutBatchNo">
			</div>
			</div>
			</div>
			@@ -568,12 +579,7 @@
			<input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
			</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="HMateOutBatchNo" id="HMateOutBatchNo" style="background-color:#efefef4d;" readonly>
			</div>
			</div>

			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æè´¨</label>
			<div class="layui-input-inline">
			@@ -1049,7 +1055,8 @@
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
			"HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
			}];
			table.render(option);
			}
			@@ -1102,7 +1109,8 @@
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
			"HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
			}];
			table.render(option);
			}
			@@ -1112,6 +1120,7 @@
			}
			else if (OperationType == 3) {//ç¼è¾
			$("#HItemID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			$("#btnRoutingBill").addClass("layui-btn-disabled").attr("disabled", true);
			set_EditFromGrid();

			}
			@@ -1181,7 +1190,8 @@
			, { field: 'HSupFlag', title: 'æ¯å¦å§å¤', templet: '#HSupFlag' }
			, { field: 'HQty', title: 'æµè½¬å¡æ°é', totalRow: true, edit: 'text', width:120 }
			, { field: 'HSNCtrl', title: 'SNè¿ç«æ§å¶', templet: "#HSNCtrl", width: 120 }

			, { field: 'HRoutingBillMainID', title: 'å·¥èºè·¯çº¿ID', hide: true }
			, { field: 'HRoutingBillEntryID', title: 'å·¥èºè·¯çº¿åID', hide: true }
			//, { field: 'HWorkRemark', title: 'å å·¥è¯´æ', edit: 'text' }
			//, { field: 'HDeptID', title: 'é¨é¨ID', hide: true }
			//, { field: 'HDeptNumber', title: 'é¨é¨ä»£ç ', edit: 'text', event: "HDeptCheck" }
			@@ -1243,7 +1253,8 @@
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
			"HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
			};
			switch (obj.event) {
			case 'btn-AddLine':
			@@ -1472,30 +1483,41 @@
			}
			});

			$("#HQty").on("input", function (e) {
			//è·åinputè¾å¥çå¼
			if (parseInt(e.delegateTarget.value)> parseInt($("#HPlanQty").val())) {
			return layer.msg("æåæ°éä¸è½è¶è¿å¯æåæ°é!");
			}
			else {
			$(document).ready(function () {
			var currentValue = $("#HQty").val(); // åå¨å½åå¼çåé

			$("#HQty").on("input", function (e) {
			var previousValue = currentValue; // åæ´åçå¼
			currentValue = $(this).val(); // æ´æ°å½åå¼

			//è·åinputè¾å¥çå¼
			if (parseInt(e.delegateTarget.value) > parseInt($("#HPlanQty").val())) {
			$("#HQty").val(previousValue);
			currentValue = previousValue;
			return layer.msg("æåæ°éä¸è½è¶è¿å¯æåæ°é!");
			}
			else {
			for (var i = 0; i < option.data.length; i++) {
			option.data[i]["HQty"] = e.delegateTarget.value;
			}
			}
			table.render(option);

			for (var i = 0; i < option.data.length; i++) {
			option.data[i]["HQty"] = e.delegateTarget.value;
			$('#HSupFlag' + (i + 1)).find("option[value='" + (option.data[i].HSupFlag == "false" ? "false" : "true") + "']").attr("selected", true);

			if (option.data[i].HSNCtrl.toString() == "true") {
			$('#HSNCtrl' + (i + 1)).attr("checked", true);
			}
			}
			}
			table.render(option);

			for (var i = 0; i < option.data.length; i++) {
			$('#HSupFlag' + (i + 1)).find("option[value='" + (option.data[i].HSupFlag == "false" ? "false" : "true") + "']").attr("selected", true);
			form.render('select');
			form.render('checkbox');

			if (option.data[i].HSNCtrl.toString() == "true") {
			$('#HSNCtrl' + (i + 1)).attr("checked", true);
			}
			}

			form.render('select');
			form.render('checkbox');

			});
			});



			//çå¬ååæ ¼ç¼è¾ ååæ ¼ç¼è¾å åæ´
			table.on('edit(mainTable)', function (obj) {
			@@ -1885,7 +1907,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) {
			@@ -1901,14 +1923,14 @@

			for (var i = 0; i < data.length; i++) {
			Tablerow.push({
			"HProcNo": data[i].å·¥åºå·, "HProcID": data[i].hprocid, "HProcNumber": data[i].å·¥åºä»£ç , "HProcName": data[i].å·¥åº, "HWorkRemark": data[i].è¡¨ä½å¤æ³¨,
			"HProcNo": data[i].å·¥åºå·, "HProcID": data[i].HProcID, "HProcNumber": data[i].å·¥åºä»£ç , "HProcName": data[i].å·¥åº, "HWorkRemark": data[i].è¡¨ä½å¤æ³¨,
			"HCenterID": data[i].HCenterID, "HCenterNumber": data[i].å·¥ä½ä¸å¿ä»£ç , "HCenterName": data[i].å·¥ä½ä¸å¿åç§°,
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": data[i].HSupID, "HSupNumber": data[i].ä¾åºåä»£ç , "HSupName": data[i].ä¾åºå, "HSupFlag": data[i].å§å¤æ è®° == 0 ? "false" : "true",
			"HQty": HLZQty, "HSNCtrl": data[i].SNè¿ç«æ§å¶ == 0 ? "false" : "true", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].å·¥èºåæ°, "HPicNum": data[i].å¾çº¸ç¼å·, "HProcCheckNote": data[i].æ¬å·¥åºç¡®è®¤è®°å½,
			"HRelationQty_OutBad": "0"
			"HRelationQty_OutBad": "0", "HRoutingBillMainID": data[i].hmainid, "HRoutingBillEntryID": data[i].hsubid
			});
			}
			option.data = Tablerow;
			@@ -1924,7 +1946,7 @@
			form.render('checkbox');
			},
			error: function (result) {
			layer.close(index);
			//layer.close(index);
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}
			@@ -1938,6 +1960,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;
			@@ -2023,6 +2049,13 @@
			}
			}

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

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



			//å é¤åè¡¨æ°æ®æ¶ ä¼å ç¨æ°ç»çä½ç½®,éè¦éæ°æä¸ä¸é¡ºåº
			@@ -2031,7 +2064,7 @@
			if (table.cache["mainTable"][i] != "") {
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
			sSubTable.push(table.cache["mainTable"][i])
			}
			}
			}
			for (var i = 0; i < sSubTable.length; i++) {
			if (!sSubTable[i].HProcNo) {
			@@ -2049,11 +2082,11 @@
			layer.msg("ç¬¬" + indexRow + "è¡ï¼å·¥åºä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!sSubTable[i].HCenterID) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼å·¥ä½ä¸å¿ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if (!sSubTable[i].HCenterID) {
			// var indexRow = i + 1;
			// layer.msg("ç¬¬" + indexRow + "è¡ï¼å·¥ä½ä¸å¿ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			if (sSubTable[i].HSupFlag == "true") {
			if (!sSubTable[i].HSupID) {
			var indexRow = i + 1;
			@@ -2063,6 +2096,12 @@
			}
			}
			data.field.HPRDORGID = sessionStorage["OrganizationID"];//ç»ç»

			data.field.HMaterNumber2 = data.field.HMaterNumber2.replace("\"", "â").replace(";", "ï¼");
			data.field.HMaterName2 = data.field.HMaterName2.replace("\"", "â").replace(";", "ï¼");
			data.field.HMaterNumber = data.field.HMaterNumber.replace("\"", "â").replace(";", "ï¼");
			data.field.HMaterName = data.field.HMaterName.replace("\"", "â").replace(";", "ï¼");

			//var HBLFlag = data.field.HBLFlag;
			//HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//å°æ°ç»åå¹¶æåç¬¦ä¸²
			var sMainStr = JSON.stringify(data.field);
			@@ -2229,7 +2268,8 @@
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HSNCtrl": "false", "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
			"HRoutingBillMainID": 0, "HRoutingBillEntryID": 0,"HSourceID":0
			}];
			table.render(option);
			}
			@@ -2284,6 +2324,7 @@
			, "HAuxQty2": data.è¾æ°é2
			, "HAuxUnit2": data.HAuxUnit2
			, "HAuxUnitName2": data.è¾å©åä½2
			, "HMouldNum": data.æ¨¡ç©´å·


			, "HName": data.è®¢åççº§
			@@ -2662,7 +2703,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.è®¡éåä½ä»£ç );
			@@ -2746,7 +2787,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) {
			@@ -2763,13 +2804,14 @@
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HSNCtrl": false, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
			"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			"HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": "",
			"HRoutingBillMainID": 0, "HRoutingBillEntryID": 0
			}];
			table.render(option);
			}
			},
			error: function (result) {
			layer.close(index);
			//layer.close(index);
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}