From 30d49ce4fa500cb24ad3407d50ec8e0da4ff0046 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 10 十二月 2025 11:33:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 55 insertions(+), 2 deletions(-)

diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
index cba9f25..5af4327 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
@@ -18,6 +18,7 @@
     <script src="../../../layuiadmin/MESLanguage.js"></script>
     <script src="../../../layuiadmin/SetColumn.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/grwebapp.js"></script>
 </head>
 <body>
     <div class="layui-fluid" style="padding: 0;">
@@ -86,7 +87,7 @@
                                             <label class="layui-form-label" style="width: 85px; color: red; ">鎵撳嵃妯℃澘</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <select name="HPrintTemplate" id="HPrintTemplate" lay-filter="HPrintTemplate" >
-                                                    <option>鎵撳嵃妯℃澘1</option>
+                                                    <option>褰╃洅鏍囩妯℃澘</option>
                                                     <option>鎵撳嵃妯℃澘2</option>
                                                 </select>
                                             </div>
@@ -498,7 +499,7 @@
                 "field": {
                     "HProcID": $("#HProcID").val(), "HBatchNo": "",
                     "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
-                    "HProdOrgID": sessionStorage["OrganizationID"],
+                    "HPRDOrgID": sessionStorage["OrganizationID"],
                     "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
                 }
             };
@@ -520,6 +521,8 @@
                         $("#HBarCode_SN").focus();
 
                         $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓�:" + HBarCode);
+                        //鑷姩鎵撳嵃
+                        dy_PL(HBarCode);
                         get_Display();
                     }
                     else {
@@ -537,6 +540,56 @@
             });
         }
 
+        //鎵归噺鎵撳嵃
+        function dy_PL(HBarCode) {
+            var sWhere = "select HBarCode 鏉$爜缂栧彿 from Gy_BarCodeBill where HBarCode = '" + HBarCode + "'"
+
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                async: false,
+                data: { "sWhere": sWhere },
+                success: function (data) {
+                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                        if (data.data.length != 0) {
+
+
+                            var Customer = {
+                                "Table": data.data
+                            }
+
+                            var args = {
+                                type: "print",//鎵撳嵃妯″紡
+                                //type: "preview",//棰勮妯″紡
+                                showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate").val()+".grf"),
+                                data: Customer
+                            };
+
+                            console.log(data.data[0].鏉$爜缂栧彿);
+                            //var args = {
+                            //    report: urlAddRandomNo("../../grf/cs10.grf"),
+                            //    data: Customer
+                            //};
+                            webapp_ws_ajax_run(args);
+
+                        } else {
+                            layer.msg("鏌ユ棤鏁版嵁!");
+                        }
+                    }
+                    else {
+                        layer.msg(data.Message, { icon: 5 });
+                    }
+                    layer.closeAll("loading");
+                },
+                error: function (err) {
+                    layer.msg("閿欒:" + err, { icon: 5 });
+                }
+            })
+
+        }
+
         //鍔犺浇缃戞牸鏍规嵁缁戝畾宸ュ簭鍜岀敓浜ц祫婧�
         function get_Display(sWhere = '') {
             var ajaxLoad = layer.load();

--
Gitblit v1.9.1