MES-WEB-LayUI.git

			@@ -134,22 +134,16 @@
			</td>
			</tr>
			<tr>
			<th>æä½å</th>
			<th>æµè½¬å¡å·</th>
			<td class="bz_td">
			<input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="æä½åå§å" style="background-color:#efefef4d;border-radius: 50px;height:55px" readonly>
			<input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="æµè½¬å¡å·" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" autocomplete="off" class="layui-input">
			</td>
			</tr>
			<tr>
			<th>è§æ ¼åå·</th>
			<th>ä¸éå·¥åº</th>
			<td class="bz_td">
			<input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="è§æ ¼åå·" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
			</td>
			</tr>
			<tr>
			<th>äº§ååç§°</th>
			<td class="bz_td">
			<input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="äº§ååç§°" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
			<input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
			<input type="text" name="HUpProcName" class="layui-input" id="HUpProcName" placeholder="ä¸éå·¥åº" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			@@ -157,18 +151,6 @@
			<td class="bz_td">
			<input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="å½åå·¥åº" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
			<input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
			</td>
			</tr>
			<tr>
			<th>åæ ¼æ°é</th>
			<td class="bz_td">
			<input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="è¯·è¾å¥åæ ¼æ°é" style="border-radius: 50px;height:55px">
			</td>
			</tr>
			<tr>
			<th>æ¥åºæ°é</th>
			<td class="bz_td">
			<input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="è¯·è¾å¥æ¥åºæ°é" style="border-radius: 50px;height:55px">
			</td>
			</tr>
			<tr>
			@@ -180,91 +162,17 @@
			</td>
			</tr>
			<tr>
			<th>åæ ¼æ°é</th>
			<td class="bz_td">
			<input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="è¯·è¾å¥åæ ¼æ°é" style="border-radius: 50px;height:55px">
			</td>
			</tr>
			<tr>
			<th>çäº§èµæº</th>
			<td class="bz_td">
			<input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="éæ©çäº§èµæº" style="border-radius: 50px;">
			<input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
			<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder">...</button>
			</td>
			</tr>
			<tr>
			<th>å·¥ä½ä¸å¿</th>
			<td class="bz_td">
			<input type="text" name="HCenterName" class="layui-input" id="HCenterName" placeholder="éæ©å·¥ä½ä¸å¿" style="background-color:#efefef4d;border-radius: 50px;">
			<input type="hidden" name="HCenterID" id="HCenterID" value="0" autocomplete="off" class="layui-input">
			<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="font-weight:bolder">...</button>
			</td>
			</tr>
			<tr>
			<th>çäº§çç»</th>
			<td class="bz_td">
			<input type="text" name="HGroupName" class="layui-input" id="HGroupName" placeholder="éæ©çäº§çç»" style="background-color:#efefef4d;border-radius: 50px;">
			<input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
			<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="font-weight:bolder">...</button>
			</td>
			</tr>
			<tr>
			<th>æä½å</th>
			<td class="bz_td">
			<input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="æä½åä»£ç " autocomplete="off" class="layui-input" style="border-radius: 50px;">
			</td>
			<td class="bz_td">
			<input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="éæ©æä½å" style="background-color:#efefef4d;border-radius: 50px;" readonly>
			<input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
			<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="font-weight:bolder">...</button>
			</td>
			</tr>
			<tr>
			<th>æ£éªå</th>
			<td class="bz_td">
			<input type="text" name="HQCCheckName" class="layui-input" id="HQCCheckName" placeholder="éæ©æ£éªå" style="background-color:#efefef4d;border-radius: 50px;">
			<input type="hidden" name="HQCCheckID" id="HQCCheckID" value="0" autocomplete="off" class="layui-input">
			<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HSecManagerID-BT" id="HSecManagerID-BT" style="font-weight:bolder">...</button>
			</td>
			</tr>
			<tr>
			<th>æµè½¬å¡å·</th>
			<td class="bz_td">
			<input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="æµè½¬å¡å·" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" autocomplete="off" class="layui-input">
			</td>
			</tr>
			<tr>
			<th>æµè½¬å¡æ°é</th>
			<td class="bz_td" readonly>
			<input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="æµè½¬å¡æ°é" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th>æªåºç«æ°é</th>
			<td class="bz_td">
			<input type="text" name="NoOutboundHqty" class="layui-input" id="NoOutboundHqty" value="0" placeholder="æªåºç«æ°é" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th>è®¢åæ°é</th>
			<td class="bz_td">
			<input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="è®¢åæ°é" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th>å¤æ³¨</th>
			<td class="bz_td">
			<input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="è¯·è¾å¥å¤æ³¨ä¿¡æ¯" style="border-radius: 50px;">
			</td>
			</tr>
			<tr>
			<th>çäº§ç»ç»</th>
			<td class="bz_td">
			<input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="çäº§ç»ç»" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0" autocomplete="off" class="layui-input">
			</td>
			</tr>
			<tr>
			<th>çäº§è®¢åå·</th>
			<td class="bz_td">
			<input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="çäº§è®¢åå·" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
			</td>
			</tr>
			<tr>
			@@ -274,31 +182,19 @@
			</td>
			</tr>
			<tr>
			<th>åæ®å·</th>
			<th>äº§ååç§°</th>
			<td class="bz_td">
			<input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="åæ®å·" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
			<input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="äº§ååç§°" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
			<input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
			</td>
			</tr>
			<tr>
			<th>åæ®æ¥æ</th>
			<td class="t1_input">
			<input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="è¯·éæ©æ¥æ">
			</td>
			</tr>
			<tr>
			<th>è®¢åè·è¸ªå·</th>
			<th>è§æ ¼åå·</th>
			<td class="bz_td">
			<input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="è®¢åè·è¸ªå·" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="è§æ ¼åå·" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
			</td>
			</tr>
			<tr>
			<th>è½¬ä¸é</th>
			<td class="bz_td">
			<input type="checkbox" name="checkboxHLastSubProc" class="layui-input" id="checkboxHLastSubProc" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled style="border-radius: 50px;">
			<input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
			</td>
			</tr>

			</tbody>
			</table>
			</div>
			@@ -368,10 +264,131 @@
			</tbody>
			</table>
			</div>
			<div class="layui-tab-item">
			<table style="width:80%;">
			<tbody>
			<tr>
			<th>æä½å</th>
			<td class="bz_td">
			<input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="æä½åå§å" style="background-color:#efefef4d;border-radius: 50px;height:55px" readonly>
			</td>
			</tr>

			<tr>
			<th>æ¥åºæ°é</th>
			<td class="bz_td">
			<input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="è¯·è¾å¥æ¥åºæ°é" style="border-radius: 50px;height:55px">
			</td>
			</tr>
			<tr>
			<th>å·¥ä½ä¸å¿</th>
			<td class="bz_td">
			<input type="text" name="HCenterName" class="layui-input" id="HCenterName" placeholder="éæ©å·¥ä½ä¸å¿" style="background-color:#efefef4d;border-radius: 50px;">
			<input type="hidden" name="HCenterID" id="HCenterID" value="0" autocomplete="off" class="layui-input">
			<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="font-weight:bolder">...</button>
			</td>
			</tr>
			<tr>
			<th>çäº§çç»</th>
			<td class="bz_td">
			<input type="text" name="HGroupName" class="layui-input" id="HGroupName" placeholder="éæ©çäº§çç»" style="background-color:#efefef4d;border-radius: 50px;">
			<input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
			<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="font-weight:bolder">...</button>
			</td>
			</tr>
			<tr>
			<th>æä½å</th>
			<td class="bz_td">
			<input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="æä½åä»£ç " autocomplete="off" class="layui-input" style="border-radius: 50px;">
			</td>
			<td class="bz_td">
			<input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="éæ©æä½å" style="background-color:#efefef4d;border-radius: 50px;" readonly>
			<input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
			<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="font-weight:bolder">...</button>
			</td>
			</tr>
			<tr>
			<th>æ£éªå</th>
			<td class="bz_td">
			<input type="text" name="HQCCheckName" class="layui-input" id="HQCCheckName" placeholder="éæ©æ£éªå" style="background-color:#efefef4d;border-radius: 50px;">
			<input type="hidden" name="HQCCheckID" id="HQCCheckID" value="0" autocomplete="off" class="layui-input">
			<button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HSecManagerID-BT" id="HSecManagerID-BT" style="font-weight:bolder">...</button>
			</td>
			</tr>

			<tr>
			<th>æµè½¬å¡æ°é</th>
			<td class="bz_td" readonly>
			<input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="æµè½¬å¡æ°é" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th>æªåºç«æ°é</th>
			<td class="bz_td">
			<input type="text" name="NoOutboundHqty" class="layui-input" id="NoOutboundHqty" value="0" placeholder="æªåºç«æ°é" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th>è®¢åæ°é</th>
			<td class="bz_td">
			<input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="è®¢åæ°é" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th>å¤æ³¨</th>
			<td class="bz_td">
			<input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="è¯·è¾å¥å¤æ³¨ä¿¡æ¯" style="border-radius: 50px;">
			</td>
			</tr>
			<tr>
			<th>çäº§ç»ç»</th>
			<td class="bz_td">
			<input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="çäº§ç»ç»" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0" autocomplete="off" class="layui-input">
			</td>
			</tr>
			<tr>
			<th>çäº§è®¢åå·</th>
			<td class="bz_td">
			<input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="çäº§è®¢åå·" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
			</td>
			</tr>

			<tr>
			<th>åæ®å·</th>
			<td class="bz_td">
			<input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="åæ®å·" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			<input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
			</td>
			</tr>
			<tr>
			<th>åæ®æ¥æ</th>
			<td class="t1_input">
			<input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="è¯·éæ©æ¥æ">
			</td>
			</tr>
			<tr>
			<th>è®¢åè·è¸ªå·</th>
			<td class="bz_td">
			<input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="è®¢åè·è¸ªå·" style="border-radius: 50px;background-color:#efefef4d;" readonly>
			</td>
			</tr>
			<tr>
			<th>è½¬ä¸é</th>
			<td class="bz_td">
			<input type="checkbox" name="checkboxHLastSubProc" class="layui-input" id="checkboxHLastSubProc" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled style="border-radius: 50px;">
			<input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
			</td>
			</tr>
			</tbody>
			</table>
			</div>
			</div>
			<ul class="layui-tab-title">
			<li class="layui-this">åæ®ä¿¡æ¯</li>
			<li>å¶åä¿¡æ¯</li>
			<li>å¶ä»ä¿¡æ¯</li>
			</ul>
			</div>
			</div>
			@@ -736,15 +753,22 @@
			"HCenterName": data.å·¥ä½ä¸å¿,
			"HCenterID": data.HCenterID,
			"lngBillSubKey": data.hsubid,
			"HProcName": data.å·¥åº,
			"HProcID": data.HProcID,
			"HProcNo": data.å·¥åºå·,
			"NoOutboundHqty": (data.æµè½¬å¡æ°é - data.åºç«æ¥åºå³èæ°é - data.åºç«å³èæ°é)
			//"NoOutboundHqty": (data.æµè½¬å¡æ°é - data.åºç«æ¥åºå³èæ°é - data.åºç«å³èæ°é),
			"HQty": data.æµè½¬å¡æ°é,
			});
			//$("#HBarCode").attr("readonly", "readonly");//æ¡å½¢ç åªè¯»
			//$("#HBarCode").css("background-color", "#efefef4d");
			$("#HProcNo").attr('disabled', 'disabled');
			HProcExchBillNoFlag = true;

			if (data.æåºå· == "ä¹ä¸") {
			if (data.HProcID == "") {
			layer.msg("ç¨æ·æªç»å®å½åå·¥åº,ééæ°éæ©å·¥åº!")
			} else {
			$("#HProcNo").val(data.å·¥åºå·);
			txtHProcNo_KeyDown(data.åæ®å·, data.å·¥åºå·);
			}
			}

			var HProcExchHinteID = $('#HProcExchHinteID').val();
			var HInterID = data.hmainid;
			@@ -1141,7 +1165,7 @@
			function txtHProcNo_KeyDown(sBillNo, sProcNo) {
			var index = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
			url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown_qiaoyi",
			type: "GET",
			data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
			success: function (result) {
			@@ -1153,7 +1177,9 @@
			"HProcID": data.HProcID
			, "HCenterName": data.å·¥ä½ä¸å¿
			, "HCenterID": data.HCenterID
			, "HUpProcName": result.data.length > 1 ? result.data[1].å·¥åº : ""
			, "NoOutboundHqty": (data.æµè½¬å¡æ°é - data.åºç«æ¥åºå³èæ°é - data.åºç«å³èæ°é)

			});
			if (data.é¦éå·¥åº == "æ¯") {
			FirstEndHProcNo = 1;
			@@ -1498,7 +1524,7 @@
			}
			, end: function () {
			var sProcNo = $('#HProcNo').val();
			var sBillNo = $('#HBarCode').val();
			var sBillNo = $('#HProcExchBillNo').val();
			txtHProcNo_KeyDown(sBillNo, sProcNo);
			}
			//, btn: ['ç¡®å®', 'åæ¶']
			@@ -1824,7 +1850,7 @@
			//éåº--å¨å±ç
			form.on('submit(Cancel)', function () {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
			});
			})

	WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.rar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html	282 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1497,7 +1497,7 @@

			//æ¥è¯¢å·¥ä½ä¸å¿çæ°æ®
			var WorkCente = [];
			var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') å·¥ä½ä¸å¿ä»£ç , isnull(a.HName,'') å·¥ä½ä¸å¿åç§° ,p.HItemID HProcID,p.HName å·¥åºåç§° from Gy_Process p left join Gy_WorkCenter a on p.HNumber = a.HNumber where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber";
			var sWhere = "select isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') å·¥ä½ä¸å¿ä»£ç , isnull(a.HName,'') å·¥ä½ä¸å¿åç§° ,p.HItemID HProcID,p.HName å·¥åºåç§° from Gy_Process p left join Gy_WorkCenter a on p.HNumber = a.HNumber and a.HUSEORGID=p.HUSEORGID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å

			@@ -544,7 +544,7 @@
			//éåº--å¨å±ç
			form.on('submit(Cancel)', function () {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index_Mobile.html";
			parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
			});
			})