From 1664e7f3b3ef38ecf01afb098512c733315c4d10 Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期二, 23 五月 2023 17:01:27 +0800
Subject: [PATCH] 1

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

diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index fde887b..f5eb6fe 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -7,6 +7,7 @@
 using System.Data;
 using System.Data.SqlClient;
 using System.Web.Http;
+using System.Windows.Forms;
 using WebAPI.Models;
 
 namespace WebAPI.Controllers
@@ -19,6 +20,7 @@
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         DataSet ds;
         Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+              
 
         #region[鏂板鍗曟嵁-淇濆瓨鎸夐挳]
         /// <summary>
@@ -37,6 +39,7 @@
             string msg3 = sArray[1].ToString();
             string msg4 = sArray[2].ToString();
             string msg5 = sArray[3].ToString();
+            string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О    
 
             string UserName = "";
             ListModels oListModels = new ListModels();
@@ -98,12 +101,18 @@
                 bool bResult;
                 if (msg5 == "xz")
                 {
+                    LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
                     // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                     bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+
+                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "鏂板宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
                 }
                 else
                 {
+                    LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
                     bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "淇敼宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','淇敼鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
                 }
                 if (bResult)
                 {
@@ -391,6 +400,7 @@
             string msg3 = sArray[1].ToString();
             string msg4 = sArray[2].ToString();
             string msg5 = sArray[3].ToString();
+            string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О    
 
             string UserName = "";
             ListModels oListModels = new ListModels();
@@ -449,8 +459,17 @@
                             oBill.omodel.HQty = HPlanQty;
                         }
 
+                        for (int j = 0; j < oBill.DetailColl.Count; j++)
+                        {
+                            oBill.DetailColl[j].HRelationQty_In = 0;
+                            oBill.DetailColl[j].HRelationQty_Out = 0;
+                            oBill.DetailColl[j].HRelationQty_Bad = 0;
+                        }
+
                         //淇濆瓨瀹屾瘯鍚庡鐞�
                         bool bResult;
+                        LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
+                        oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "鏂板宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
 
                         bResult = oBill.AddBill(ref sReturn);
                         if (bResult)
@@ -498,6 +517,7 @@
             string msg4 = sArray[2].ToString();//宸ヨ壓璺嚎
             string msg5 = sArray[3].ToString();//绫诲瀷
             string msg6 = sArray[4].ToString();//鐢ㄦ埛
+            string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О    
 
             ListModels oListModels = new ListModels();
 
@@ -571,6 +591,9 @@
                     bool bResult=false;
                     if (msg5 == "2")
                     {
+                        LogService.Write("鐢ㄦ埛:" + msg6 + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo);
+                        oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg6 + "','" + HComputerName + "','" + "鏂板宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
+
                         bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                     }
                     oBill.DetailColl.Clear();
@@ -817,9 +840,13 @@
                 return objJsonResult;
             }
 
+            string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О    
+
             DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
 
             string[] HBillNo = HInterID.Split(',');
+
+            string HBillNo_S = "";
 
             foreach (var item in HBillNo)
             {
@@ -879,6 +906,7 @@
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
+
                     if (oBill.omodel.HChecker != "")
                     {
                         objJsonResult.code = "0";
@@ -887,6 +915,7 @@
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
+                    HBillNo_S += oBill.omodel.HBillNo + ",";
                 }
                 else
                 {
@@ -897,6 +926,12 @@
                     return objJsonResult;
                 }
             }
+
+            HBillNo_S = HBillNo_S.Substring(0, HBillNo_S.Length - 1);
+            LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鍒犻櫎宸ュ簭娴佽浆鍗″崟鎹�:" + HBillNo_S);
+
+            oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "鍒犻櫎宸ュ簭娴佽浆鍗″崟鎹細" + HBillNo_S + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鍒犻櫎鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
+
             foreach (var item in HBillNo)
             {
                 bool IsDete = oBill.DeleteBill(long.Parse(item), ref DBUtility.ClsPub.sExeReturnInfo);

--
Gitblit v1.9.1