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

ProductionMgr/Tnb.ProductionMgr.Entities/Consts/DictionaryConstants.cs

@@ -19,6 +19,16 @@ namespace Tnb.ProductionMgr.Entities.Consts
         /// 待排产
         /// </summary>
         public const string WaitProductId = "25019244276501";
+        
+        /// <summary>
+        /// 物料签收编码
+        /// </summary>
+        public const string MATERIAL_RECEIPT_CODE = "MaterialReceipt";
+        
+        /// <summary>
+        /// 生产投料编码
+        /// </summary>
+        public const string FEEDING_CODE = "Feeding";
     }
 
     

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdFeedingD.cs

@@ -0,0 +1,57 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.ProductionMgr.Entities;
+
+/// <summary>
+/// 生产投料子表
+/// </summary>
+[SugarTable("prd_feeding_d")]
+public partial class PrdFeedingD : BaseEntity<string>
+{
+    public PrdFeedingD()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 生产投料id
+    /// </summary>
+    public string feeding_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 物料id
+    /// </summary>
+    public string material_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    public decimal num { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    public string? batch { get; set; }
+
+    /// <summary>
+    /// 单位id
+    /// </summary>
+    public string? unit_id { get; set; }
+
+    /// <summary>
+    /// 载具id
+    /// </summary>
+    public string carry_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 物料签收单id
+    /// </summary>
+    public string? material_receipt_id { get; set; }
+
+    /// <summary>
+    /// 物料签收单子表id
+    /// </summary>
+    public string? material_receipt_detail_id { get; set; }
+
+}

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdFeedingH.cs

@@ -0,0 +1,102 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.ProductionMgr.Entities;
+
+/// <summary>
+/// 生产投料主表
+/// </summary>
+[SugarTable("prd_feeding_h")]
+public partial class PrdFeedingH : BaseEntity<string>
+{
+    public PrdFeedingH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 工位id
+    /// </summary>
+    public string station_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 任务单id
+    /// </summary>
+    public string? mo_task_id { get; set; }
+
+    /// <summary>
+    /// 工序id
+    /// </summary>
+    public string? process_id { get; set; }
+
+    /// <summary>
+    /// 设备id
+    /// </summary>
+    public string? equip_id { get; set; }
+
+    /// <summary>
+    /// 车间id
+    /// </summary>
+    public string? workshop_id { get; set; }
+
+    /// <summary>
+    /// 载具id
+    /// </summary>
+    public string? carry_id { get; set; }
+
+    /// <summary>
+    /// 产线id
+    /// </summary>
+    public string? workline_id { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 二维码信息
+    /// </summary>
+    public string? carry_code { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+    /// <summary>
+    /// 生产bom工序id
+    /// </summary>
+    public string? mbom_process_id { get; set; }
+
+    /// <summary>
+    /// 投料单号
+    /// </summary>
+    public string code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 物料签收单id
+    /// </summary>
+    public string? material_receipt_id { get; set; }
+
+}

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMaterialReceiptD.cs

@@ -39,4 +39,19 @@ public partial class PrdMaterialReceiptD : BaseEntity<string>
     /// </summary>
     public string? unit_id { get; set; }
 
+    /// <summary>
+    /// 载具id
+    /// </summary>
+    public string carry_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 是否全部投料
+    /// </summary>
+    public int is_all_feeding { get; set; }
+
+    /// <summary>
+    /// 已投料数量
+    /// </summary>
+    public decimal feeding_num { get; set; }
+
 }

ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdFeedingService.cs

@@ -0,0 +1,18 @@
+using Tnb.ProductionMgr.Entities.Dto;
+
+namespace Tnb.ProductionMgr.Interfaces
+{
+    /// <summary>
+    /// 物料签收服务接口
+    /// </summary>
+    public interface IPrdFeedingService
+    {
+
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public Task<dynamic> SaveData(MaterialReceiptInput input);
+    }
+}

ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMaterialReceiptService.cs

@@ -14,6 +14,11 @@ namespace Tnb.ProductionMgr.Interfaces
         /// <returns></returns>
         public Task<dynamic> GetInfoByQrCode(string qrCode);
 
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         public Task<dynamic> SaveData(MaterialReceiptInput input);
     }
 }

ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs

