Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs

@@ -248,5 +248,10 @@ public partial class BasMaterial : BaseEntity<string>
     /// 是否包含入库数
     /// </summary>
     public int? is_contain_into_num { get; set; }
+    
+    /// <summary>
+    /// 是否创建子工单
+    /// </summary>
+    public string? is_create_sub_work_order { get; set; }
 
 }

BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs

@@ -4,6 +4,19 @@ namespace Tnb.BasicData.Interfaces
 {
     public interface IBasMaterialService
     {
+        /// <summary>
+        /// 获取本物料清单及其所有子集物料信息
+        /// </summary>
+        /// <param name="queryInput"></param>
+        /// <returns></returns>
         public Task<dynamic> GetMaterialSelectInfo(MaterialSelectQueryInput queryInput);
+        
+        
+        /// <summary>
+        /// 获取可创建子工单的物料
+        /// </summary>
+        /// <param name="queryInput"></param>
+        /// <returns></returns>
+        public Task<dynamic> GetCanCreateSubWorkOrderMaterial(MaterialSelectQueryInput queryInput);
     }
 }

BasicData/Tnb.BasicData/BasMaterialService.cs

@@ -128,6 +128,38 @@ namespace Tnb.BasicData
             }
         }
 
+        [HttpPost]
+        public async Task<dynamic> GetCanCreateSubWorkOrderMaterial(MaterialSelectQueryInput queryInput)
+        {
+            var db = _repository.AsSugarClient();
+            if (!string.IsNullOrEmpty(queryInput.ebom_id))
+            {
+                List<string> ids = await GetAllChildrenMaterialId(queryInput.ebom_id,0);
+                var result = await db.Queryable<BasMaterial>()
+                    .LeftJoin<DictionaryTypeEntity>((a, b) => b.EnCode == DictConst.MeasurementUnit && b.DeleteMark == null)
+                    .LeftJoin<DictionaryDataEntity>((a, b, c) => c.DictionaryTypeId == b.Id && a.unit_id == c.EnCode)
+                    .WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info))
+                    .WhereIF(!string.IsNullOrEmpty(queryInput.ebom_id), (a, b, c) => ids.Contains(a.id))
+                    .Where((a,b,c)=>a.is_create_sub_work_order=="1")
+                    .Select((a, b, c) => new MaterialSelectOutput()
+                    {
+                        id = a.id,
+                        code = a.code,
+                        name = a.name,
+                        descrip = a.descrip,
+                        unit_id = a.unit_id,
+                        unit_name = c.FullName,
+                    }).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize);
+
+                return PageResult<MaterialSelectOutput>.SqlSugarPageResult(result);
+                
+            }
+            else
+            {
+                return PageResult<MaterialSelectOutput>.SqlSugarPageResult(new SqlSugarPagedList<MaterialSelectOutput>());
+            }
+        }
+
         /// <summary>
         /// 获取物料清单下所子集物料id
         /// </summary>

PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs

