From ea2ff46d87d65bfdcc2e247bcb41c50b92419a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=86=E6=99=94?= <luy@valueics.com>
Date: Mon, 22 May 2023 16:55:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=B4=A7=E6=9F=9C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=A0=E8=BE=93=E6=A3=80=E9=AA=8C=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs    |  3 +++
 .../NFine.Application/WMS/WMSCreateItemLotApp.cs   | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
index f7caeef..b31c854 100644
--- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
+++ b/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
@@ -602,6 +602,9 @@ namespace ICSSoft.FromERP
                             }
                             #endregion
 
+                            #region 委外退料单同步（单据类型：06）
+                            #endregion
+
                             #region 生产领料单同步（单据类型：01 03 17）
                             HeadInfo = HeadInfoList.Where(a => a.LEIXING == "01" || a.LEIXING == "03" || a.LEIXING == "17");
                             foreach (SAPGetDocInfoVPN.ZWMS_SK_HEAD Info in HeadInfo)
diff --git a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
index 2b5a66f..64233a0 100644
--- a/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
+++ b/WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
@@ -1469,9 +1469,23 @@ insert into ICSInventoryLot
                     chkdt = SqlHelper.GetDataTableBySql(chksql);
                 }
                 #endregion
+                #region 货柜接口调用前日志
+                object logID = Guid.NewGuid();
+                string logsql = @"insert into ICSWMS_HGLog
+                                  values
+                                  ('{0}',GETDATE(),'{1}','{2}','{3}','{4}','{5}')";
+                logsql = string.Format(logsql, logID, InspectJosn, "", WorkPoint, MUSER, MUSERNAME);
+                SqlHelper.CmdExecuteNonQueryLi(logsql);
+                #endregion
                 if (chkdt.Rows.Count > 0 && Convert.ToBoolean(System.Configuration.ConfigurationManager.AppSettings["UploadERP"]))
                 {
                     result = HTTPHelper.RestFulGet(InspectJosn, postUrlStr);
+                    #region 货柜接口调用后日志
+                    logsql = @"update ICSWMS_HGLog set ReturnResult='{0}'
+                               where ID='{1}'";
+                    logsql = string.Format(logsql, result, logID);
+                    SqlHelper.CmdExecuteNonQueryLi(logsql);
+                    #endregion
                     if (!result.Contains("successo"))
                     {
                         ICSHGResult hgresult = JsonConvert.DeserializeObject<ICSHGResult>(result.TrimStart('[').TrimEnd(']'));