@@ -0,0 +1,138 @@
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Enums;
+using JNPF.Common.Security;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.FriendlyException;
+using JNPF.Systems.Interfaces.System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.ClearScript.Util.Web;
+using SqlSugar;
+using Tnb.BasicData.Entities;
+using Tnb.ProductionMgr.Entities;
+using Tnb.ProductionMgr.Entities.Dto;
+using Tnb.ProductionMgr.Interfaces;
+using Tnb.ProductionMgr.Entities.Consts;
+
+namespace Tnb.ProductionMgr
+{
+    /// <summary>
+    /// 业务实现:物料签收
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 700)]
+    [Route("api/[area]/[controller]/[action]")]
+    public class PrdFeedingService : IPrdFeedingService, IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarRepository<PrdFeedingH> _repository;
+        private readonly IUserManager _userManager;
+        private readonly IBillRullService _billRullService;
+
+
+        public PrdFeedingService(
+            ISqlSugarRepository<PrdFeedingH> repository,
+            IBillRullService billRullService,
+            IUserManager userManager
+        )
+        {
+            _repository = repository;
+            _userManager = userManager;
+            _billRullService = billRullService;
+        }
+
+        
+        [HttpPost]
+        public async Task<dynamic> SaveData(MaterialReceiptInput input)
+        {
+            var db = _repository.AsSugarClient();
+            DbResult<bool> result = await db.Ado.UseTranAsync(async () =>
+            {
+                var moTask = await db.Queryable<PrdMoTask>().FirstAsync(x => x.id == input.mo_task_id);
+                var inputMaterials = await db.Queryable<BasMbomInput>()
+                    .Where(x => x.mbom_id == moTask.bom_id && x.mbom_process_id == input.mbom_process_id)
+                    .Select(x=>x.material_id)
+                    .ToListAsync();
+
+                string code = await _billRullService.GetBillNumber(MoStatus.FEEDING_CODE);
+                PrdFeedingH prdFeedingH = new PrdFeedingH()
+                {
+                    code = code,
+                    station_id = input.station_id,
+                    mo_task_id = input.mo_task_id,
+                    process_id = input.process_id,
+                    equip_id = input.equip_id,
+                    workshop_id = input.workshop_id,
+                    carry_id = input.carry_id,
+                    workline_id = input.workline_id,
+                    carry_code = input.carry_code,
+                    remark = input.remark,
+                    mbom_process_id = input.mbom_process_id,
+                    create_id = _userManager.UserId,
+                    create_time = DateTime.Now,
+                    org_id = _userManager.GetUserInfo().Result.organizeId
+                };
+
+                List<PrdFeedingD> list = new List<PrdFeedingD>();
+                if (input.details != null && input.details.Count > 0)
+                {
+                    foreach (var item in input.details)
+                    {
+                        if(!inputMaterials.Contains(item["material_id"]))
+                            throw new Exception("该物料不是生产bom投入物料，不能签收");
+
+                        var detail = await db.Queryable<PrdMaterialReceiptD>()
+                            .Where(x => x.carry_id == input.carry_id && x.is_all_feeding == 0).FirstAsync();
+                        decimal num = Convert.ToDecimal(item["num"]);
+                        list.Add(new PrdFeedingD
+                        {
+                            feeding_id = prdFeedingH.id,
+                            material_receipt_detail_id = detail?.id,
+                            material_id = item["material_id"],
+                            num = num,
+                            batch = item["batch"],
+                            unit_id = item["unit_id"],
+                            carry_id = input.carry_id,
+                        });
+
+                        if (detail != null)
+                        {
+                            if(detail.feeding_num + num > detail.num)
+                            {
+                                throw new Exception("投料数量不能大于签收数量");
+                            }else if (detail.feeding_num + num == detail.num)
+                            {
+                                await db.Updateable<PrdMaterialReceiptD>()
+                                    .SetColumns(x => x.feeding_num == x.feeding_num + num)
+                                    .SetColumns(x => x.is_all_feeding == 1)
+                                    .Where(x => x.id == detail.id)
+                                    .ExecuteCommandAsync();
+                            }
+                            else
+                            {
+                                await db.Updateable<PrdMaterialReceiptD>()
+                                    .SetColumns(x => x.feeding_num == x.feeding_num + num)
+                                    .Where(x => x.id == detail.id)
+                                    .ExecuteCommandAsync();
+                            }
+                        }
+                        else
+                        {
+                            throw new Exception("没有签收单，无法投料");
+                        }
+                    }
+                }
+                else
+                {
+                    throw new Exception("没有签收物料");
+                }
+
+                
+                await db.Insertable<PrdFeedingH>(prdFeedingH).ExecuteCommandAsync();
+                await db.Insertable<PrdFeedingD>(list).ExecuteCommandAsync();
+
+            });
+            
+            if(!result.IsSuccess) throw Oops.Oh(result.ErrorMessage);
+            return result.IsSuccess ? "签收成功" : result.ErrorMessage;
+        }
+    }
+}

ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs

