From 4f8d1da89bc7cf399e6d90d6230ad6c28114443a Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 23 六月 2025 11:20:13 +0800
Subject: [PATCH] 1.采购入库优化 2.采购退货推荐库位优化

---
 service/Warehouse/MesCgthSqManager.cs            |    2 +-
 service/Warehouse/MesInvItemInCDetailsManager.cs |   22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/service/Warehouse/MesCgthSqManager.cs b/service/Warehouse/MesCgthSqManager.cs
index 169d43d..9c23a05 100644
--- a/service/Warehouse/MesCgthSqManager.cs
+++ b/service/Warehouse/MesCgthSqManager.cs
@@ -27,7 +27,7 @@
         if (mesInvItemOuts == null) throw new Exception("閲囪喘閫�璐х敵璇峰崟涓嶅瓨鍦ㄦ垨鏈鏍�");
 
         var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.SQ_NUM FQty,A.YS_NUM SQty,A.SQ_NUM - A.YS_NUM DSQty,
-       dbo.F_QX_GETRECODEPOTSE(A.ITEM_ID,'','','') as RecoKw
+       dbo.F_QX_GETRECODEPOTSE(A.ITEM_ID,A.depot_id,'','') as RecoKw
 fROM MES_CGTH_SQ_DETAIL A
          LEFT JOIN MES_CGTH_SQ B ON A.MID = B.ID
          LEFT JOIN MES_ITEMS C ON A.ITEM_ID = C.item_id
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 648e17b..339dc2f 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -298,7 +298,7 @@
                             .Where(it =>
                                 it.ItemInId == cId &&
                                     it.ItemId == detail.ItemId &&
-                                    it.DepotId == depotCode2 &&
+                                    it.DepotId == mesDepost.DepotId.ToString() &&
                                     it.EbelnK3id == detail.EbelnK3id &&
                                     it.LineK3id == detail.LineK3id)
                             .Count();
@@ -327,7 +327,7 @@
                                 Remark = itemBarcodeDetails.Memo,
                                 EbelnK3id = detail.EbelnK3id,
                                 LineK3id = detail.LineK3id,
-                                DepotId = depotCode2,
+                                DepotId = mesDepost.DepotId.ToString(),
                                 itemDabid = itemBarcodeDetails.AboutGuid.ToString()
                             }).IgnoreColumns(true).ExecuteCommand();
                         else
@@ -337,7 +337,7 @@
                                 .Where(it =>
                                     it.ItemInId == cId &&
                                     it.ItemId == detail.ItemId &&
-                                    it.DepotId == depotCode2 &&
+                                    it.DepotId == mesDepost.DepotId.ToString() &&
                                     it.EbelnK3id == detail.EbelnK3id &&
                                     it.LineK3id == detail.LineK3id)
                                 .IgnoreColumns(true)
@@ -395,7 +395,7 @@
                             .Where(it =>
                                 it.ItemInId == cId &&
                                     it.ItemId == detail.ItemId &&
-                                    it.DepotId == depotCode2 &&
+                                    it.DepotId == mesDepost.DepotId.ToString() &&
                                     it.EbelnK3id == detail.EbelnK3id &&
                                     it.LineK3id == detail.LineK3id)
                             .Count();
@@ -423,7 +423,7 @@
                                 EbelnK3id = detail.EbelnK3id,
                                 LineK3id = detail.LineK3id,
                                 ItemId = detail.ItemId,
-                                DepotId = depotCode2
+                                DepotId = mesDepost.DepotId.ToString()
                             }).IgnoreColumns(true).ExecuteCommand();
                         else
                             db.Updateable<MesInvItemInCItems>()
@@ -432,7 +432,7 @@
                                 .Where(it =>
                                     it.ItemInId == cId &&
                                     it.ItemId == detail.ItemId &&
-                                    it.DepotId == depotCode2 &&
+                                    it.DepotId == mesDepost.DepotId.ToString() &&
                                     it.EbelnK3id == detail.EbelnK3id &&
                                     it.LineK3id == detail.LineK3id)
                                 .IgnoreColumns(true)
@@ -521,7 +521,7 @@
                     .Where(it =>
                     it.ItemInId == cId &&
                                     it.ItemId == detailone.ItemId &&
-                                    it.DepotId == depotCode2 &&
+                                    it.DepotId == mesDepost.DepotId.ToString() &&
                                     it.itemDabid == itemBarcodeDetails.AboutGuid.ToString())
                     .Count();
 
@@ -549,7 +549,7 @@
                         EbelnK3id = itemBarcodeDetails.EbelnK3id,
                         LineK3id = itemBarcodeDetails.LineK3id,
                         ItemId = itemBarcodeDetails.ItemId,
-                        DepotId = depotCode2,
+                        DepotId = mesDepost.DepotId.ToString(),
                         itemDabid = itemBarcodeDetails.AboutGuid.ToString()
                     }).IgnoreColumns(true).ExecuteCommand();
                 else
@@ -562,7 +562,7 @@
                         .Where(it =>
                                     it.ItemInId == cId &&
                                     it.ItemId == detailone.ItemId &&
-                                    it.DepotId == depotCode2 &&
+                                    it.DepotId == mesDepost.DepotId.ToString() &&
                                     it.itemDabid == itemBarcodeDetails.AboutGuid.ToString())
                         //.IgnoreColumns(true) // 淇濈暀 IgnoreColumns
                         .ExecuteCommand();
@@ -606,7 +606,7 @@
                     CheckRes = inventoryDetails.CheckRes,
                     CheckStates = inventoryDetails.CheckStates,
                     ReceiveOrgId = inventory.ReceiveOrgId,
-                    DepotId = Convert.ToInt64(depotCode2)
+                    DepotId = Convert.ToInt64(mesDepost.DepotId.ToString())
                 }).IgnoreColumns(true).ExecuteCommand();
 
                 // 鎻掑叆 mes_inv_business2 琛�
@@ -667,7 +667,7 @@
                 LineK3id = itemBarcodeDetails.LineK3id,
                 ItemId = itemBarcodeDetails.ItemId,
                 BillNo = itemBarcodeDetails.BillNo,
-                DepotId = Convert.ToInt32(depotCode2),
+                DepotId = Convert.ToInt32(mesDepost.DepotId),
                 OwnerId = cgddDetails.DemandOrg,
                 OwnerType = owner_type,
                 StockOrgId = mesDepost.FSubsidiary,

--
Gitblit v1.9.3