@@ -4,125 +4,4 @@ public class ModuleConsts
 {
     public const string Tag = "PerMgr";
     public const string Area = "per";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣ȡ<ECB3A3><C8A1>
-    /// </summary>
-    public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4>
-    /// </summary>
-    public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDAͶ<41>ϲ<EFBFBD><CFB2><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>󶨲<EFBFBD><F3B6A8B2><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSBINDINGPDA_ID = "26496560237333";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߽<D8BE><DFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߰<D8BE><DFB0><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ<EFBFBD><D8BE>Ƴ<EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߸<D8BE><DFB8><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>
-    /// </summary>
-    public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSINBALEINPDA_ID = "26475412782629";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDAһ<41><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSINSTOCKPDA_ID = "26458832529445";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSOUTBALE_ID = "26192638001445";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSINBALE_ID = "26192480520485";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSOUTSTOCK_ID = "26191983650597";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSINSTOCK_ID = "26191326300453";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ߸<D8BE><DFB8><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>׷ּ<D7B7>
-    /// </summary>
-    public const string MODULE_WMSSETSORTING_ID = "26172520979237";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>׳<EFBFBD><D7B3><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSKITTINGOUTSTK_ID = "26169701736741";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSKITTINGINSTK_ID = "26166785871909";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSDELIVERY_ID = "26126388337189";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>
-    /// </summary>
-    public const string MODULE_WMSTRANSFER_ID = "26125750270757";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ<EFBFBD><D8BE>Ƴ<EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSCARRYMOOUTSTK_ID = "26123262586661";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>ؾ߳<D8BE><DFB3><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSEPTYOUTSTK_ID = "26122798979365";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_CARRYMOVEINSTOCK_ID = "26122102481957";
-    /// <summary>
-    ///   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
-    /// </summary>
-    public const string MODULE_WMSEMPTYINSTOCK_ID = "26120915344165";
-
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs

@@ -94,9 +94,16 @@ public class ModuleConsts
     /// </summary>
     public const string MODULE_WMSINSTOCK_ID = "26191326300453";
     /// <summary>
+    ///   模块标识-载具解绑
+    public const string MODULE_WMSCARRYUNBIND_ID = "26106270092325";
+    /// <summary>
+    ///   模块标识-载具绑定
+    /// </summary>
+    public const string MODULE_WMSCARRYBIND_ID = "26105163614501";
+    /// <summary>
     ///   模块标识-载具更换
     /// </summary>
-    public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";
+    public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";//26188532491557
     /// <summary>
     ///   模块标识-齐套分拣
     /// </summary>

WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs

@@ -31,7 +31,6 @@ namespace Tnb.WarehouseMgr
         private readonly ISqlSugarClient _db;
         private readonly IUserManager _userManager;
         private readonly IBillRullService _billRullService;
-        public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
         public WmsBindService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
         {
             _db = repository.AsSugarClient();
@@ -52,7 +51,7 @@ namespace Tnb.WarehouseMgr
         /// </param>
         /// <returns></returns>
         /// <exception cref="ArgumentNullException"></exception>
-        public async Task<dynamic> WmsBind(VisualDevModelDataCrInput input)
+        private async Task<dynamic> WmsBind(VisualDevModelDataCrInput input)
         {
             var isOk = false;
             try

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs

@@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr
     /// <summary>
     /// 载具绑定
     /// </summary>
-    [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)]
+    [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYBIND_ID)]
     public class WmsCarryBindService : BaseWareHouseService
     {
         private readonly ISqlSugarClient _db;

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs

@@ -1,175 +0,0 @@
-using JNPF.Common.Contracts;
-using JNPF.Common.Core.Manager;
-using JNPF.Common.Dtos.VisualDev;
-using JNPF.Common.Enums;
-using JNPF.Common.Security;
-using JNPF.DependencyInjection;
-using JNPF.DynamicApiController;
-using JNPF.FriendlyException;
-using JNPF.Logging;
-using JNPF.Systems.Interfaces.System;
-using JNPF.VisualDev;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using Tnb.Common.Utils;
-using Tnb.WarehouseMgr.Entities;
-using Tnb.WarehouseMgr.Entities.Consts;
-using Tnb.WarehouseMgr.Entities.Dto;
-using Tnb.WarehouseMgr.Entities.Enums;
-using Tnb.WarehouseMgr.Interfaces;
-
-namespace Tnb.WarehouseMgr
-{
-    /// <summary>
-    /// 载具服务
-    /// </summary>
-    [OverideVisualDev(ModuleId)]
-    public class WmsCarryReplaceService : BaseWareHouseService, IWmsCarryService
-    {
-        private const string ModuleId = "26188532491557";
-        private readonly ISqlSugarClient _db;
-        private readonly IUserManager _userManager;
-        private readonly IBillRullService _billRullService;
-        public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
-        public WmsCarryReplaceService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
-        {
-            _db = repository.AsSugarClient();
-            _userManager = userManager;
-            _billRullService = billRullService;
-            OverideFuncs.CreateAsync = CarryReplace;
-        }
-
-        /// <summary>
-        /// 更换载具
-        /// </summary>
-        /// <param name="input">
-        /// 输入参数:
-        /// <br/>{
-        /// <br/>    old_carry_id:老载具id 
-        /// <br/>    new_carry_id：新载具ID
-        /// <br/>}
-        /// </param>
-        /// <returns></returns>
-        /// <exception cref="ArgumentNullException"></exception>
-        [HttpPost]
-        public async Task<dynamic> CarryReplace(VisualDevModelDataCrInput input)
-        {
-            var isOk = false;
-            try
-            {
-                await _db.Ado.BeginTranAsync();
-                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);
-                var newCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == newCarryId);
-                if (oldCarry != null && newCarry != null)
-                {
-                    ExChangeCarryInput carryInput = new() { old_carry_id = oldCarry.id, new_carry_id = newCarry.id };
-                    isOk = await _updateSubCarry<WmsCarryD>(carryInput);
-                    isOk = await _updateSubCarry<WmsCarryMat>(carryInput);
-                    isOk = await _updateSubCarry<WmsCarryCode>(carryInput);
-
-                    newCarry.status = oldCarry.status;
-                    newCarry.carry_status = oldCarry.carry_status;
-                    newCarry.location_id = oldCarry.location_id;
-                    newCarry.location_code = oldCarry.location_code;
-                    newCarry.is_lock = oldCarry.is_lock;
-                    newCarry.out_status = oldCarry.out_status;
-                    newCarry.is_check = oldCarry.is_check;
-                    newCarry.bale_num = oldCarry.bale_num;
-                    newCarry.collocation_scheme_id = oldCarry.collocation_scheme_id;
-                    newCarry.collocation_scheme_code = oldCarry.collocation_scheme_code;
-                    newCarry.source_id = oldCarry.source_id;
-                    newCarry.source_code = oldCarry.source_code;
-                    newCarry.create_id = _userManager.UserId;
-                    newCarry.create_time = DateTime.Now;
-                    var row = await _db.Updateable(newCarry).ExecuteCommandAsync();
-                    WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt<WmsCarryReplaceH>();
-                    wmsCarryReplaceH.id = SnowflakeIdHelper.NextId();
-                    wmsCarryReplaceH.org_id = oldCarry.org_id;
-                    wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE);
-                    wmsCarryReplaceH.carry_id = oldCarry.id;
-                    wmsCarryReplaceH.carry_code = oldCarry.carry_code;
-                    wmsCarryReplaceH.newcarry_id = newCarry.id;
-                    wmsCarryReplaceH.newcarry_code = newCarry.carry_code;
-                    row = await _db.Insertable(wmsCarryReplaceH).ExecuteCommandAsync();
-                    row = await UpdateNullCarry(oldCarry);
-                    isOk = (row > 0);
-                    if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
-                }
-                else
-                {
-                    if (oldCarry == null)
-                    {
-                        throw new AppFriendlyException("没有可用的旧载具", 500);
-                    }
-                    if (newCarry == null)
-                    {
-                        throw new AppFriendlyException("没有可用的新载具", 500);
-                    }
-
-                }
-                await _db.Ado.CommitTranAsync();
-            }
-            catch (Exception ex)
-            {
-                Log.Error("载具更换失败", ex);
-                await _db.Ado.RollbackTranAsync();
-                throw;
-            }
-            return isOk;
-        }
-
-        public async Task<int> UpdateNullCarry(WmsCarryH carryObj)
-        {
-            var row = -1;
-            try
-            {
-                carryObj.status = 0;
-                carryObj.carry_status = "0";
-                carryObj.location_id = null;
-                carryObj.location_code = null;
-                carryObj.out_status = "0";
-                carryObj.is_check = 0;
-                carryObj.status = 1;
-                carryObj.bale_num = null;
-                carryObj.collocation_scheme_id = null;
-                carryObj.collocation_scheme_code = null;
-                carryObj.source_id = null;
-                carryObj.source_code = null;
-                row = await _db.Updateable(carryObj).ExecuteCommandAsync();
-            }
-            catch (Exception ex)
-            {
-
-            }
-            return row;
-        }
-
-        private async Task<bool> _updateSubCarry<T>(ExChangeCarryInput input) where T : BaseEntity<string>, IWmsCarryEntity, new()
-        {
-            var row = -1;
-            var items = await _db.Queryable<T>().Where(it => it.carry_id == input.old_carry_id).ToListAsync();
-            if (items?.Count > 0)
-            {
-                List<T> newItems = DeepCopyHelper<T>.DeepCopyList(items);
-                if (newItems?.Count > 0)
-                {
-                    newItems.ForEach(x =>
-                    {
-                        x.id = SnowflakeIdHelper.NextId();
-                        x.carry_id = input.new_carry_id;
-
-                    });
-                    row = await _db.Insertable(newItems).ExecuteCommandAsync();
-                }
-                if (row > 0)
-                {
-                    row = await _db.Deleteable(items).ExecuteCommandAsync();
-                }
-            }
-            return (row > 0);
-        }
-    }
-}

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs

@@ -24,14 +24,12 @@ namespace Tnb.WarehouseMgr
     /// <summary>
     /// 载具服务
     /// </summary>
-    [OverideVisualDev(ModuleId)]
+    [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)]
     public class WmsCarryService : BaseWareHouseService, IWmsCarryService
     {
-        private const string ModuleId = "26188532491557";
         private readonly ISqlSugarClient _db;
         private readonly IUserManager _userManager;
         private readonly IBillRullService _billRullService;
-        public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
         public WmsCarryService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
         {
             _db = repository.AsSugarClient();
@@ -52,8 +50,7 @@ namespace Tnb.WarehouseMgr
         /// </param>
         /// <returns></returns>
         /// <exception cref="ArgumentNullException"></exception>
-        [HttpPost]
+        private async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input)
-        public async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input)
         {
             var isOk = false;
             try

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs

@@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr
     /// <summary>
     /// 载具解绑
     /// </summary>
-    [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)]
+    [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYUNBIND_ID)]
     public class WmsCarryUnbindService : BaseWareHouseService
     {
         private readonly ISqlSugarClient _db;

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Enums;
+using JNPF.Common.Extension;
+using JNPF.Common.Security;
+using JNPF.FriendlyException;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using NPOI.SS.Formula;
+using SqlSugar;
+using Tnb.BasicData.Entities;
+using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Attributes;
+using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Interfaces;
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 载具绑定
+    /// </summary>
+    [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYBINDPDA_ID)]
+    public class WmsPDACarryBindService : BaseWareHouseService
+    {
+        private readonly ISqlSugarClient _db;
+        private readonly IRunService _runService;
+        private readonly IVisualDevService _visualDevService;
+        private readonly IUserManager _userManager;
+        private readonly IBillRullService _billRullService;
+        public WmsPDACarryBindService(
+            ISqlSugarRepository<WmsCarryH> repository,
+            IRunService runService,
+            IVisualDevService visualDevService,
+            IUserManager userManager,
+            IBillRullService billRullService)
+        {
+            _db = repository.AsSugarClient();
+            _runService = runService;
+            _visualDevService = visualDevService;
+            _userManager = userManager;
+            _billRullService = billRullService;
+            OverideFuncs.CreateAsync = PDACarryBind;
+        }
+        
+        private async Task<dynamic> PDACarryBind(VisualDevModelDataCrInput input)
+        {
+            var isOk = false;
+            try
+            {
+                await _db.Ado.BeginTranAsync();
+
+                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true);
+                await _runService.Create(templateEntity, input);
+
+                if (input == null) throw new ArgumentNullException(nameof(input));
+                var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
+                var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : "";
+                var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
+                var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId);
+                WmsCarrybindH wmsCarrybindH = carry.Adapt<WmsCarrybindH>();
+                if (carry != null && subCarry != null)
+                {
+                    wmsCarrybindH.id = SnowflakeIdHelper.NextId();
+                    wmsCarrybindH.org_id = carry.org_id;
+                    wmsCarrybindH.carry_id = carry.id;
+                    wmsCarrybindH.membercarry_id = subCarry.id;
+                    wmsCarrybindH.membercarry_code = subCarry.carry_code;
+                    wmsCarrybindH.loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1);
+                    wmsCarrybindH.create_id = _userManager.UserId;
+                    wmsCarrybindH.create_time = DateTime.Now;
+                    var row = await _db.Insertable(wmsCarrybindH).ExecuteCommandAsync();
+                    carry.carry_status = "1";
+                    row = await _db.Updateable(carry).ExecuteCommandAsync();
+                    subCarry.carry_status = "1";
+                    row = await _db.Updateable(subCarry).ExecuteCommandAsync();
+                    var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        WmsCarrybindCode wmsCarrybindCode = new();
+                        wmsCarrybindCode.id = SnowflakeIdHelper.NextId();
+                        wmsCarrybindCode.org_id = subCarry.id;
+                        wmsCarrybindCode.carrybind_id = wmsCarrybindH.id;
+                        wmsCarrybindCode.material_id = items[i].material_id;
+                        wmsCarrybindCode.material_code = items[i].material_code;
+                        wmsCarrybindCode.barcode = items[i].barcode;
+                        wmsCarrybindCode.code_batch = items[i].code_batch;
+                        wmsCarrybindCode.codeqty = items[i].codeqty;
+                        wmsCarrybindCode.membercarry_id = subCarry.id;
+                        wmsCarrybindCode.membercarry_code = subCarry.carry_code;
+                        wmsCarrybindCode.unit_id = items[i].unit_id;
+                        wmsCarrybindCode.unit_code = items[i].unit_code;
+                        wmsCarrybindCode.create_id = _userManager.UserId;
+                        wmsCarrybindCode.create_time = DateTime.Now;
+                        row = await _db.Insertable(wmsCarrybindCode).ExecuteCommandAsync();
+                    }
+                    isOk = (row > 0);
+                    if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+                }
+                else
+                {
+                    if (carry == null || subCarry == null)
+                    {
+                        throw new AppFriendlyException("没有可用的主载具", 500);
+                    }
+                }
+                await _db.Ado.CommitTranAsync();
+            }
+            catch (Exception ex)
+            {
+                await _db.Ado.RollbackTranAsync();
+                throw;
+            }
+            return Task.FromResult(true);
+        }
+        /*   public override async Task ModifyAsync(WareHouseUpInput input)
+           {
+               if (input == null) throw new ArgumentNullException(nameof(input));
+               var isOk = await _db.Updateable<WmsCarryReplaceH>().SetColumns(it => new WmsCarryReplaceH { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
+               if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+           }*/
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs

@@ -28,11 +28,9 @@ namespace Tnb.WarehouseMgr
     [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACEPDA_ID)]
     public class WmsPDACarryReplaceService : BaseWareHouseService, IWmsCarryService, IPdaStroage
     {
-        //private const string ModuleId = "26188532491557";
         private readonly ISqlSugarClient _db;
         private readonly IUserManager _userManager;
         private readonly IBillRullService _billRullService;
-        public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
         public WmsPDACarryReplaceService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
         {
             _db = repository.AsSugarClient();
@@ -53,8 +51,8 @@ namespace Tnb.WarehouseMgr
         /// </param>
         /// <returns></returns>
         /// <exception cref="ArgumentNullException"></exception>
-        [HttpPost]
+        
-        public async Task<dynamic> PDACarryReplace(VisualDevModelDataCrInput input)
+        private async Task<dynamic> PDACarryReplace(VisualDevModelDataCrInput input)
         {
             var isOk = false;
             try

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs

@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Enums;
+using JNPF.Common.Extension;
+using JNPF.Common.Security;
+using JNPF.FriendlyException;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using NPOI.SS.Formula;
+using SqlSugar;
+using Tnb.BasicData.Entities;
+using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Attributes;
+using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Interfaces;
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 载具解绑
+    /// </summary>
+    [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYUNBINDPDA_ID)]
+    public class WmsPDACarryUnbindService : BaseWareHouseService
+    {
+        private readonly ISqlSugarClient _db;
+        private readonly IRunService _runService;
+        private readonly IVisualDevService _visualDevService;
+        private readonly IUserManager _userManager;
+        private readonly IWareHouseService _wareHouseService;
+        public WmsPDACarryUnbindService(
+            ISqlSugarRepository<WmsCarryH> repository,
+            IRunService runService,
+            IVisualDevService visualDevService,
+            IWareHouseService wareHouseService,
+            IUserManager userManager)
+        {
+            _db = repository.AsSugarClient();
+            _runService = runService;
+            _visualDevService = visualDevService;
+            _userManager = userManager;
+            _wareHouseService = wareHouseService;
+            OverideFuncs.CreateAsync = PDACarryUnbind;
+        }
+        private async Task<dynamic> PDACarryUnbind(VisualDevModelDataCrInput input)
+        {
+            var isOk = false;
+            try
+            {
+                await _db.Ado.BeginTranAsync();
+
+                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true);
+                await _runService.Create(templateEntity, input);
+
+                if (input == null) throw new ArgumentNullException(nameof(input));
+                var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
+                var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : "";
+                var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == carryId);
+                var subCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == subCarryId);
+                //WmsCarryunbindH wmsCarryUnbindH = carry.Adapt<WmsCarryunbindH>();
+                if (carry != null && subCarry != null)
+                {
+                    var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == subCarry.id).ExecuteCommandAsync();
+                    carry.carry_status = "0";
+                    row = await _db.Updateable(carry).ExecuteCommandAsync();
+                    subCarry.carry_status = "0";
+                    row = await _db.Updateable(subCarry).ExecuteCommandAsync();
+                    isOk = (row > 0);
+                    if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+                }
+                else
+                {
+                    if (carry == null)
+                    {
+                        throw new AppFriendlyException("没有可用的主载具", 500);
+                    }
+                    if (subCarry == null)
+                    {
+                        throw new AppFriendlyException("没有可用的子载具", 500);
+                    }
+                }
+
+                await _db.Ado.CommitTranAsync();
+            }
+            catch (Exception ex)
+            {
+                await _db.Ado.RollbackTranAsync();
+                throw;
+            }
+            return Task.FromResult(true);
+        }
+        /*   public override async Task ModifyAsync(WareHouseUpInput input)
+           {
+               if (input == null) throw new ArgumentNullException(nameof(input));
+               var isOk = await _db.Updateable<WmsCarryReplaceH>().SetColumns(it => new WmsCarryReplaceH { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
+               if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+           }*/
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs

@@ -28,13 +28,12 @@ namespace Tnb.WarehouseMgr
     [OverideVisualDev(ModuleId)]
     public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService
     {
-        private const string ModuleId = "26188532491557";
+        private const string ModuleId = "26496913096981";
         private readonly ISqlSugarClient _db;
         private readonly IUserManager _userManager;
         private readonly IBillRullService _billRullService;
         private readonly WmsCarryService _wmsCarryService;
         private static Dictionary<string, object> dicMaterial = new Dictionary<string, object>();
-        public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
         public WmsPDAFeedingService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService,WmsCarryService wmsCarryService)
         {
             _db = repository.AsSugarClient();