@@ -6,16 +6,14 @@ using JNPF.DynamicApiController;
 using JNPF.FriendlyException;
 using JNPF.Systems.Interfaces.System;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.ClearScript.Util.Web;
 using SqlSugar;
 using Tnb.BasicData.Entities;
 using Tnb.ProductionMgr.Entities;
 using Tnb.ProductionMgr.Entities.Dto;
-using Tnb.ProductionMgr.Entities.Dto.PrdManage;
 using Tnb.ProductionMgr.Interfaces;
 using Tnb.WarehouseMgr.Entities;
 using Tnb.WarehouseMgr.Entities.Dto;
-using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.ProductionMgr.Entities.Consts;
 
 namespace Tnb.ProductionMgr
 {
@@ -26,13 +24,13 @@ namespace Tnb.ProductionMgr
     [Route("api/[area]/[controller]/[action]")]
     public class PrdMaterialReceiptService : IPrdMaterialReceiptService, IDynamicApiController, ITransient
     {
-        private readonly ISqlSugarRepository<PrdMo> _repository;
+        private readonly ISqlSugarRepository<PrdMaterialReceiptH> _repository;
         private readonly IUserManager _userManager;
         private readonly IBillRullService _billRullService;
 
 
         public PrdMaterialReceiptService(
-            ISqlSugarRepository<PrdMo> repository,
+            ISqlSugarRepository<PrdMaterialReceiptH> repository,
             IBillRullService billRullService,
             IUserManager userManager
         )
@@ -81,7 +79,7 @@ namespace Tnb.ProductionMgr
                     .Select(x=>x.material_id)
                     .ToListAsync();
 
-                string code = await _billRullService.GetBillNumber(WmsCarryConst.MATERIAL_RECEIPT_CODE);
+                string code = await _billRullService.GetBillNumber(MoStatus.MATERIAL_RECEIPT_CODE);
                 PrdMaterialReceiptH prdMaterialReceiptH = new PrdMaterialReceiptH()
                 {
                     code = code,
@@ -115,6 +113,9 @@ namespace Tnb.ProductionMgr
                             num = Convert.ToDecimal(item["num"]),
                             batch = item["batch"],
                             unit_id = item["unit_id"],
+                            carry_id = input.carry_id,
+                            is_all_feeding = 0,
+                            feeding_num = 0,
                         });
                     }
                 }

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

@@ -13,11 +13,6 @@ namespace Tnb.WarehouseMgr.Entities.Consts
         /// </summary>
         public const string WMS_CARRY_REPLACE_ENCODE = "WmsCarryReplace";
         
-        /// <summary>
-        /// 物料签收编码
-        /// </summary>
-        public const string MATERIAL_RECEIPT_CODE = "MaterialReceipt";
-        	
         
     }
 }

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs

@@ -35,23 +35,17 @@ namespace Tnb.WarehouseMgr
         private readonly ISqlSugarClient _db;
         private readonly IRunService _runService;
         private readonly IVisualDevService _visualDevService;
