载具更换代码优化

EquipMgr/Tnb.EquipMgr.Entities/Dto/CheckItemOutput.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class CheckItemOutput
+    {
+        /// <summary>
+        /// 计划ID
+        /// </summary>
+        public string plan_id { get; set; }
+        /// <summary>
+        /// 模具ID
+        /// </summary>
+        public string mold_id { get; set; }
+        /// <summary>
+        /// 保养组id 
+        /// </summary>
+        public string item_group_id { get; set; }
+        /// <summary>
+        /// 保养组名称
+        /// </summary>
+        public string item_group_name { get; set; }
+        /// <summary>
+        /// 保养项id 
+        /// </summary>
+        public string item_id { get; set; }
+        /// <summary>
+        /// 保养项名称
+        /// </summary>
+        public string item_name { get; set; }
+        /// <summary>
+        /// 保养项，保养状态
+        /// </summary>
+        public int status { get; set; } = 0;
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/CheckItemQueryinput.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    /// <summary>
+    /// 根据模具ID、计划ID获取，保养组及项目信息
+    /// </summary>
+    public class CheckItemQueryinput
+    {
+        /// <summary>
+        /// 计划ID
+        /// </summary>
+        public string plan_id { get; set; }
+        /// <summary>
+        /// 模具ID
+        /// </summary>
+        public string mold_id { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainRunUpInput.cs

@@ -16,16 +16,26 @@ namespace Tnb.EquipMgr.Entities.Dto
         /// </summary>
         public string plan_id { get; set; }
         /// <summary>
-        /// 保养项Ids
+        /// 模具id 
         /// </summary>
-        public List<string>itemIds { get; set; }
+        public string mold_id { get; set; }
+
         /// <summary>
         /// 保养项状态 0，未完成 1，已完成
         /// </summary>
         public int? status { get; set; }
+
         /// <summary>
-        /// 模具id 
+        /// 保养项Ids
         /// </summary>
-        public string mold_id { get; set; }
+        public List<MaintainItemInfo> items { get; set; }
+    }
+
+    public class MaintainItemInfo 
+    {
+
+        public string item_group_id { get; set; }
+        public string item_id { get; set; }
+
     }
 }

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainItemRecord.cs

@@ -42,5 +42,9 @@ public partial class ToolMoldMaintainItemRecord : BaseEntity<string>
     /// 模具ID
     /// </summary>
     public string mold_id { get; set; }
+    /// <summary>
+    /// 保养计划ID
+    /// </summary>
+    public string plan_id { get; set; }
 
 }

EquipMgr/Tnb.EquipMgr/ToolMoldMaintainGroupService.cs

