MES-WEB-LayUI.git

			@@ -86,8 +86,7 @@
			<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
			<div class="layui-card-header">
			<div class="layui-btn-group">

			<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
			<button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
			<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">å®¡æ ¸</button>
			<button type="button" id="ReVerIfySaver" class="layui-btn layui-btn-normal layui-btn-circle" lay-submit="" lay-filter="ReVerIfySaver">åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
			@@ -175,12 +174,6 @@
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">è®¡åæ°é:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§èµæº</label>
			<div class="layui-input-inline">
			<input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;">
			@@ -202,8 +195,6 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">æä½å:</label>
			<div class="layui-input-inline">
			@@ -215,6 +206,29 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">è®¡åæ°é:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ééæ°é:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="GatherQty" lay-verify="GatherQty" id="GatherQty" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ ¼æ°é:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
			</div>
			</div>

			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">ä¸è¯æ°é:</label>
			<div class="layui-input-inline">
			@@ -231,14 +245,6 @@
			<label class="layui-form-label">å ææ¥åºæ°:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HWasterQty2" lay-verify="HWasterQty2" id="HWasterQty2" autocomplete="off">
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">æ¥å·¥æ°é:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
			</div>
			</div>
			</div>
			@@ -340,7 +346,7 @@
			<script>
			//è·ååæ°
			var HBillType = ""; //åæ®ç±»å
			var HSourceInterID = ""; //æºåä¸»åç
			var HSourceInterID = ""; //æºåä¸»åç ï¼çäº§ç¶æä¸´æ¶è¡¨ä¸»åç ï¼
			var HSourceEntryID = ""; //æºåååç
			var HSourceBillNo = ""; //æºååå·
			var HSourceBillType = ""; //æºåç±»å
			@@ -498,6 +504,7 @@
			$("#HSourceName").val(LoadData[0].HSourceName); //çäº§èµæº
			$("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //æºååå·ï¼ææ¶åå¼è®¢åç¼å·ï¼
			$("#HSourceInterID").val(LoadData[0].HSourceInterID); //æºåä¸»åç (åå¼HInterID)
			//$("#HSourceInterID").val(LoadData[0].HICMOInterID); //æºåä¸»åç
			$("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //æºåååç (æºåè¡å·)
			$("#HSourceBillType").val(HSourceBillType); //æºåç±»å
			$("#HGroupID").val(LoadData[0].HDeptID); //çç»ID
			@@ -652,12 +659,12 @@


			//ä¿åæäº¤
			form.on('submit(Saver)', function (data) {
			form.on('submit(Saver)', function (objdata) {
			if (!AllowLoadData())//æ°æ®éªè¯
			{
			return false;
			}
			OverStepQty(data);
			OverStepQty(objdata);

			});

			@@ -839,7 +846,7 @@


			//éªè¯æ±æ¥æ°éæ¯å¦è¶è¿è®¡åæ°é
			function OverStepQty(data) {
			function OverStepQty(objdata) {
			var sWhere = "";
			if (OperationType == 3) //ç¼è¾
			{
			@@ -848,7 +855,7 @@
			HSourceBillNo = $("#HSourceBillNo").val();
			HSourceBillType = $("#HSourceBillType").val();
			}
			sWhere = " where HSourceID='" + $("#HSourceID").val() + "' and HSourceInterID='" + HSourceInterID + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
			sWhere = " where HSourceID='" + $("#HSourceID").val() + "' and HProcID='" + $("#HProcID").val() + "' and HSourceInterID='" + $("#HSourceInterID").val() + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
			$.ajax({
			url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/GetMESOverStepQty",
			type: "GET",
			@@ -856,9 +863,9 @@
			dataType: "json",//æ°æ®ç±»åå¯ä»¥ä¸º text xml json script jsonp
			async: false,
			success: function (datas) {
			var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
			var LoadData = datas.data.Sc_ProcessReportSub;
			var HQty = LoadData[0].HQty;
			var HBadCount = LoadData[0].HBadCount;
			var HBadCount = LoadData[0].HBadQty;
			var HWasterQty = LoadData[0].HWasterQty;
			var HWasterQty2 = LoadData[0].HWasterQty2;
			var yessqty = HQty + HBadCount + HWasterQty + HWasterQty2;
			@@ -875,7 +882,7 @@
			});
			}
			else {
			Submit(data);
			Submit(objdata);
			}
			},
			error: function (err) {
			@@ -885,18 +892,19 @@
			}

			//æäº¤è¯·æ±ajax
			function Submit(data) {
			if (data.field.HBadCount == "" \|\| data.field.HBadCount == null) {
			data.field.HBadCount = 0;
			function Submit(objdata) {
			if (objdata.field.HBadCount == "" \|\| objdata.field.HBadCount == null) {
			objdata.field.HBadCount = 0;
			}
			if (data.field.HWasterQty == "" \|\| data.field.HWasterQty == null) {
			data.field.HWasterQty = 0;
			if (objdata.field.HWasterQty == "" \|\| objdata.field.HWasterQty == null) {
			objdata.field.HWasterQty = 0;
			}
			if (data.field.HWasterQty2 == "" \|\| data.field.HWasterQty2 == null) {
			data.field.HWasterQty2 = 0;
			if (objdata.field.HWasterQty2 == "" \|\| objdata.field.HWasterQty2 == null) {
			objdata.field.HWasterQty2 = 0;
			}
			var sMainStr = JSON.stringify(data.field);
			var sMainSub = sMainStr + ';' + refSav;
			var sMainStr = JSON.stringify(objdata.field);
			var sMainSub = sMainStr + ';'+ refSav;


			$.ajax({
			type: "POST",
			@@ -996,6 +1004,78 @@
			}
			});
			}

			//#region çå¬è¾å¥æ¡æ¹åå¼
			//è¾å¥æ¡çå¼æ¹åæ¶è§¦å
			$("#HBadCount").on("input", function (e) {
			//è·åinputè¾å¥çå¼
			var HBadCount = e.delegateTarget.value == '' ? '0' : e.delegateTarget.value;
			//è·åééæ°é
			var GatherQty = $("#GatherQty").val() == '' ? '0' : $("#GatherQty").val();
			//è·ååæ ¼æ°é
			var Hqy = $("#HQty").val() == '' ? '0' : $("#HQty").val();//parseFloat($("#HQty").val())
			//å å·¥æ¥åºæ°
			var HWasterQty = $("#HWasterQty").val() == '' ? '0' : $("#HWasterQty").val();
			//å ææ¥åºæ°
			var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
			//åæ ¼=éé-(ä¸è¯+æ¥åº)GatherQty
			Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
			if (Hqy < 0)
			{
			layer.msg("åæ ¼æ°éä¸è½ä¸ºè´æ°!");
			HBadCount = 0;
			Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
			$("#HBadCount").val(HBadCount);
			$("#HBadCount").focus();
			}
			$("#HQty").val(Hqy);
			});
			$("#HWasterQty").on("input", function (e) {
			//è·åinputè¾å¥çå¼
			var HWasterQty = e.delegateTarget.value == '' ? '0' : e.delegateTarget.value;
			//è·åééæ°é
			var GatherQty = $("#GatherQty").val() == '' ? '0' : $("#GatherQty").val();
			//è·ååæ ¼æ°é
			var Hqy = $("#HQty").val() == '' ? '0' : $("#HQty").val();//parseFloat($("#HQty").val())
			//ä¸è¯æ°é
			var HBadCount = $("#HBadCount").val() == '' ? '0' : $("#HBadCount").val();
			//å ææ¥åºæ°
			var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
			//åæ ¼=éé-(ä¸è¯+æ¥åº)GatherQty
			Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
			if (Hqy < 0) {
			layer.msg("åæ ¼æ°éä¸è½ä¸ºè´æ°!");
			HWasterQty = 0;
			Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
			$("#HWasterQty").val(HWasterQty);
			$("#HWasterQty").focus();
			}
			$("#HQty").val(Hqy);
			});
			$("#HWasterQty2").on("input", function (e) {
			//è·åinputè¾å¥çå¼
			var HWasterQty2 = e.delegateTarget.value == '' ? '0' : e.delegateTarget.value;
			//è·åééæ°é
			var GatherQty = $("#GatherQty").val() == '' ? '0' : $("#GatherQty").val();
			//è·ååæ ¼æ°é
			var Hqy = $("#HQty").val() == '' ? '0' : $("#HQty").val();//parseFloat($("#HQty").val())
			//ä¸è¯æ°é
			var HBadCount = $("#HBadCount").val() == '' ? '0' : $("#HBadCount").val();
			//å å·¥æ¥åºæ°
			var HWasterQty = $("#HWasterQty").val() == '' ? '0' : $("#HWasterQty").val();
			//åæ ¼=éé-(ä¸è¯+æ¥åº)GatherQty
			Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
			if (Hqy < 0) {
			layer.msg("åæ ¼æ°éä¸è½ä¸ºè´æ°!");
			HWasterQty2 = 0;
			Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
			$("#HWasterQty2").val(HWasterQty2);
			$("#HWasterQty2").focus();
			}
			$("#HQty").val(Hqy);
			});
			//#endregion

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

			@@ -1014,7 +1094,7 @@
			layer.msg("äº§åç¼ç ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HRelBeginDate").val() == '' \|\| $("#HWorkBeginDate").val() == null) {
			if ($("#HRelBeginDate").val() == '' \|\| $("#HRelBeginDate").val() == null) {
			layer.msg("å¼å·¥æ¶é´ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			@@ -1030,6 +1110,10 @@
			layer.msg("æä½åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#GatherQty").val() == '' \|\| $("#GatherQty").val() == null) {
			layer.msg("ééæ°éä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HQty").val() == '' \|\| $("#HQty").val() == null) {
			layer.msg("æ¥å·¥æ°éä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;