-        private readonly IWareHouseService _wareHouseService;
-        private readonly IBillRullService _billRullService;
         private readonly IUserManager _userManager;
         public WmsCarryBindService(
             ISqlSugarRepository<WmsCarryH> repository,
             IRunService runService,
             IVisualDevService visualDevService,
-            IWareHouseService wareHouseService,
+            IUserManager userManager)
-            IUserManager userManager,
-            IBillRullService billRullService)
         {
             _db = repository.AsSugarClient();
             _runService = runService;
             _visualDevService = visualDevService;
-            _wareHouseService = wareHouseService;
             _userManager = userManager;
-            _billRullService = billRullService;
             OverideFuncs.CreateAsync = CarryBind;
         }
 
@@ -90,21 +84,33 @@ namespace Tnb.WarehouseMgr
                     if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
 
                 }
-             /*   //更新主载具明细表，增加新的数据
+                else
-                var row = await _db.Insertable<WmsCarryD>(new WmsCarryD  {
+                {
-                    id = SnowflakeIdHelper.NextId(),
+                    if (carry == null)
-                    org_id = carry.org_id,
+                    {
-                    carry_id = carry.id,
+                        throw new AppFriendlyException("没有可用的主载具", 500);
-                    membercarry_id = subCarry.id,
+                    }
-                    membercarry_code = subCarry.carry_code,
+                    if (subCarry == null)
-                    loc = input.data[nameof(WmsCarrybindH.loc)].ToString(),
+                    {
-                    create_id = _userManager.UserId,
+                        throw new AppFriendlyException("没有可用的子载具", 500);
-                    create_time = DateTime.Now
+                    }
-                })
+
-                    .ExecuteCommandAsync();
+                }
-                if (row <= 0) throw Oops.Oh(ErrorCode.COM1000);
+                /*   //更新主载具明细表，增加新的数据
-                _db.Updateable<WmsCarryH>().SetColumns(it=>it.carry_status == "1").Where(it=>it.id == input.data[nameof(WmsCarrybindH.carry_id)].ToString());*/
+                   var row = await _db.Insertable<WmsCarryD>(new WmsCarryD  {
-            await _db.Ado.CommitTranAsync();
+                       id = SnowflakeIdHelper.NextId(),
+                       org_id = carry.org_id,
+                       carry_id = carry.id,
+                       membercarry_id = subCarry.id,
+                       membercarry_code = subCarry.carry_code,
+                       loc = input.data[nameof(WmsCarrybindH.loc)].ToString(),
+                       create_id = _userManager.UserId,
+                       create_time = DateTime.Now
+                   })
+                       .ExecuteCommandAsync();
+                   if (row <= 0) throw Oops.Oh(ErrorCode.COM1000);
+                   _db.Updateable<WmsCarryH>().SetColumns(it=>it.carry_status == "1").Where(it=>it.id == input.data[nameof(WmsCarrybindH.carry_id)].ToString());*/
+                await _db.Ado.CommitTranAsync();
             }
             catch (Exception ex)
             {

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs

@@ -124,7 +124,12 @@ namespace Tnb.WarehouseMgr
                             preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
                             preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
                             preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, null, null);
+                            //根据载具移出Id，回更单据状态
+                            await _db.Updateable<WmsMoveOutstock>().SetColumns(it => new WmsMoveOutstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
+
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
+                                it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode },
+                                it => new BasLocation { is_lock = 1 });
 
                         }
                     }

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs

@@ -35,23 +35,18 @@ namespace Tnb.WarehouseMgr
         private readonly ISqlSugarClient _db;
         private readonly IRunService _runService;
         private readonly IVisualDevService _visualDevService;
-        private readonly IWareHouseService _wareHouseService;
-        private readonly IBillRullService _billRullService;
         private readonly IUserManager _userManager;
         public WmsCarryUnbindService(
             ISqlSugarRepository<WmsCarryH> repository,
             IRunService runService,
             IVisualDevService visualDevService,
-            IWareHouseService wareHouseService,
+
-            IUserManager userManager,
+            IUserManager userManager)
-            IBillRullService billRullService)
         {
             _db = repository.AsSugarClient();
             _runService = runService;
             _visualDevService = visualDevService;
-            _wareHouseService = wareHouseService;
             _userManager = userManager;
-            _billRullService = billRullService;
             OverideFuncs.CreateAsync = CarryUnbind;
         }
 