@@ -83,57 +83,7 @@ namespace Tnb.EquipMgr
         [HttpPost]
         public async Task RelevanceMaintianGroupAndItem(MoldMaintainGroupItemInput input)
         {
-            try
+            await Relevance<MoldMaintainGroupItemInput, ToolMoldMaintainGroupItem>(input, nameof(ToolMoldMaintainGroupItem.item_group_id), nameof(ToolMoldMaintainGroupItem.item_id), it => it.item_group_id == input.id);
-            {
-                await _db.Ado.BeginTranAsync();
-
-                if (input.ids == null || input.ids.Count == 0) throw new ArgumentException($"parameter {nameof(input.ids)} not be null or count not be zero");
-                await Relevance<MoldMaintainGroupItemInput, ToolMoldMaintainGroupItem>(input, nameof(ToolMoldMaintainGroupItem.item_group_id), nameof(ToolMoldMaintainGroupItem.item_id), it => it.item_group_id == input.id);
-                List<ToolMoldMaintainItemRecord> itemRecords = new();
-                var grpIds = await _db.Queryable<ToolMoldMaintainGroupItem>().Where(it => input.ids.Contains(it.item_id)).Select(it => it.item_group_id).Distinct().ToListAsync();
-                if (grpIds?.Count > 0)
-                {
-                    var grps = await _db.Queryable<ToolMoldMaintainGroup>().Where(it => grpIds.Contains(it.id)).ToListAsync();
-                    foreach (var grp in grps)
-                    {
-                        var molds = await _db.Queryable<ToolMoldMaintainGroupRelation>().Where(it => it.item_group_id == grp.id).ToListAsync();
-                        if (molds?.Count > 0)
-                        {
-                            foreach (var mold in molds)
-                            {
-                                var dbItIds = await _db.Queryable<ToolMoldMaintainItemRecord>().Where(it => it.mold_id == mold.id && it.item_group_id == grp.id && input.ids.Contains(it.id)).Select(it => it.item_id).ToListAsync();
-                                input.ids = input.ids.Except(dbItIds).ToList();
-                                if (input.ids?.Count > 0)
-                                {
-                                    var items = await _db.Queryable<ToolMoldMaintainItem>().Where(it => input.ids.Contains(it.id)).ToListAsync();
-                                    if (items?.Count > 0)
-                                    {
-                                        foreach (var item in items)
-                                        {
-                                            ToolMoldMaintainItemRecord record = new();
-                                            record.mold_id = mold.id;
-                                            record.item_group_id = grp.id;
-                                            record.item_group_name = grp.name;
-                                            record.item_id = item.id;
-                                            record.item_name = item.name;
-                                            record.status = 0;
-                                            itemRecords.Add(record);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    await _db.Insertable(itemRecords).ExecuteCommandAsync();
-                }
-
-                await _db.Ado.CommitTranAsync();
-            }
-            catch (Exception ex)
-            {
-                await _db.Ado.RollbackTranAsync();
-                throw;
-            }
         }
 
         /// <summary>
@@ -145,41 +95,6 @@ namespace Tnb.EquipMgr
         public async Task RelevanceMaintianGroupAndMold(MoldMaintainGroupItemRelationInput input)
         {
             await Relevance<MoldMaintainGroupItemRelationInput, ToolMoldMaintainGroupRelation>(input, nameof(ToolMoldMaintainGroupRelation.item_group_id), nameof(ToolMoldMaintainGroupRelation.mold_id), it => it.item_group_id == input.id);
-            List<ToolMoldMaintainItemRecord> itemRecords = new();
-            foreach (var moldId in input.ids)
-            {
-                var grpIds = await _db.Queryable<ToolMoldMaintainGroupRelation>().Where(it => it.mold_id == moldId).Select(it => it.item_group_id).Distinct().ToListAsync();
-                if (grpIds?.Count > 0)
-                {
-                    var grps = await _db.Queryable<ToolMoldMaintainGroup>().Where(it => grpIds.Contains(it.id)).ToListAsync();
-                    foreach (var grp in grps)
-                    {
-                        var itemIds = await _db.Queryable<ToolMoldMaintainGroupItem>().Where(it => it.item_group_id == grp.id).Select(it => it.item_id).ToListAsync();
-                        if (itemIds?.Count > 0)
-                        {
-                            var dbItemIds = await _db.Queryable<ToolMoldMaintainItemRecord>().Where(it => it.mold_id == moldId && it.item_group_id == grp.id && itemIds.Contains(it.item_id)).Select(it => it.item_id).ToListAsync();
-                            itemIds = itemIds.Except(dbItemIds).ToList();
-                            if (itemIds?.Count > 0)
-                            {
-                                var items = await _db.Queryable<ToolMoldMaintainItem>().Where(it => itemIds.Contains(it.id)).ToListAsync();
-                                foreach (var item in items)
-                                {
-                                    ToolMoldMaintainItemRecord record = new();
-                                    record.mold_id = moldId;
-                                    record.item_group_id = grp.id;
-                                    record.item_group_name = grp.name;
-                                    record.item_id = item.id;
-                                    record.item_name = item.name;
-                                    record.status = 0;
-                                    itemRecords.Add(record);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            await _db.Insertable(itemRecords).ExecuteCommandAsync();
-
         }
         /// <summary>
         /// 删除项目组与模具检查项信息

EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs

@@ -94,43 +94,69 @@ namespace Tnb.EquipMgr
             return result;
         }
         /// <summary>
-        /// 根据模具ID获取，保养组及项目信息
+        /// 根据计划Id、模具ID获取，保养组及项目信息
         /// </summary>
-        /// <param name="moldId">模具ID</param>
+        /// <param name="input">
-        /// <returns></returns>
+        /// 参数：
+        /// <br/>{
+        /// <br/>    plan_id:计划Id
+        /// <br/>    mold_id:模具Id
+        /// <br/>}
+        /// </param>
+        /// <remarks>
+        /// returns:
+        /// <br/>{
+        /// <br/>    plan_id:计划ID
+        /// <br/>    mold_id:模具ID
+        /// <br/>    item_group_id:保养组ID
+        /// <br/>    item_group_name:保养组名称
+        /// <br/>    item_id:保养项ID
+        /// <br/>    item_name:保养项名称
+        /// <br/>}
+        /// </remarks>
+        /// <exception cref="ArgumentNullException"></exception>
         [HttpGet]
-        public async Task<dynamic> GetCheckItemAndGrpByMoldId([FromRoute] string moldId)
+        public async Task<dynamic> GetCheckItemAndGrpByMoldId([FromQuery] CheckItemQueryinput input)
         {
-            if (moldId.IsNullOrEmpty()) throw new ArgumentException($"parameter {nameof(moldId)} not be null or empty");
+            if (input == null) throw new ArgumentNullException(nameof(input));
-            {
+            var items = await _db.Queryable<ToolMoldMaintainPlanRelation>()
-
+                .InnerJoin<ToolMoldMaintainGroupRelation>((a, b) => a.mold_id == b.mold_id)
-                var checkItems = await _db.Queryable<ToolMoldMaintainItemRecord>().Where(it => it.mold_id == moldId).Select(it => new
+                .InnerJoin<ToolMoldMaintainGroupItem>((a, b, c) => b.item_group_id == c.item_group_id)
+                .InnerJoin<ToolMoldMaintainGroup>((a, b, c, d) => c.item_group_id == d.id)
+                .InnerJoin<ToolMoldMaintainItem>((a, b, c, d, e) => c.item_id == e.id)
+                .Where((a) => a.maintain_plan_id == input.plan_id && a.mold_id == input.mold_id)
+                .Select((a, b, c, d, e) => new CheckItemOutput
                 {
-                    item_group_id = it.item_group_id,
+                    plan_id = a.maintain_plan_id,
-                    item_group_name = it.item_group_name,
+                    mold_id = a.mold_id,
-                    item_id = it.item_id,
+                    item_group_id = d.id,
-                    item_name = it.item_name,
+                    item_group_name = d.name,
-                    status = it.status,
+                    item_id = e.id,
-                }).ToListAsync();
+                    item_name = e.name,
-
+                })
-                //var checkItems = await _db.Queryable<ToolMoldMaintainGroupRelation, ToolMoldMaintainGroup, ToolMoldMaintainGroupItem, ToolMoldMaintainItem>((a, b, c, d) => new JoinQueryInfos
+                .ToListAsync();
-                //    (
+            //items.ForEach(it => it.status = 0);
-                //       JoinType.Inner, a.item_group_id == b.id,
+            var checkItems = await _db.Queryable<ToolMoldMaintainItemRecord>().Where(it => it.plan_id == input.plan_id && it.mold_id == input.mold_id).Select(it => new
-                //      JoinType.Inner, b.id == c.item_group_id,
+            {
-                //      JoinType.Inner, c.item_id == d.id
+                plan_id = it.plan_id,
-                //    ))
+                item_id = it.item_id,
-                //    .Where(a => a.mold_id == moldId)
+                item_group_id = it.item_group_id,
-                //    .Select((a, b, c, d) => new
+                mold_id = it.mold_id,
-                //    {
+            }).ToListAsync();
-                //        item_group_id = b.id,
+            if (items?.Count > 0 && checkItems?.Count > 0)
-                //        item_group_name = b.name,
+            {
-                //        item_id = d.id,
+                foreach (var item in items)
-                //        item_name = d.name,
+                {
-                //        status = d.status,
+                    foreach (var checkItem in checkItems)
-                //    }).ToListAsync();
+                    {
-                return checkItems;
+                        if (item.plan_id == checkItem.plan_id && item.mold_id == checkItem.mold_id && item.item_group_id == checkItem.item_group_id && item.item_id == checkItem.item_id)
+                        {
+                            item.status = 1;
+                        }
+                    }
+                }
             }
-            return Enumerable.Empty<dynamic>();
+            return items;
         }
 
 
@@ -220,8 +246,18 @@ namespace Tnb.EquipMgr
         public async Task MaintainItemFinish(MoldMaintainRunUpInput input)
         {
             if (input == null) throw new ArgumentNullException("input");
-            if (input.itemIds == null || input.itemIds.Count == 0) throw new ArgumentException($"parameter {nameof(input.itemIds)} not be null or empty");
+            if (input.items == null || input.items.Count == 0) throw new ArgumentException($"parameter {nameof(input.items)} not be null or empty");
-            var row = await _db.Updateable<ToolMoldMaintainItemRecord>().SetColumns(it => new ToolMoldMaintainItemRecord { status = 1 }).Where(it => input.itemIds.Contains(it.id)).ExecuteCommandAsync();
+            List<ToolMoldMaintainItemRecord> records = new();
+            foreach (var item in input.items)
+            {
+                ToolMoldMaintainItemRecord record = new();
+                record.plan_id = input.plan_id;
+                record.mold_id = input.mold_id;
+                record.item_group_id = item.item_group_id;
+                record.item_id = item.item_id;
+                records.Add(record);
+            }
+            var row = await _db.Insertable(records).ExecuteCommandAsync();
             if (row < 1) throw Oops.Oh(ErrorCode.COM1001);
         }
 

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsCarryConst.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Consts
+{
+    public class WmsCarryConst
+    {
+        /// <summary>
+        /// 载具更换EnCode业务编码
+        /// </summary>
+        public const string WMS_CARRY_REPLACE_ENCODE = "WmsCarryReplace";
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/CarryCodeDetailOutput.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto
+{
+    /// <summary>
+    /// 载具条码明细输出类
+    /// </summary>
+    public class CarryCodeDetailOutput
+    {
+        /// <summary>
+        /// 条码编号
+        /// </summary>
+        public string barcode { get; set; }
+        /// <summary>
+        /// 条码批次
+        /// </summary>
+        public string code_batch { get; set; }
+        /// <summary>
+        /// 条码数量
+        /// </summary>
+        public int codeqty { get; set; }
+        /// <summary>
+        /// 物料编号
+        /// </summary>
+        public string material_code { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string material_name { get; set; }
+
+        public string material_id { get; set; }
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ExChangeCarryInput.cs

@@ -15,10 +15,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
         /// <summary>
         /// 老载具ID
         /// </summary>
-        public string old_carry_id { get; set; }
+        public string old_carry_id { get; set; } = string.Empty;
         /// <summary>
         /// 新载具ID
         /// </summary>
-        public string new_carry_id { get; set; }
+        public string new_carry_id { get; set; } = string.Empty;
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/IWmsCarryEntity.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tnb.WarehouseMgr.Interfaces
+namespace Tnb.WarehouseMgr.Entities
 {
-    public class IWmsCarryEntity
+    public interface IWmsCarryEntity
     {
         string carry_id { get; set; }
     }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.cs

@@ -8,7 +8,7 @@ namespace Tnb.WarehouseMgr.Entities;
 /// 载具台账条码表
 /// </summary>
 [SugarTable("wms_carry_code")]
-public partial class WmsCarryCode : BaseEntity<string>
+public partial class WmsCarryCode : BaseEntity<string>, IWmsCarryEntity
 {
     public WmsCarryCode()
     {

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs

@@ -0,0 +1,17 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 载具台账条码表
+/// </summary>
+public partial class WmsCarryCode
+{
+    /// <summary>
+    /// 物料名称
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string material_name { get; set; }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryD.cs

@@ -8,7 +8,7 @@ namespace Tnb.WarehouseMgr.Entities;
 /// 载具台账明细表
 /// </summary>
 [SugarTable("wms_carry_d")]
-public partial class WmsCarryD : BaseEntity<string>
+public partial class WmsCarryD : BaseEntity<string>, IWmsCarryEntity
 {
     public WmsCarryD()
     {

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs

@@ -42,7 +42,7 @@ public partial class WmsCarryH : BaseEntity<string>
     /// <summary>
     /// 载具状态
     /// </summary>
-    public int carry_status { get; set; };
+    public string carry_status { get; set; }
 
     /// <summary>
     /// 载具分类ID
@@ -67,7 +67,7 @@ public partial class WmsCarryH : BaseEntity<string>
     /// <summary>
     /// 出库类型
     /// </summary>
-    public string out_status { get; set; } = string.Empty;
+    public string out_status { get; set; }
 
     /// <summary>
     /// 是否检验

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryMat.cs

@@ -8,7 +8,7 @@ namespace Tnb.WarehouseMgr.Entities;
 /// 载具台账物料明细表
 /// </summary>
 [SugarTable("wms_carry_mat")]
-public partial class WmsCarryMat : BaseEntity<string>
+public partial class WmsCarryMat : BaseEntity<string>, IWmsCarryEntity
 {
     public WmsCarryMat()
     {

WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsFeedingService.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Interfaces
+{
+    /// <summary>
+    /// 投料业务接口
+    /// </summary>
+    public interface IWmsFeedingService
+    {
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWmsRouteMgrService.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Interfaces
+{
+    /// <summary>
+    /// Wms路径管理业务接口
+    /// </summary>
+    public interface IWmsRouteMgrService
+    {
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj

@@ -5,9 +5,11 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" />
     <ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
     <ProjectReference Include="..\Tnb.WarehouseMgr.Interfaces\Tnb.WarehouseMgr.Interfaces.csproj" />
   </ItemGroup>

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs

@@ -1,12 +1,20 @@
-using JNPF.Common.Core.Manager;
+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;
@@ -18,16 +26,22 @@ namespace Tnb.WarehouseMgr
     /// </summary>
     [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
     [Route("api/[area]/[controller]/[action]")]
-
+    [OverideVisualDev(ModuleId)]
-    public class WmsCarryService : IWmsCarryService, IDynamicApiController, ITransient
+    public class WmsCarryService : IOverideVisualDevService, IWmsCarryService, IDynamicApiController, ITransient
     {
+        private const string ModuleId = "26188532491557";
         private readonly ISqlSugarClient _db;
         private readonly IUserManager _userManager;
-        public WmsCarryService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager)
+        private readonly IBillRullService _billRullService;
+        public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
+        public WmsCarryService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
         {
             _db = repository.AsSugarClient();
             _userManager = userManager;
+            _billRullService = billRullService;
+            OverideFuncs.CreateAsync = ExchangeCarry;
         }
+
         /// <summary>
         /// 更换载具
         /// </summary>
@@ -41,64 +55,27 @@ namespace Tnb.WarehouseMgr
         /// <returns></returns>
         /// <exception cref="ArgumentNullException"></exception>
         [HttpPost]
-        public async Task Exchange(ExChangeCarryInput input)
+        public async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input)
         {
-            var row = -1;
+            var isOk = false;
-            if (input == null) throw new ArgumentNullException("input");
+            try
-            var oldCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.old_carry_id && it.is_lock == 0 && it.status == 0 && it.carry_status != 0);
-            var newCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.new_carry_id && it.is_lock == 0 && it.status == 0 && it.carry_status == 0);
-            if (oldCarry != null && newCarry != null)
             {
-                var subCarrys = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == oldCarry.id).ToListAsync();
+                await _db.Ado.BeginTranAsync();
-                if (subCarrys?.Count > 0)
+                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)
                 {
-                    List<WmsCarryD> newSubCarrys = DeepCopyHelper<WmsCarryD>.DeepCopyList(subCarrys);
+                    ExChangeCarryInput carryInput = new() { old_carry_id = oldCarry.id, new_carry_id = newCarry.id };
-                    if (newSubCarrys?.Count > 0)
+                    isOk = await _updateSubCarry<WmsCarryD>(carryInput);
-                    {
+                    isOk = await _updateSubCarry<WmsCarryMat>(carryInput);
-                        newSubCarrys.ForEach(x => x.carry_id = newCarry.id);
+                    isOk = await _updateSubCarry<WmsCarryCode>(carryInput);
-                        row = await _db.Insertable(newSubCarrys).ExecuteCommandAsync();
+
-                    }
-                    if (row > 0)
-                    {
-                        row = await _db.Deleteable(subCarrys).ExecuteCommandAsync();
-                    }
-                }
-                var subCarryMats = await _db.Queryable<WmsCarryMat>().Where(it => it.carry_id == oldCarry.id).ToListAsync();
-                if (subCarryMats?.Count > 0)
-                {
-                    List<WmsCarryMat> newCarryMats = DeepCopyHelper<WmsCarryMat>.DeepCopyList(subCarryMats);
-                    if (newCarryMats?.Count > 0)
-                    {
-                        newCarryMats.ForEach(x => x.carry_id = newCarry.id);
-                        row = await _db.Insertable(newCarryMats).ExecuteCommandAsync();
-                    }
-                    if (row > 0)
-                    {
-                        row = await _db.Deleteable(subCarryMats).ExecuteCommandAsync();
-                    }
-                }
-                var subCarryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == oldCarry.id).ToListAsync();
-                if (subCarryCodes?.Count > 0)
-                {
-                    List<WmsCarryCode> newCarrayCodes = DeepCopyHelper<WmsCarryCode>.DeepCopyList(subCarryCodes);
-                    if (newCarrayCodes?.Count > 0)
-                    {
-                        newCarrayCodes.ForEach(x => x.carry_id = newCarry.id);
-                        row = await _db.Insertable(newCarrayCodes).ExecuteCommandAsync();
-                    }
-                    if (row > 0)
-                    {
-                        row = await _db.Deleteable(subCarryCodes).ExecuteCommandAsync();
-                    }
-                }
-                if (row > 0)
-                {
-                    newCarry.carry_name = oldCarry.carry_name;
                     newCarry.status = oldCarry.status;
                     newCarry.carry_status = oldCarry.carry_status;
-                    newCarry.carrystd_id = oldCarry.carrystd_id;
                     newCarry.location_id = oldCarry.location_id;
-                    newCarry.carry_code = oldCarry.location_code;
+                    newCarry.location_code = oldCarry.location_code;
                     newCarry.is_lock = oldCarry.is_lock;
                     newCarry.out_status = oldCarry.out_status;
                     newCarry.is_check = oldCarry.is_check;
@@ -109,29 +86,91 @@ namespace Tnb.WarehouseMgr
                     newCarry.source_code = oldCarry.source_code;
                     newCarry.create_id = _userManager.UserId;
                     newCarry.create_time = DateTime.Now;
-                    row = await _db.Updateable(newCarry).ExecuteCommandAsync();
+                    var row = await _db.Updateable(newCarry).ExecuteCommandAsync();
+                    WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt<WmsCarryReplaceH>();
+                    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();
             }
-            if (row < 1) throw Oops.Oh(ErrorCode.COM1001);
+            catch (Exception ex)
+            {
+                Log.Error("载具更换失败", ex);
+                await _db.Ado.RollbackTranAsync();
+                throw;
+            }
+            return isOk;
         }
 
-        public Task<int> UpdateNullCarry(WmsCarryH carryObj)
+        public async Task<int> UpdateNullCarry(WmsCarryH carryObj)
         {
-            carryObj.carry_name = null;
+            var row = -1;
-            carryObj.status = 0;
+            try
-            carryObj.carry_status = 0;
+            {
-            carryObj.carrystd_id = null;
+                carryObj.status = 0;
-            carryObj.location_id = null;
+                carryObj.carry_status = "0";
-            carryObj.carry_code = null;
+                carryObj.location_id = null;
-            carryObj.out_status = null;
+                carryObj.location_code = null;
-            carryObj.is_check = 0;
+                carryObj.out_status = "0";
-            carryObj.bale_num = null;
+                carryObj.is_check = 0;
-            carryObj.collocation_scheme_id = null;
+                carryObj.status = 1;
-            carryObj.collocation_scheme_code = null;
+                carryObj.bale_num = null;
-            carryObj.source_id = null;
+                carryObj.collocation_scheme_id = null;
-            carryObj.source_code = null;
+                carryObj.collocation_scheme_code = null;
-            return _db.Updateable(carryObj).ExecuteCommandAsync();
+                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/WmsFeedingService.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Tnb.BasicData.Entities;
+using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Interfaces;
+
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 投料记录
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
+    [Route("api/[area]/[controller]/[action]")]
+
+    public class WmsFeedingService : IWmsFeedingService, IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarClient _db;
+        private static Dictionary<string, object> dicMaterial = new Dictionary<string, object>();
+        public WmsFeedingService(ISqlSugarRepository<WmsFeedingrecordH> repository)
+        {
+            _db = repository.AsSugarClient();
+        }
+        /// <summary>
+        /// 根据载具Id获取载具条码记录
+        /// </summary>
+        /// <param name="carryId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<dynamic> GetCarryCodeList([FromRoute] string carryId)
+        {
+            if (dicMaterial.Count < 1)
+            {
+                dicMaterial = await _db.Queryable<BasMaterial>().ToDictionaryAsync(x => x.id, x => x.name);
+            }
+            var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId)
+                                 .Select(it => new CarryCodeDetailOutput
+                                 {
+                                     barcode = it.barcode,
+                                     code_batch = it.code_batch,
+                                     codeqty = it.codeqty,
+                                     material_code = it.material_code,
+                                     material_id = it.material_id,
+                                 })
+                                 .Mapper(it => it.material_name = dicMaterial.ContainsKey(it.material_id) ? dicMaterial[it.material_id].ToString() : "")
+                                 .ToListAsync();
+            return items;
+        }
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr/WmsRouteMgrService.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Aspose.Cells.Drawing;
+using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Enums;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.FriendlyException;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Interfaces;
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 路径管理业务类
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
+    [Route("api/[area]/[controller]/[action]")]
+    [OverideVisualDev(ModuleId)]
+
+    public class WmsRouteMgrService : IOverideVisualDevService, IWmsRouteMgrService, IDynamicApiController, ITransient
+    {
+        private const string ModuleId = "26100621140773";
+        private readonly ISqlSugarClient _db;
+        private readonly IRunService _runService;
+        private readonly IVisualDevService _visualDevService;
+        public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
+
+        public WmsRouteMgrService(ISqlSugarRepository<WmsRoad> repository, IRunService runService, IVisualDevService visualDevService)
+        {
+            _db = repository.AsSugarClient();
+            _runService = runService;
+            _visualDevService = visualDevService;
+            OverideFuncs.CreateAsync = Create;
+        }
+
+        private async Task<dynamic> Create(VisualDevModelDataCrInput input)
+        {
+            if (input.data.ContainsKey(nameof(WmsRoad.startpoint_id)) && input.data.ContainsKey(nameof(WmsRoad.endpoint_id)))
+            {
+                var startPointId = input.data[nameof(WmsRoad.startpoint_id)].ToString();
+                var endPointId = input.data[nameof(WmsRoad.endpoint_id)].ToString();
+                if (string.Equals(startPointId, endPointId, StringComparison.OrdinalIgnoreCase))
+                {
+                    throw new AppFriendlyException("起始点位不能等于终止点位", 500);
+                }
+            }
+            VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
+            await _runService.Create(templateEntity, input);
+            return await Task.FromResult(true);
+        }
+    }
+}

system/Tnb.Systems/System/BillRuleService.cs

@@ -311,7 +311,7 @@ public class BillRuleService : IBillRullService, IDynamicApiController, ITransie
         if (entity != null)
         {
             // 处理隔天流水号归0
-            if (entity.OutputNumber != null)
+        if (entity.OutputNumber != null)
             {
                 var serialDate = entity.OutputNumber.Remove(entity.OutputNumber.Length - (int)entity.Digit).Replace(entity.Prefix, string.Empty);
                 var thisDate = entity.DateFormat == "no" ? string.Empty : DateTime.Now.ToString(entity.DateFormat);