From 65c1f453bbf41c6b02b7827f1a2b6544b323ebb7 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 30 五月 2022 12:15:32 +0800
Subject: [PATCH] nothing

---
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html             |    2 +-
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html          |    7 ++++++-
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html |    4 ++--
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html         |    2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index c523195..53cb11a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -465,7 +465,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
                     type: "GET",
-                    data: { "sWhere": " and hmainid = " + linterid },
+                    data: { "sWhere": " and hmainid = " + linterid, "user": sessionStorage["HUserName"]},
                     success: function (result) {
                         var data = result.data[0];
                         if (result.count == 1) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 60a2555..f60cf07 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -412,11 +412,11 @@
                 $.ajax({
                     url: GetWEBURL() + '/Cj_StationInBill/get_Display',
                     type: "GET",
-                    data: { "sWhere": "and HInterID = " + linterid },
+                    data: { "sWhere": "and HInterID = " + linterid, "user": sessionStorage["HUserName"]},
                     success: function (result) {
                         var data = result.data[0];
                         if (result.count == 1) {
-                            $("#HProcExchBillNo").val(data.宸ュ簭娴佽浆鍗″彿);
+                            $("#HProcExchBillNo").val(data.娴佽浆鍗″彿);
                             $("#HProcExchInterID").val(data.HProcExchInterID);
                             $("#HProcExchEntryID").val(data.HProcExchEntryID);
                             $("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index d60df77..581dd68 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -91,7 +91,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�楠�</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
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\345\215\241/Sc_ProcessExchangeBill.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\345\215\241/Sc_ProcessExchangeBill.html"
index 25de2c4..e30b47d 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\345\215\241/Sc_ProcessExchangeBill.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\345\215\241/Sc_ProcessExchangeBill.html"
@@ -1233,8 +1233,13 @@
                 HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+                var flag = "xz";
+                if (OperationType == 3) {
+                    flag = "xg";
+                }
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + flag;
                 var index = layer.load();
+                
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill",

--
Gitblit v1.9.1