@@ -80,7 +75,17 @@ namespace Tnb.WarehouseMgr
                     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();

WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs

@@ -57,7 +57,7 @@ namespace Tnb.WarehouseMgr
             _runService = runService;
             _visualDevService = visualDevService;
             _basLocationService = basLocationService;
-            //OverideFuncs.CreateAsync = Create;
+            OverideFuncs.CreateAsync = Create;
         }
         /// <summary>
         /// 根据载具编号获取起始库位点
@@ -152,16 +152,20 @@ namespace Tnb.WarehouseMgr
                         var isOk = await _wareHouseService.GenPreTask(preTasks,null);
                         if (isOk)
                         {
-                            //不需要插入操作表
+                            if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)) && input.data.ContainsKey(nameof(WmsDelivery.endlocation_id)) && input.data[nameof(WmsDelivery.endlocation_id)] != null && input.data[nameof(WmsDelivery.endlocation_id)] != null)
-                            /*  var preTaskUpInput = new GenPreTaskUpInput();
+                            {
-                              preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+                                //查询库位表
-                              preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
+                                var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsDelivery.startlocation_id)].ToString());
-                              preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
+                                {
-                              preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
+                                //载具加锁，增加库位信息
-                              preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
+                                await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { carry_status = ((int)EnumCarryStatus.占用).ToString(),
-                              preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
+                                    is_lock = 1, location_id = input.data[nameof(WmsDelivery.startlocation_id)].ToString(), location_code = location.location_code}).Where(it => it.id == input.data[nameof(WmsDelivery.carry_id)].ToString()).ExecuteCommandAsync();
-                              preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
+                                }
-                              await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);*/
+                            
+                                //所有库位加锁
+                                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();
+                            }
                         }
                     }
 

WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs

@@ -142,7 +142,9 @@ namespace Tnb.WarehouseMgr
                             //根据空载具入库Id，回更单据状态
                             await _db.Updateable<WmsEmptyInstock>().SetColumns(it => new WmsEmptyInstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
 
-                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,null,null);
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
+                                it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode },
+                                it => new BasLocation { is_lock = 1 });
                         }
                     }
 

WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs

@@ -21,6 +21,7 @@ using Tnb.WarehouseMgr.Entities;
 using Tnb.WarehouseMgr.Entities.Attributes;
 using Tnb.WarehouseMgr.Entities.Consts;
 using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Entities.Enums;
 using Tnb.WarehouseMgr.Interfaces;
 
 namespace Tnb.WarehouseMgr
@@ -77,7 +78,7 @@ namespace Tnb.WarehouseMgr
                 var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);*/
 
                 //出库取起点，获取所有符合输入的载具规格的载具
-                var setQty = await _db.Queryable<WmsEmptyOutstockH>().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)]);
+                var setQty = await _db.Queryable<WmsEmptyOutstockH>().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)].ToString());
                 var carrys = await _db.Queryable<WmsCarryH>().LeftJoin<BasLocation>((a, b) => a.location_id == b.id)
                         .Select((a,b) => new
                         {
@@ -141,15 +142,13 @@ namespace Tnb.WarehouseMgr
                             var isOk = await _wareHouseService.GenPreTask(preTasks,null);
                             if (isOk)
                             {
-                                var preTaskUpInput = new GenPreTaskUpInput();
+                                //所有载具加锁
-                                preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
+                                var ids = carrys.Select(x => x.carry_id).ToList();
-                                preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
+                                await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_lock = 1 }).Where(it => ids.Contains(it.id)).ExecuteCommandAsync();
-                                preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
+                                //所有库位加锁
-                                preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
+                                var loc = carrys.Select(x => x.location_id).ToList();
-                                preTaskUpInput.LocationIds = points.Select(x => x.id).ToList();
+                                await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_lock = 1 }).Where(it => loc.Contains(it.id)).ExecuteCommandAsync();
-                                preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
+
-                                preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                                await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,null,null);
                             }
                         }
                     }

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs

@@ -127,7 +127,12 @@ namespace Tnb.WarehouseMgr
                             preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
                             preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
                             preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, null, null);
+                            //根据载具移入Id，回更单据状态
+                            await _db.Updateable<WmsMoveInstock>().SetColumns(it => new WmsMoveInstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
+
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
+                                it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode },
+                                it => new BasLocation { is_lock = 1 });
 
                         }
                     }

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs

@@ -122,9 +122,15 @@ namespace Tnb.WarehouseMgr
                             preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
                             preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
                             preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
+
                             preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
                             preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,null,null);
+                            //根据载具移出Id，回更单据状态
+                            await _db.Updateable<WmsMoveOutstock>().SetColumns(it => new WmsMoveOutstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
+
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
+                                it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode },
+                                it => new BasLocation { is_lock = 1 });
                         }
                     }
 

WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs

@@ -56,7 +56,7 @@ namespace Tnb.WarehouseMgr
             _runService = runService;
             _visualDevService = visualDevService;
             _basLocationService = basLocationService;
-            //OverideFuncs.CreateAsync = Create;
+            OverideFuncs.CreateAsync = Create;
         }
         /// <summary>
         /// 根据载具编号获取起始库位点
@@ -151,16 +151,25 @@ namespace Tnb.WarehouseMgr
                         var isOk = await _wareHouseService.GenPreTask(preTasks,null);
                         if (isOk)
                         {
-                            //不需要插入操作表
+                            f(input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)) && input.data.ContainsKey(nameof(WmsDelivery.endlocation_id)) && input.data[nameof(WmsDelivery.endlocation_id)] != null && input.data[nameof(WmsDelivery.endlocation_id)] != null)
-                            /*  var preTaskUpInput = new GenPreTaskUpInput();
+                            {
-                              preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+                                //查询库位表
-                              preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
+                                var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsDelivery.startlocation_id)].ToString());
-                              preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
+                                {
-                              preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
+                                    //载具加锁，增加库位信息
-                              preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
+                                    await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH
-                              preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
+                                    {
-                              preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
+                                        carry_status = ((int)EnumCarryStatus.占用).ToString(),
-                              await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);*/
+                                        is_lock = 1,
+                                        location_id = input.data[nameof(WmsDelivery.startlocation_id)].ToString(),
+                                        location_code = location.location_code
+                                    }).Where(it => it.id == input.data[nameof(WmsDelivery.carry_id)].ToString()).ExecuteCommandAsync();
+                                }
+
+                                //所有库位加锁
+                                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();
+                            }
                         }
                     }
 

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs

@@ -140,8 +140,9 @@ namespace Tnb.WarehouseMgr
                             preTaskUpInput.PreTaskRecord = handleH;
                             //根据空载具入库Id，回更单据状态
                             await _db.Updateable<WmsEmptyInstock>().SetColumns(it => new WmsEmptyInstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
-
+                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
-                            await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,null,null);
+                                it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode },
+                                it => new BasLocation { is_lock = 1 });
                         }
                     }
 

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs

@@ -141,15 +141,13 @@ namespace Tnb.WarehouseMgr
                             var isOk = await _wareHouseService.GenPreTask(preTasks,null);
                             if (isOk)
                             {
-                                var preTaskUpInput = new GenPreTaskUpInput();
+                                //所有载具加锁
-                                preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
+                                var ids = carrys.Select(x => x.carry_id).ToList();
-                                preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
+                                await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_lock = 1 }).Where(it => ids.Contains(it.id)).ExecuteCommandAsync();
-                                preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
+                                //所有库位加锁
-                                preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
+                                var loc = carrys.Select(x => x.location_id).ToList();
-                                preTaskUpInput.LocationIds = points.Select(x => x.id).ToList();
+                                await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_lock = 1 }).Where(it => loc.Contains(it.id)).ExecuteCommandAsync();
-                                preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
+
-                                preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
-                                 await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, null, null);
 
                             }
                         }

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAExceptionCompleteService.cs

