From 17ab663e1013b4be70098cae5e1ae43ede46a393 Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Fri, 16 Jun 2023 11:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BD=BD=E5=85=B7=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BD=BD=E5=85=B7=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entity/WmsCarrybindH.cs                   |  5 +++++
 .../Tnb.WarehouseMgr/WmsCarryBindService.cs   | 19 +++++--------------
 .../WmsCarryReplaceService.cs                 | 17 ++++++++++++-----
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindH.cs
index 540102b2..de0a98a1 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindH.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarrybindH.cs
@@ -24,6 +24,11 @@ public partial class WmsCarrybindH : BaseEntity<string>
     /// </summary>
     public string? org_id { get; set; }
 
+    /// <summary>
+    /// 所属组织ID
+    /// </summary>
+    public string? carry_id { get; set; }
+
     /// <summary>
     /// 载具编号
     /// </summary>
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
index 6bc43792..5928b422 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
@@ -65,21 +65,12 @@ namespace Tnb.WarehouseMgr
                 await _runService.Create(templateEntity, input);
 
                 if (input == null) throw new ArgumentNullException(nameof(input));
-                var oldCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.data[nameof(WmsCarryReplaceH.carry_id)].ToString());
-                var newCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.data[nameof(WmsCarryReplaceH.newcarry_id)].ToString());
+                var Carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.data[nameof(WmsCarryReplaceH.carry_id)].ToString());
+                var subCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.data[nameof(WmsCarryReplaceH.newcarry_id)].ToString());
 
-                if(oldCarry.carrystd_id != newCarry.carrystd_id)
-                {
-                    string errorMessege = "新老载具规格应相同";
-                    throw Oops.Oh(errorMessege);
-                }
-                if(oldCarry.carrystd_id == newCarry.carrystd_id)
-                {
-                    var isOk = await _db.Updateable<WmsCarryD>().SetColumns(it => it.carry_id == newCarry.id).Where(it => it.carry_id == oldCarry.id).ExecuteCommandHasChangeAsync();
-                    if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
-                    isOk = await _db.Updateable<WmsCarryCode>().SetColumns(it => it.carry_id == newCarry.id).Where(it => it.carry_id == oldCarry.id).ExecuteCommandHasChangeAsync();
-                    if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
-                }
+             
+               
+               
                 
 
                 /*
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs
index 2736fce4..d11b4122 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs
@@ -66,11 +66,18 @@ namespace Tnb.WarehouseMgr
                 if (input == null) throw new ArgumentNullException(nameof(input));
                 var oldCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.data[nameof(WmsCarryReplaceH.carry_id)].ToString());
                 var newCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.data[nameof(WmsCarryReplaceH.newcarry_id)].ToString());
-
-                var isOk = await _db.Updateable<WmsCarryD>().SetColumns(it => it.carry_id ==  newCarry.id).Where(it => it.carry_id == oldCarry.id).ExecuteCommandHasChangeAsync();
-                if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
-                isOk = await _db.Updateable<WmsCarryCode>().SetColumns(it => it.carry_id == newCarry.id).Where(it => it.carry_id == oldCarry.id).ExecuteCommandHasChangeAsync();
-                if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+                if (oldCarry.carrystd_id != newCarry.carrystd_id)
+                {
+                    string errorMessege = "新老载具规格应相同";
+                    throw Oops.Oh(errorMessege);
+                }
+                if (oldCarry.carrystd_id == newCarry.carrystd_id)
+                {
+                    var isOk = await _db.Updateable<WmsCarryD>().SetColumns(it => it.carry_id == newCarry.id).Where(it => it.carry_id == oldCarry.id).ExecuteCommandHasChangeAsync();
+                    if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+                    isOk = await _db.Updateable<WmsCarryCode>().SetColumns(it => it.carry_id == newCarry.id).Where(it => it.carry_id == oldCarry.id).ExecuteCommandHasChangeAsync();
+                    if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+                }
 
                 /*
                  * db.Updateable(WmsCarryD).SetColumns(it => it.carry_id == newCarry.id).Where(it=>it.carry_id == oldCarry.id).ExecuteCommand();