MES-WEB-LayUI.git

			@@ -2,7 +2,7 @@
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>å·¥åºè¿ç«æ¥æ¶å</title>
			<title class="jzd">å·¥åºè¿ç«æ¥æ¶å</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			@@ -111,12 +111,12 @@
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
			<div style="background-color:#0085E8;">
			<span style="color: white;"><i class="layui-icon layui-icon-form"></i>å·¥åºè¿ç«æ¥æ¶å</span>
			<span style="color: white;" class="jzd"><i class="layui-icon layui-icon-form"></i>å·¥åºè¿ç«æ¥æ¶å</span>
			</div>
			<div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
			<button type="button" lay-submit="" lay-filter="Add" 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="Saver" id="Saver" class="layui-btn layui-btn-radius">ä¿å</button>
			<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">éåº</button>
			</div>
			<div class="layui-form-item">
			@@ -164,6 +164,12 @@
			<th>æ¥æ¶æ°é</th>
			<td class="bz_td">
			<input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="è¯·è¾å¥æ¥æ¶æ°é" style="border-radius: 50px;">
			</td>
			</tr>
			<tr>
			<th>æ±æ»åå¸æ°é</th>
			<td class="bz_td">
			<input type="text" name="HmaterOutqty" class="layui-input" id="HmaterOutqty" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			@@ -450,7 +456,14 @@
			txtHBarCode_KeyDown(HBarCode);
			txtHProcNo_KeyDown(HBarCode, sProcNo);
			}
			} else {
			} else if (params[params[0]] == "kgd") {
			var OperationType = 5;
			$(".jzd").text("æå¼å¡å¼å·¥å");

			} else if (params[params[0]] == "jzd") {
			var OperationType = 1;

			} else {
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			@@ -578,14 +591,16 @@
			if (result.count == 1) {
			layer.close(index);
			layer.msg("æäº¤æå");

			$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//ä¿ååä¿åæé®ç¦ç¨
			$('#HBarCode').attr("disabled", true);//ä¿ååæ¡ç æ¡ç¦ç¨
			$("#HQty").attr("disabled", "true");
			if (result.Verify == "Y") {
			location.replace('MES_StationOutBill_PDA_QiaoYi.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
			} else {
			//ä¿ååæµè§
			ReRoadBillMain();
			}
			//else {
			// //ä¿ååæµè§
			// ReRoadBillMain();
			//}
			}
			else {
			layer.close(index);
			@@ -1035,7 +1050,8 @@
			"HOrderProcNO": data.è®¢åè·è¸ªå·,
			"HPRDOrg": data.ç»ç»,
			"HPRDOrgID": data.ç»ç»,
			"HQty": data.æµè½¬å¡æ°é,
			"HmaterOutqty": data.åºç«æ°é,
			"HQty": result.data.length > 1 ? (result.data[1].è¿ç«å³èæ°é == 0 ? (result.data[0].åºç«å³èæ°é == 0 ? result.data[0].æµè½¬å¡æ°é : result.data[0].åºç«å³èæ°é) : result.data[0].æµè½¬å¡æ°é < result.data[1].è¿ç«å³èæ°é ? data.æµè½¬å¡æ°é : result.data[1].è¿ç«å³èæ°é) : data.æµè½¬å¡æ°é,

			});

			@@ -1100,6 +1116,14 @@
			, { field: 'å·¥èºåæ°', title: 'å·¥èºåæ°' }
			]]
			, height: 500
			, done: function (res, curr, count) {
			for (var i in res.data) {
			var item = res.data[i];
			if (item["æµæ°´å·"] == $("#HProcNo").val()) {
			$("tr[data-index='" + i + "']").attr({ "style": "background-color:red;" });
			}
			}
			}
			}
			table.render(option)
			}
			@@ -1293,28 +1317,28 @@
			//#endregion

			//#region é¡µé¢å¿«æ·é®å¼¹çªâå·¥åºæµè½¬å¡å³èæ°é
			$('body').on('keydown', function (e) {
			var HinteID = $("#HProcExchHinteID").val();
			if (e.key == "F7") {
			if (HinteID == "" \|\| HinteID == null \|\| HinteID == undefined) {
			layer.alert("è¯·åè¾å¥æ¡å½¢ç ææ«ææ¡å½¢ç ", { icon: 5 });
			}
			else {
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'å·¥åºæµè½¬å¡å³èæ°é',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../å·¥åºè¿ç«æ¥æ¶å/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
			end: function () {
			}
			});
			}
			}
			})
			//$('body').on('keydown', function (e) {
			// var HinteID = $("#HProcExchHinteID").val();
			// if (e.key == "F7") {
			// if (HinteID == "" \|\| HinteID == null \|\| HinteID == undefined) {
			// layer.alert("è¯·åè¾å¥æ¡å½¢ç ææ«ææ¡å½¢ç ", { icon: 5 });
			// }
			// else {
			// layer.open({
			// type: 2,
			// skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			// title: 'å·¥åºæµè½¬å¡å³èæ°é',
			// closeBtn: 1,
			// shift: 2,
			// area: ['90%', '90%'],
			// maxmin: true,
			// content: ['../å·¥åºè¿ç«æ¥æ¶å/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
			// end: function () {
			// }
			// });
			// }
			// }
			//})
			//#endregion

			//éæ©çäº§çç»å¼¹çª