From 22870b2ceda5ea1dc4e83c8b8d6a11973b834be3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 八月 2023 15:37:56 +0800
Subject: [PATCH] 指引卡开工单列表 指引卡完工单列表
---
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 88 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 77 insertions(+), 11 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
index 0d55168..397485d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
@@ -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,7 +111,7 @@
<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>
@@ -143,7 +143,7 @@
<tr>
<th>鎺ユ敹鏁伴噺</th>
<td class="bz_td">
- <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ユ帴鏀舵暟閲�" style="border-radius: 50px;">
+ <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ユ帴鏀舵暟閲�" style="border-radius: 50px;" onfocus="this.select();">
</td>
</tr>
<tr>
@@ -434,6 +434,13 @@
txtHBarCode_KeyDown(HBarCode);
txtHProcNo_KeyDown(HBarCode, sProcNo);
}
+ } 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
@@ -443,7 +450,7 @@
}
//鍒ゆ柇鏄惁鏂板
- if (OperationType == 1 || OperationType == 2) {
+ if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
//鑾峰彇鏈�澶у崟鎹彿
var ajaxLoad = layer.load();
$.ajax({
@@ -548,7 +555,7 @@
return;
}
//console.log(data.field);
- var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
//var oMain = data.field;
var HUserName = sessionStorage["HUserName"];
var index = layer.load();
@@ -886,7 +893,10 @@
});
function txtHBarCode_KeyDown(HBarCode) {
+ //鎵爜绫诲瀷1
var barNo = HBarCode.substr(0, 3);
+ //鎵爜绫诲瀷2
+ var barNo2 = HBarCode.substr(0, 4);
if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵伐搴忕爜")
layer.close(index);
@@ -961,10 +971,20 @@
"HMaterModel": data.瑙勬牸鍨嬪彿
});
break;
- case "GXL":
+ case "PGM":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMaterID": data.HItemID,
+ "HMaterName": data.鐗╂枡鍚嶇О,
+ "HMaterNumber": data.鐗╂枡浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿
+ });
+ break;
+ }
+
+ switch (barNo2) {
+ case "GXLZ":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HICMOInterID": data.hicmointerid,
- "lngICMOEntryID": data.lngICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗曞彿,
"HMaterID": data.HMaterID,
"HMaterName": data.浜у搧,
@@ -972,14 +992,53 @@
"HMaterModel": data.瑙勬牸鍨嬪彿,
"HPieceQty": data.娴佽浆鍗℃暟閲�,
"HPlanQty": data.娴佽浆鍗℃暟閲�,
+ "lngBillKey": data.hmainid,
"HProcExchBillNo": data.鍗曟嵁鍙�,
"HProcExchHinteID": data.hmainid,
"HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+ "HPRDOrgID": data.缁勭粐,
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HProcNo": data.娴佹按鍙�,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID,
+ });
+
+ HProcExchBillNoFlag = true;
+ break;
+ case "GXLX":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.hicmointerid,
+ "lngICMOEntryID": data.HICMOEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
"lngBillKey": data.hmainid,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchHinteID": data.hmainid,
+ "HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrg": data.缁勭粐,
- "HPRDOrgID": data.缁勭粐
+ "HPRDOrgID": data.缁勭粐,
+ "HQty": data.娴佽浆鍗℃暟閲�,
});
+
+ if (data.鎺掑簭鍙� == "涔斾竴") {
+ if (data.HProcID == "") {
+ layer.msg("鐢ㄦ埛鏈粦瀹氬綋鍓嶅伐搴�,闇�閲嶆柊閫夋嫨宸ュ簭!")
+ } else {
+ $("#HProcNo").val(data.宸ュ簭鍙�);
+ txtHProcNo_KeyDown(data.鍗曟嵁鍙�, data.宸ュ簭鍙�);
+ }
+ }
+
+
//$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
//$("#HBarCode").css("background-color", "#efefef4d");
HProcExchBillNoFlag = true;
@@ -1053,8 +1112,8 @@
}
table.render(option)
}
- })
- break;
+ })
+ break;
}
@@ -1066,6 +1125,8 @@
//DisPlay_HideColumn();
layer.close(index);
+ //娓呯┖鏉＄爜妗�
+ $('#HBarCode').val("");
}
else {
layer.close(index);
@@ -1082,7 +1143,7 @@
//娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
$('#HProcNo').on('keydown', function (event) {
var sProcNo = $('#HProcNo').val();
- var sBillNo = $('#HBarCode').val();
+ var sBillNo = $('#HProcExchBillNo').val();//娴佽浆鍗″彿
if (event.keyCode == 13) {
if (!HProcExchBillNoFlag) {
layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
@@ -1385,6 +1446,11 @@
, resize: false
, cancel: function (index, layero) {
}
+ , end: function () {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HBarCode').val();
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
})
} else {
layer.alert('璇锋偍纭杈撳叆娴佽浆鍗″彿鍚庨噸璇昢_^', { icon: 7 });
--
Gitblit v1.9.1