From 9885a8a2f98104f5ee63dd5ab8023095a1d8b9f6 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 02 九月 2024 08:23:44 +0800
Subject: [PATCH] 功能测试

---
 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 33efe0f..30adf61 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -33,7 +33,7 @@
 
         #region 鎺ュ彛鏂规硶
 
-        //JC23缁戝畾鐗╂枡鎵樼洏鍗冲鍔犲簱瀛�
+        //JC26缁戝畾鐗╂枡鎵樼洏鍗冲鍔犲簱瀛�
         public void BindPalletStock(BoxPalletBindVm model, int userId)
         {
             try
@@ -267,7 +267,7 @@
                         InspectQty = 0,
                         ASNNo = bind.ASNNo,
                         ASNDetailNo = bind.ASNDetailNo,
-                        WareHouseNo = "",//鎵�灞炰粨搴�
+                        WareHouseNo = "W01",//鎵�灞炰粨搴�
                         RoadwayNo = "",//鎵�灞炲贩閬�
                         AreaNo = "",//鎵�灞炲尯鍩�
                         LocatNo = "",//鍌ㄤ綅鍦板潃
@@ -446,8 +446,8 @@
                                 Standard = box.Standard,
                                 PackageStandard = box.PackageStandard,
                                 StoreTime = box.StoreTime,
-                                QtyCount = (int)box.QtyCount,
-                                QtyOrd = (int)box.QtyOrd,
+                                QtyCount = box.QtyCount,
+                                QtyOrd = box.QtyOrd,
                                 CreateUser = userId,
                                 CreateTime = comTime,
                             };
@@ -637,7 +637,7 @@
                     .LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
                     .LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)
                     .LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)
-                    .LeftJoin<SysWareHouse>((a, b, c, d, e,f) => e.WareHouseNo == f.WareHouseNo)
+                    .LeftJoin<SysWareHouse>((a, b, c, d, e,f) => a.WareHouseNo == f.WareHouseNo)
                     //.LeftJoin<BllBoxInfo>((a, b, c, d, e, f) => a.Id == e.BindNo)
                     .Select((a, b, c, d,e,f) => new PalletBindDto()
                     {
@@ -1375,7 +1375,7 @@
                    .AndIF(!string.IsNullOrWhiteSpace(layer), m => m.Layer == int.Parse(layer))
                    .AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo.Contains(locateNo))
                    .And(m => m.IsDel == "0" && m.Status == "0" && m.Flag == "0" && m.WareHouseNo == houseNo)
-                   .And(m => m.AreaNo == categoryAreaNo)
+                   .And(m => categoryAreaNo.Contains(m.AreaNo))
                    .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
                 var total = 0;
                 var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column)
@@ -1949,6 +1949,8 @@
                                 Db.Updateable(bindModel).ExecuteCommand();
                                 asnNo = stockModel.ASNNo;
                             }
+
+
                         }
                     }
                     foreach (DataStockDetail stockModel in stockDetail)

--
Gitblit v1.8.0