From 105639743f1b2f8c47a5bc9659532f231935206b Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期四, 15 八月 2024 10:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda

---
 MES.Service/service/Warehouse/MesDepotSectionsManager.cs |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/MES.Service/service/Warehouse/MesDepotSectionsManager.cs b/MES.Service/service/Warehouse/MesDepotSectionsManager.cs
index 3a02a02..0fbb744 100644
--- a/MES.Service/service/Warehouse/MesDepotSectionsManager.cs
+++ b/MES.Service/service/Warehouse/MesDepotSectionsManager.cs
@@ -17,21 +17,17 @@
             .Select((a, b) => a.DepotSectionName).Single();
 
         if (sectionName == null)
-        {
             throw new Exception("搴撲綅缂栫爜 " + query.sectionCode + " 涓嶅瓨鍦紝璇风‘璁わ紒");
-        }
 
         return sectionName;
     }
 
+    //搴撲綅鍙樻洿
     public MesDepotSections ScanInDepotSectionsName(WarehouseQuery query)
     {
-        
         if (string.IsNullOrEmpty(query.sectionCode))
-        {
             throw new Exception("璇锋壂搴撲綅鏉$爜!");
-        }
-        
+
         var mesDepotSections = Db.Queryable<MesDepotSections, MesDepots>(
                 (a, b) =>
                     new JoinQueryInfos(JoinType.Inner, a.DepotId == b.DepotId))
@@ -44,20 +40,47 @@
             }).First();
 
         if (mesDepotSections == null)
-        {
             throw new Exception("搴撲綅缂栫爜" + query.sectionCode + " 涓嶅瓨鍦紝璇风‘璁�!");
-        }
 
         return mesDepotSections;
     }
 
+    //搴撲綅鍙樻洿
     public MesInvItemStocks ScanEditBarcode(WarehouseQuery entity)
     {
         if (string.IsNullOrEmpty(entity.sectionCode))
-        {
             throw new Exception("璇锋壂搴撲綅鏉$爜!");
-        }
 
-        return null;
+        var mesDepotSections = Db.Queryable<MesDepotSections, MesDepots>(
+                (a, b) =>
+                    new JoinQueryInfos(JoinType.Inner,
+                        a.Zuid.ToString() == b.Zuid))
+            .Where((a, b) => a.DepotSectionCode == entity.sectionCode)
+            .First();
+        if (mesDepotSections == null)
+            throw new Exception("搴撲綅缂栫爜" + entity.sectionCode + " 涓嶅瓨鍦紝璇风‘璁わ紒");
+
+        var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
+            .Where(s => s.ItemBarcode == entity.barcode).First();
+
+        if (mesInvItemStocks == null) throw new Exception("鏉$爜鍦ㄤ粨搴撲腑涓嶅瓨鍦紝璇锋牳瀵癸紒");
+
+        if (mesInvItemStocks.DepotsCode != mesDepotSections.DepotCode)
+            throw new Exception(
+                "鏉$爜鍘熶粨搴擄細" + mesInvItemStocks.DepotsCode + " 涓庣洰鏍囦粨搴擄細" +
+                mesDepotSections.DepotCode + " 涓嶄竴鑷达紝搴撲綅鍙樻洿澶辫触锛�");
+
+        UseTransaction(db =>
+        {
+            return db.Updateable<MesInvItemStocks>()
+                .SetColumns(s => s.DepotsCode == mesDepotSections.DepotCode)
+                .SetColumns(s => s.DepotSectionsCode == entity.sectionCode)
+                .Where(s => s.ItemBarcode == entity.barcode)
+                .ExecuteCommand();
+        });
+
+        return mesInvItemStocks;
     }
+
+    //璋冩嫧鍏ュ簱
 }
\ No newline at end of file

--
Gitblit v1.9.3