From 67a1509e8f66b12ce07ee9caba7427c4e1fde912 Mon Sep 17 00:00:00 2001
From: hlb <894797954@qq.com>
Date: Thu, 29 Jun 2023 18:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=86=85=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E5=92=8C=E9=85=8D=E9=80=81=E7=94=B3=E8=AF=B7=E5=9B=9E?=
 =?UTF-8?q?=E6=9B=B4=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs | 4 ++++
 WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs
index d953e808..54691b4b 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs
@@ -8,6 +8,7 @@ using JNPF.Common.Core.Manager;
 using JNPF.Common.Dtos.VisualDev;
 using JNPF.Common.Enums;
 using JNPF.Common.Extension;
+using JNPF.Common.Security;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
 using JNPF.FriendlyException;
@@ -15,6 +16,7 @@ using JNPF.Systems.Interfaces.System;
 using JNPF.VisualDev;
 using JNPF.VisualDev.Entitys;
 using JNPF.VisualDev.Interfaces;
+using Mapster;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using Tnb.BasicData.Entities;
@@ -172,6 +174,8 @@ namespace Tnb.WarehouseMgr
                                 var ids = new[] { input.data[nameof(WmsDelivery.startlocation_id)].ToString(), input.data[nameof(WmsDelivery.endlocation_id)].ToString() };
                                 await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_lock = 1 }).Where(it => ids.Contains(it.id)).ExecuteCommandAsync();
                             }
+                            await _db.Updateable<WmsDelivery>().SetColumns(it => new WmsDelivery { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == input.data["ReturnIdentity"].ToString()).ExecuteCommandAsync();
+
                         }
                     }
 
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs
index 2ce0a3c7..75fc0464 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs
@@ -132,6 +132,8 @@ namespace Tnb.WarehouseMgr
                             //所有库位加锁
                             var ids = new[] { input.data[nameof(WmsTransfer.startlocation_id)].ToString(), input.data[nameof(WmsTransfer.endlocation_id)].ToString() };
                             await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_lock = 1 }).Where(it => ids.Contains(it.id)).ExecuteCommandAsync();
+                            await _db.Updateable<WmsTransfer>().SetColumns(it => new WmsTransfer { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == input.data["ReturnIdentity"].ToString()).ExecuteCommandAsync();
+
                         }
                     }
 
@@ -150,7 +152,7 @@ namespace Tnb.WarehouseMgr
         public override async Task ModifyAsync(WareHouseUpInput input)
         {
             if (input == null) throw new ArgumentNullException(nameof(input));
-            var isOk = await _db.Updateable<WmsTransfer>().SetColumns(it => new WmsTransfer { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
+            var isOk = await _db.Updateable<WmsTransfer>().SetColumns(it => new WmsTransfer { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
             if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
         }
     }