@@ -53,10 +53,10 @@ namespace Tnb.WarehouseMgr
             _wareHouseService = wareHouseService;
             _userManager = userManager;
             _billRullService = billRullService;
-            OverideFuncs.CreateAsync = ExceptionCancel;
+            OverideFuncs.CreateAsync = ExceptionComplete;
         }
 
-        private async Task<dynamic> ExceptionCancel(VisualDevModelDataCrInput input)
+        private async Task<dynamic> ExceptionComplete(VisualDevModelDataCrInput input)
         {
 
             try

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAExceptionReexcuteService.cs

@@ -52,10 +52,10 @@ namespace Tnb.WarehouseMgr
             _wareHouseService = wareHouseService;
             _userManager = userManager;
             _billRullService = billRullService;
-            OverideFuncs.CreateAsync = ExceptionCancel;
+            OverideFuncs.CreateAsync = ExceptionReexcute;
         }
 
-        private async Task<dynamic> ExceptionCancel(VisualDevModelDataCrInput input)
+        private async Task<dynamic> ExceptionReexcute(VisualDevModelDataCrInput input)
         {
 
             try

WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs

@@ -22,6 +22,7 @@ using Tnb.WarehouseMgr.Entities;
 using Tnb.WarehouseMgr.Entities.Attributes;
 using Tnb.WarehouseMgr.Entities.Consts;
 using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Entities.Enums;
 using Tnb.WarehouseMgr.Interfaces;
 namespace Tnb.WarehouseMgr
 {
@@ -115,16 +116,22 @@ namespace Tnb.WarehouseMgr
                         var isOk = await _wareHouseService.GenPreTask(preTasks, null);
                         if (isOk)
                         {
-                            //不需要插入操作表
+                            //查询库位表
-                            /*  var preTaskUpInput = new GenPreTaskUpInput();
+                            var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsTransfer.startlocation_id)].ToString());
-                              preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+                            {
-                              preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
+                                //载具加锁，增加库位信息
-                              preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
+                                await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH
-                              preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
+                                {
-                              preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
+                                    carry_status = ((int)EnumCarryStatus.占用).ToString(),
-                              preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
+                                    is_lock = 1,
-                              preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
+                                    location_id = input.data[nameof(WmsTransfer.startlocation_id)].ToString(),
-                              await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);*/
+                                    location_code = location.location_code
+                                }).Where(it => it.id == input.data[nameof(WmsTransfer.carry_id)].ToString()).ExecuteCommandAsync();
+                            }
+
+                            //所有库位加锁
+                            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();
                         }
                     }
 

WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs

@@ -22,6 +22,7 @@ using Tnb.WarehouseMgr.Entities;
 using Tnb.WarehouseMgr.Entities.Attributes;
 using Tnb.WarehouseMgr.Entities.Consts;
 using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Entities.Enums;
 using Tnb.WarehouseMgr.Interfaces;
 namespace Tnb.WarehouseMgr
 {
@@ -115,16 +116,22 @@ namespace Tnb.WarehouseMgr
                         var isOk = await _wareHouseService.GenPreTask(preTasks,null);
                         if (isOk)
                         {
-                        //不需要插入操作表
+                            //查询库位表
-                          /*  var preTaskUpInput = new GenPreTaskUpInput();
+                            var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsTransfer.startlocation_id)].ToString());
-                            preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+                            {
-                            preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
+                                //载具加锁，增加库位信息
-                            preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
+                                await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH
-                            preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
+                                {
-                            preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
+                                    carry_status = ((int)EnumCarryStatus.占用).ToString(),
-                            preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
+                                    is_lock = 1,
-                            preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
+                                    location_id = input.data[nameof(WmsTransfer.startlocation_id)].ToString(),
-                            await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);*/
+                                    location_code = location.location_code
+                                }).Where(it => it.id == input.data[nameof(WmsTransfer.carry_id)].ToString()).ExecuteCommandAsync();
+                            }
+
+                            //所有库位加锁
+                            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();
                         }
                     }