From 1d7dbe3b1ae0f2175365e0f9b0bd157941391395 Mon Sep 17 00:00:00 2001
From: FanLian <fanlian2@163.com>
Date: Wed, 21 Jun 2023 16:06:55 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E7=BB=91=E5=AE=9A=E5=92=8CPDA=E8=BD=BD?=
 =?UTF-8?q?=E5=85=B7=E6=9B=B4=E6=8D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tnb.WarehouseMgr/WmsPDABindService.cs     | 29 +++++++++++++++----
 .../WmsPDACarryReplaceService.cs              |  4 +--
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs
index 922c2a44..992a852b 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs
@@ -9,6 +9,8 @@ using JNPF.FriendlyException;
 using JNPF.Logging;
 using JNPF.Systems.Interfaces.System;
 using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
 using Mapster;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
@@ -25,22 +27,30 @@ namespace Tnb.WarehouseMgr
     /// 载具服务
     /// </summary>
     [OverideVisualDev(ModuleConsts.MODULE_WMSBINDINGPDA_ID)]
-    public class WmsPDABindService : BaseWareHouseService, IWmsCarryService
+    public class WmsPDABindService : BaseWareHouseService, IWmsCarryService, IPdaStroage
     {
-        //private const string ModuleId = "26496560237333";
         private readonly ISqlSugarClient _db;
         private readonly IUserManager _userManager;
         private readonly IBillRullService _billRullService;
-        public WmsPDABindService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
+        private readonly IRunService _runService;
+        private readonly IVisualDevService _visualDevService;
+        public WmsPDABindService(
+            ISqlSugarRepository<WmsCarryH> repository,
+            IUserManager userManager,
+            IBillRullService billRullService,
+            IRunService runService,
+            IVisualDevService visualDevService)
         {
             _db = repository.AsSugarClient();
             _userManager = userManager;
             _billRullService = billRullService;
-            OverideFuncs.CreateAsync = WmsBind;
+            _runService = runService;
+            _visualDevService = visualDevService;
+            OverideFuncs.CreateAsync = WmsPDABind;
         }
 
         /// <summary>
-        /// 绑定操作
+        /// 更换载具
         /// </summary>
         /// <param name="input">
         /// 输入参数:
@@ -51,12 +61,18 @@ namespace Tnb.WarehouseMgr
         /// </param>
         /// <returns></returns>
         /// <exception cref="ArgumentNullException"></exception>
-        private async Task<dynamic> WmsBind(VisualDevModelDataCrInput input)
+        private async Task<dynamic> WmsPDABind(VisualDevModelDataCrInput input)
         {
+
+
             var isOk = false;
             try
             {
                 await _db.Ado.BeginTranAsync();
+
+                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSBINDINGPDA_ID, true);
+                await _runService.Create(templateEntity, input);
+
                 var oldCarryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
                 var newCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : "";
                 var oldCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == oldCarryId);
@@ -137,6 +153,7 @@ namespace Tnb.WarehouseMgr
                 carryObj.source_id = null;
                 carryObj.source_code = null;
                 row = await _db.Updateable(carryObj).ExecuteCommandAsync();
+                //删除对应明细表
                 //删除载具明细
                 await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == carryObj.id).ExecuteCommandHasChangeAsync();
                 //删除载具分拣物料明细
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs
index 3d1fc2b8..d6d4373f 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs
@@ -46,7 +46,7 @@ namespace Tnb.WarehouseMgr
             _billRullService = billRullService;
             _runService = runService;
             _visualDevService = visualDevService;
-            OverideFuncs.CreateAsync = ExchangeCarry;
+            OverideFuncs.CreateAsync = WMSPDACarryReplace;
         }
 
         /// <summary>
@@ -61,7 +61,7 @@ namespace Tnb.WarehouseMgr
         /// </param>
         /// <returns></returns>
         /// <exception cref="ArgumentNullException"></exception>
-        private async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input)
+        private async Task<dynamic> WMSPDACarryReplace(VisualDevModelDataCrInput input)
         {