From b885af99f90d6a8a7c668166bfef092609a98a44 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 13 十一月 2024 09:57:36 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 6a5c68d..bda557a 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -422,6 +422,26 @@
                         objJsonResult.Verify = "N";
                     }
                 }
+
+                //娴嬭瘯璇彞===========================================================================================================
+                string msg_str = "";
+                string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
+                            "from Sc_ProcessExchangeBillMain as a " +
+                            "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
+                            "where a.HInterID = " + HProcExchInterID;
+                DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
+                if (ds_str.Tables[0].Rows.Count > 0)
+                {
+                    msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:";
+                    for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++)
+                    {
+                        msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ",";
+                    }
+                }
+
+                oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "淇敼宸ュ簭杩涚珯鍗曟嵁锛�" + HBillNo + "[宸ュ簭娴佽浆鍗″彿锛�" + HProcExchBillNo + "]" + msg_str + "','LMES-宸ュ簭鍑虹珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鎴栦慨鏀瑰崟鎹�'", ref DBUtility.ClsPub.sExeReturnInfo);
+                //==============================================================================================================
+
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";

--
Gitblit v1.9.1