From 44128eb79b28e59096baa1c740d1390ad4877c9b Mon Sep 17 00:00:00 2001
From: majian <780924089@qq.com>
Date: Mon, 28 Oct 2024 10:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20erp=E6=B7=BB=E5=8A=A0unicode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/ErpInputs/TransferOutstockInput.cs         |  1 +
 .../Entity/WmsTransferInstockD .cs                 |  1 +
 WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs   |  3 ++-
 WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs  | 14 ++++++++------
 .../WmsArtificialInstockService.cs                 |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/TransferOutstockInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/TransferOutstockInput.cs
index ca39119f..e9414d44 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/TransferOutstockInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/TransferOutstockInput.cs
@@ -119,5 +119,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
         /// 辅助属性
         /// </summary>
         public string auxprop_xph { get; set; }
+        public string udi_code { get; set; }
     }
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs
index c94d60c5..1314c35b 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs
@@ -135,5 +135,6 @@ public partial class WmsTransferInstockD : BaseEntity<string>
     /// 辅助属性 小批号
     /// </summary>
     public string auxprop_xph { get; set; }
+    public string udi_code { get; set; }
 }
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
index b5b88651..ea1da0f1 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs
@@ -1686,7 +1686,8 @@ namespace Tnb.WarehouseMgr
                                     throw new AppFriendlyException($@"表体明细中组织{detail.auxprop_gys}在wms系统中未找到！", 500);
                                 }
                                 wmsTransferInstockD.auxprop_xph = detail.auxprop_xph;
-
+                                wmsTransferInstockD.udi_code = detail.udi_code;
+                                
                                 wmsTransferInstockDs.Add(wmsTransferInstockD);
                             }
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 7ba0305c..3abbb119 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -3159,17 +3159,19 @@ namespace Tnb.WarehouseMgr
                                 carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
                             {
                             }
-                            else
+                            else if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID)
                             {
                                 memberCarryIds = await db.Queryable<WmsCarryD>().Where(x=>x.carry_id==carry.id).Select(x=>x.membercarry_id).ToListAsync();
                                 clearCarryIds.AddRange(memberCarryIds);
+
+                                await db.Updateable<WmsCarryH>()
+                              .SetColumns(x => x.carry_status == carryStatus)
+                              .SetColumns(x => x.is_check == isCheck)
+                              .Where(x => clearCarryIds.Contains(x.id))
+                              .ExecuteCommandAsync();
                             }
                             
-                            await db.Updateable<WmsCarryH>()
-                                .SetColumns(x => x.carry_status == carryStatus)
-                                .SetColumns(x => x.is_check == isCheck)
-                                .Where(x => clearCarryIds.Contains(x.id))
-                                .ExecuteCommandAsync();
+                          
                         }
                         else if (dt.biz_type == "erp_qtrk")
                         {
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsArtificialInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsArtificialInstockService.cs
index d82d2108..30e8eb9a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsArtificialInstockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsArtificialInstockService.cs
@@ -95,7 +95,7 @@ namespace Tnb.WarehouseMgr
                 }
                 if (wmsCarryH.carry_status != "1")
                 {
-                    throw new AppFriendlyException($"【ArtificialInstock】载具{input.carry_code}未绑定物料", 500);
+                    throw new AppFriendlyException($"【ArtificialInstock】载具{input.carry_code}未绑定物料，托盘状态不是占用状态", 500);
                 }
 
                 BasLocation carryLoc = await _db.Queryable<BasLocation>().Where(r => r.id == wmsCarryH.location_id).FirstAsync();