From a011663fa92dcf8b63ff0fbf793be7883ce38acc Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 三月 2023 22:57:42 +0800
Subject: [PATCH] 龙山汽配打印界面,F7物料列表,便捷方式;条码打印修复列设置,表体添加炉号、钢卷号等字段;职员,仓库打印条码;条码档案列表添加炉号等字段;工序出站PDA;流转卡派工单;

---
 WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 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_StationOutBill_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_StationOutBill_PDA.html"
index b9b1bc4..6b69e4b 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_StationOutBill_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_StationOutBill_PDA.html"
@@ -407,6 +407,8 @@
             var HModName = "MES_StationOutBill_PDA";
             var FirstEndHProcNo = 0; // 榛樿0  棣栭亾宸ュ簭1 鏈亾宸ュ簭2
 
+            $('#Detail').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤鏄庣粏鎸夐挳
+
             /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
             /* 1.鏃犳簮鍗曟柊澧�
              * 2.鏈夋簮鍗曟柊澧�
@@ -694,6 +696,7 @@
                                         "HICMOQty": data.浠诲姟鍗曟暟閲�,
                                         "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
                                         "HPRDOrgID": data.缁勭粐,
+                                        "HPRDOrg": data.缁勭粐鍚嶇О,
                                         "lngBillSubKey": data.hsubid,
                                         "HProcName": data.宸ュ簭,
                                         "HProcID": data.HProcID,
@@ -719,7 +722,10 @@
                                         "HProcExchHinteID": data.hmainid,
                                         "HICMOQty": data.浠诲姟鍗曟暟閲�,
                                         "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
-                                        "HPRDOrgID": data.缁勭粐
+                                        "HPRDOrgID": data.缁勭粐,
+                                        "HPRDOrg": data.缁勭粐鍚嶇О,
+                                        "HCenterName": data.宸ヤ綔涓績,
+                                        "HCenterID": data.HCenterID
                                     });
                                     //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                                     //$("#HBarCode").css("background-color", "#efefef4d");
@@ -860,6 +866,8 @@
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
                             layer.close(index);
+                            //娓呯┖鏉$爜妗�
+                            $('#HBarCode').val("");
                         }
                         else {
                             layer.close(index);
@@ -1340,10 +1348,16 @@
                                 data: { "HMaterID": HMaterID, "HWorkProcID": HWorkProcID, "HProcExchBillNo": HProcExchBillNo },
                                 success: function (data1) {
                                     if (data1.data.length > 1) {
+                                        $('#Detail').removeClass("layui-btn-disabled").attr("disabled", false);//鏄庣粏鎸夐挳鍚敤
+
                                         var HBillNo = $("#HBillNo").val();
+                                        var HProcExchBillNo = $("#HProcExchBillNo").val();
                                         var HProcNo = $("#HProcNo").val();
                                         var HPlanQty = $("#HPlanQty").val();
                                         var HProcID = $("#HProcID").val();
+                                        var HMaterID = $("#HMaterID").val();
+                                        var HProcExchHinteID = $("#HProcExchHinteID").val();
+                                        var HInterID = $("#HInterID").val();
 
                                         layer.open({
                                             type: 2
@@ -1352,7 +1366,7 @@
                                             , shade: 0.6 //閬僵閫忔槑搴�
                                             , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                                             , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                            , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1'
+                                            , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1' + '&HInterID=' + HInterID
                                             , resize: false
                                             , cancel: function () {
                                                 //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1392,8 +1406,7 @@
                     layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
                     return;
                 }
-                txtHBarCode_KeyDown(HBarCode);
-
+                txtHBarCode_KeyDown(HBarCode);                
             });
             //#endregion
 
@@ -1405,6 +1418,7 @@
                 var HProcID = $("#HProcID").val();
                 var HMaterID = $("#HMaterID").val();
                 var HProcExchHinteID = $("#HProcExchHinteID").val();
+                var HInterID = $("#HInterID").val();
 
                 layer.open({
                     type: 2
@@ -1413,7 +1427,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1'
+                    , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1' + '&HInterID=' + HInterID
                     , resize: false
                     , cancel: function () {
                         //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1492,7 +1506,7 @@
                 layer.open({
                     type: 2
                     , area: ['80%', '80%']
-                    , title: '鏈珯宸ュ簭'
+                    , title: '鐢熶骇鐝粍'
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�

--
Gitblit v1.9.1