From 610eb2a83ef824b7025bda7aea6883ba9fc80746 Mon Sep 17 00:00:00 2001
From: yangtm <vivianyang@valueics.com>
Date: Fri, 22 Nov 2024 13:50:15 +0800
Subject: [PATCH] no message

---
 .../ICSSoft.DataProject/ICSPurchaseService.cs      | 14 +++++++++-----
 WMS-BS/NFine.Application/WMS/PickMaterialApp.cs    |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs
index 0a512ea..10f847a 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs
@@ -290,7 +290,7 @@ namespace ICSSoft.DataProject
         /// <param name="Quantity"></param>
         /// <param name="WorkPoint"></param>
         /// <param name="cmd"></param>
-        public static void DeliveryNoticeInForHG(string DocNO, string TransLine, string WorkPoint, SqlCommand cmd, Dictionary<string, string> language,string quantity)
+        public static void DeliveryNoticeInForHG(string DocNO, string TransLine, string WorkPoint, SqlCommand cmd, Dictionary<string, string> language, string quantity)
         {
             try
             {
@@ -386,12 +386,14 @@ namespace ICSSoft.DataProject
 							    GROUP BY A.DNCode,A.WorkPoint";
                 sql = string.Format(sql, Identification);
                 DataTable dt = DBHelper.SQlReturnData(sql, cmd);
-                if (dt.Rows.Count > 1)
-                {
-                    throw new Exception(language.GetNameByCode("WMSAPIInfo202"));//单次提交单据数量卡控（只允许一张单据）
-                }
+                //if (dt.Rows.Count > 1)
+                //{
+                //    throw new Exception(language.GetNameByCode("WMSAPIInfo202"));//单次提交单据数量卡控（只允许一张单据）
+                //}
+                log.Info("采购上架传入SAP数据：" + JsonConvert.SerializeObject(dt));
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
+                    log.Info("采购上架传入SAP数据：" + JsonConvert.SerializeObject(dt.Rows));
                     string chksql = @"select SUM(Quantity) AS Quantity,SUM(RCVQuantity) AS RCVQuantity from ICSDeliveryNotice
                                       where DNCode='{0}' and WorkPoint='{1}'
                                       GROUP BY DNCode,WorkPoint";
@@ -428,6 +430,8 @@ namespace ICSSoft.DataProject
                     {
                         IsSuccess = "N";
                         ErrorMessage += result.L_MESSAGE;
+                        log.Error("采购上架失败数据：" + JsonConvert.SerializeObject(dt.Rows) + "," + ErrorMessage);
+                        break;
                     }
                 }
                 if (IsSuccess == "N")
diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
index a1be7b4..a1d992b 100644
--- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
+++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
@@ -1983,7 +1983,7 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
                             var pikTbLogTime = DateTime.Now;
                             string pikTbLogsql = string.Empty;
                             List<string> DocNoList = new List<string>();
-                            if (Type == "2" || Type == "12" || Type == "5")
+                            if (Type == "2" || Type == "12" || Type == "5" || Type == "10")
                             {
                                 #region 货柜
                                 string InspectJosn = "";
@@ -2609,7 +2609,7 @@ a.Sequence,
                         string pikTbLogsql = string.Empty;
                         List<string> DocNoList = new List<string>();
 
-                        if (Type == "2" || Type == "12" || Type == "5")
+                        if (Type == "2" || Type == "12" || Type == "5" || Type == "10")
                         {
                             string ccsql = @"select B.F_Id from ICSInventoryDetail A
                                              INNER JOIN Sys_SRM_ItemsDetail  B ON B.F_Define1=A.WHCode AND B.F_Define2=A.LocationCode AND B.F_Define4=A.WorkPoint