From a055268e5c86a6b2dc9c5966776c2046c472379d Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Thu, 7 Mar 2024 15:46:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A7=E4=BB=93=E5=82=A8=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E5=8C=85=E6=8B=AC=20=E5=87=BA=E5=BA=93=E7=9A=84=20=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=EF=BC=8C=E8=B4=B9=E7=94=A8=E5=85=A5=E8=B4=A6=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B4=B9=E7=94=A8=E5=85=A5=E8=B4=A6=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/WMSOUT_GuiGeController.cs     | 10 ++++-
 .../DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs       | 39 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/DSWeb/Areas/MvcShipping/Controllers/WMSOUT_GuiGeController.cs b/DSWeb/Areas/MvcShipping/Controllers/WMSOUT_GuiGeController.cs
index e4846104..50913f86 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/WMSOUT_GuiGeController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/WMSOUT_GuiGeController.cs
@@ -141,7 +141,15 @@ namespace DSWeb.MvcShipping.Controllers
             var headData = JsonConvert.Deserialize<VwWmsDetailModels>(data);
             var bodyList = JsonConvert.Deserialize<List<VwWmsDetailModels>>(body);
             var errorstr = "";
-          
+
+            try
+            {
+                BasicDataRefDAL.SaveLog(data, Convert.ToString(Session["USERID"]), "仓储日志", "出库费用入账");
+            }
+            catch (Exception e)
+            {
+
+            }
 
             #region 保存
             if (bodyList != null)
diff --git a/DSWeb/Areas/MvcShipping/DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs
index 069c5e1f..6bfa9e79 100644
--- a/DSWeb/Areas/MvcShipping/DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs
@@ -24,6 +24,7 @@ using System.Configuration;
 using DSWeb.Areas.MvcShipping.Helper;
 using NPOI.HSSF.Record;
 using Quartz.Util;
+using DSWeb.MvcShipping.Helper;
 
 namespace DSWeb.MvcShipping.DAL.WMSOUT_GuiGeDAL
 {
@@ -973,8 +974,20 @@ namespace DSWeb.MvcShipping.DAL.WMSOUT_GuiGeDAL
                 #region 出库件数 返 入库库存//需求编号：SR2017073000001
                 
                 var strOutBSNO = gids.Replace(",", "','");
-               
-                string strSql = "exec Proc_WMSOUT_DelByBSNO  '" + strOutBSNO + "' ";
+
+                try {
+                    string strSql = "exec Proc_WMSOUT_DelByBSNO  '" + strOutBSNO + "' ";
+
+                    var outhead = GetData($" BSNO='{strOutBSNO}'", "", strUserID);
+
+                    var logstr = JsonConvert.Serialize(outhead);
+
+                    BasicDataRefDAL.SaveLog(new { strSql, logstr }, strUserID, "仓储日志", "删除出库");
+                }
+                catch (Exception e) { 
+                
+                }
+
                 Database db = DatabaseFactory.CreateDatabase();
                 using (IDataReader reader = db.ExecuteReader(CommandType.Text, strSql.ToString()))
                 {
@@ -1877,6 +1890,17 @@ namespace DSWeb.MvcShipping.DAL.WMSOUT_GuiGeDAL
 
             gids = "'" + gids.Trim().Replace(",", "','") + "'";
 
+            try { 
+            var outhead = GetData($" BSNO in({gids})", "", strUserID);
+
+            var logstr = JsonConvert.Serialize(outhead);
+
+            BasicDataRefDAL.SaveLog(logstr, strUserID, "仓储日志", "出库费用入账");
+            }
+            catch (Exception e)
+            {
+
+            }
             //20230128 改为
             if (ConfigurationManager.AppSettings["DingTalkAuditWMSIN"] == "true")
             {//向钉钉发送出库审批流程
@@ -2138,6 +2162,17 @@ namespace DSWeb.MvcShipping.DAL.WMSOUT_GuiGeDAL
                 result.Success = false;
                 result.Message = "有“已提交的费用”，不允许取消入账，请重新操作！";
                 return result;
+            }
+            try { 
+            var outhead = GetData($" BSNO in({gids})", "", strUserID);
+
+            var logstr = JsonConvert.Serialize(outhead);
+
+            BasicDataRefDAL.SaveLog(logstr, strUserID, "仓储日志", "出库取消入账");
+            }
+            catch (Exception e)
+            {
+
             }
             #endregion