diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
index a795f03d..57c90ee2 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
@@ -143,11 +143,13 @@ namespace Tnb.WarehouseMgr.Entities.Consts
/// 预任务生成业务类型-配送申请
///
public const string BIZTYPE_WMSDELIVERY_ID = "26585291847957";
+
///
/// 条码打印状态-已完成
///
public const string BARCODE_PRINT_STATUS_COMPLETE_ID = "26191372853541";
+
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
index 83562d57..cde42858 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
@@ -20,6 +20,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto
///
public string CarryId { get; set; }
///
+ /// 载具id集合
+ ///
+ public List CarryIds { get; set; }
+ ///
/// 载具Code
///
public string CarryCode { get; set; }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 8bb2354d..eaebd2ea 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -252,7 +252,7 @@ namespace Tnb.WarehouseMgr
if (i == 0 || i == items.Count - 1) continue;
items[i].chain_type = "2";
}
- items[items.Count - 1].chain_type = "3";
+ items[^1].chain_type = "3";
}
});
@@ -521,7 +521,14 @@ namespace Tnb.WarehouseMgr
//根据载具ID，更新是否锁定和赋值起始库位
if (setCarryColumnsExp != null)
{
- await _db.Updateable().SetColumns(setCarryColumnsExp).Where(it => it.id == input.CarryId).ExecuteCommandAsync();
+ if (input.CarryIds?.Count > 0)
+ {
+ await _db.Updateable().SetColumns(setCarryColumnsExp).Where(it => input.CarryIds.Contains(it.id)).ExecuteCommandAsync();
+ }
+ else
+ {
+ await _db.Updateable().SetColumns(setCarryColumnsExp).Where(it => it.id == input.CarryId).ExecuteCommandAsync();
+ }
}
//根据所有库位更新库位的锁定状态为“锁定”
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
index cb1e2121..63717129 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
@@ -3,6 +3,7 @@ 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.Extension;
using JNPF.Common.Security;
@@ -14,8 +15,10 @@ using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
+using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Enums;
using Tnb.WarehouseMgr.Interfaces;
@@ -32,97 +35,177 @@ namespace Tnb.WarehouseMgr
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly IWareHouseService _wareHouseService;
+ private readonly IUserManager _userManager;
+ private readonly IBillRullService _billRullService;
public WmsOutStockService(
ISqlSugarRepository repository,
IDictionaryDataService dictionaryDataService,
IRunService runService,
IVisualDevService visualDevService,
- IWareHouseService wareHouseService)
+ IWareHouseService wareHouseService,
+ IUserManager userManager,
+ IBillRullService billRullService)
{
_db = repository.AsSugarClient();
_dictionaryDataService = dictionaryDataService;
_runService = runService;
_visualDevService = visualDevService;
_wareHouseService = wareHouseService;
+ _userManager = userManager;
+ _billRullService = billRullService;
OverideFuncs.CreateAsync = OutStockApplyFor;
}
private async Task OutStockApplyFor(VisualDevModelDataCrInput input)
{
- VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSOUTSTOCK_ID, true);
- await _runService.Create(templateEntity, input);
-
- //tablefield120 出库物料明细
- if (input.data.ContainsKey("tablefield120") && input.data["tablefield120"].IsNotEmptyOrNull())
+ try
{
- var outStockDList = input.data["tablefield120"].ToObject>();
- if (outStockDList?.Count > 0)
- {
- List carryMats = new();
- List carryCodes = new();
- foreach (var os in outStockDList)
- {
- var carryCodesPart = await _db.Queryable().InnerJoin((a, b) => a.id == b.carry_id)
- .Where((a, b) => b.material_id == os.material_id && b.code_batch == os.code_batch && a.is_lock == 0 &&
- !string.IsNullOrEmpty(a.location_id) && a.status == (int)EnumCarryStatus.占用)
- .Select()
- .ToListAsync();
- if (carryCodesPart?.Count > 0)
- {
- carryCodes.AddRange(carryCodesPart);
- var codeQty = carryCodes.Sum(x => x.codeqty);
- if (codeQty < os.pr_qty)
- {
- throw new AppFriendlyException($"需要出库[{os.pr_qty}],实际库存{codeQty},数量不足", 500);
- }
- var partCarryMats = carryCodesPart.Adapt>();
- partCarryMats.ForEach(x =>
- {
- x.need_qty = (int)os.pr_qty;
- x.real_qty = codeQty;
- });
- carryMats.AddRange(partCarryMats);
- }
- }
- if (carryMats.Count > 0)
- {
- carryMats.ForEach(x => x.id = SnowflakeIdHelper.NextId());
- carryMats = carryMats.OrderBy(o => o.create_time).GroupBy(g => new { g.carry_id, g.material_id, g.code_batch })
- .Select(x =>
- {
- WmsCarryMat? carryMat = x.FirstOrDefault()!;
- carryMat.real_qty = x.Sum(d => d.real_qty);
- return carryMat;
- })
- .ToList();
- await _db.Insertable(carryMats).ExecuteCommandAsync();
- var dic = carryMats.ToDictionary(x => x.id, x => x.real_qty);
- var allOutIds = new List();
- var sortingOutIds = new List();
- foreach (var pair in dic)
- {
- var codes = carryCodes.FindAll(x => x.carry_id == pair.Key);
- if (codes?.Count > 0)
- {
- if (pair.Value == codes.Sum(d => d.codeqty))
- {
- allOutIds.Add(pair.Key);
- }
- else
- {
- sortingOutIds.Add(pair.Key);
- }
- }
- }
- await _db.Updateable().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.全部出).ToString() }).Where(it => allOutIds.Contains(it.id)).ExecuteCommandAsync();
- await _db.Updateable().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.分拣出).ToString() }).Where(it => sortingOutIds.Contains(it.id)).ExecuteCommandAsync();
- }
- }
- }
+ await _db.Ado.BeginTranAsync();
- return Task.FromResult(0);
+ VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSOUTSTOCK_ID, true);
+ await _runService.Create(templateEntity, input);
+
+
+ var carryIds = new List();
+ //tablefield120 出库物料明细
+ if (input.data.ContainsKey("tablefield120") && input.data["tablefield120"].IsNotEmptyOrNull())
+ {
+ var outStockDList = input.data["tablefield120"].ToObject>();
+ if (outStockDList?.Count > 0)
+ {
+ List carryMats = new();
+ List carryCodes = new();
+ foreach (var os in outStockDList)
+ {
+ var carryCodesPart = await _db.Queryable().InnerJoin((a, b) => a.id == b.carry_id)
+ .Where((a, b) => b.material_id == os.material_id && b.code_batch == os.code_batch && a.is_lock == 0 && !string.IsNullOrEmpty(a.location_id) && a.status == (int)EnumCarryStatus.占用)
+ .Select()
+ .ToListAsync();
+ if (carryCodesPart?.Count > 0)
+ {
+ carryCodes.AddRange(carryCodesPart);
+ var codeQty = carryCodes.Sum(x => x.codeqty);
+ if (codeQty < os.pr_qty)
+ {
+ throw new AppFriendlyException($"需要出库[{os.pr_qty}],实际库存{codeQty},数量不足", 500);
+ }
+ var partCarryMats = carryCodesPart.Adapt>();
+ partCarryMats.ForEach(x =>
+ {
+ x.need_qty = (int)os.pr_qty;
+ x.real_qty = codeQty;
+ });
+ carryMats.AddRange(partCarryMats);
+ }
+ }
+ if (carryMats.Count > 0)
+ {
+ carryMats.ForEach(x => x.id = SnowflakeIdHelper.NextId());
+ carryMats = carryMats.OrderBy(o => o.create_time).GroupBy(g => new { g.carry_id, g.material_id, g.code_batch })
+ .Select(x =>
+ {
+ WmsCarryMat? carryMat = x.FirstOrDefault()!;
+ carryMat.real_qty = x.Sum(d => d.real_qty);
+ return carryMat;
+ })
+ .ToList();
+ await _db.Insertable(carryMats).ExecuteCommandAsync();
+ var dic = carryMats.DistinctBy(x => x.carry_id).ToDictionary(x => x.carry_id, x => x.real_qty);
+ var allOutIds = new List();
+ var sortingOutIds = new List();
+ foreach (var pair in dic)
+ {
+ var codes = carryCodes.FindAll(x => x.carry_id == pair.Key);
+ if (codes?.Count > 0)
+ {
+ if (pair.Value == codes.Sum(d => d.codeqty))
+ {
+ allOutIds.Add(pair.Key);
+ }
+ else
+ {
+ sortingOutIds.Add(pair.Key);
+ }
+ }
+ }
+ carryIds = allOutIds.Concat(sortingOutIds).ToList();
+ await _db.Updateable().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.全部出).ToString() }).Where(it => allOutIds.Contains(it.id)).ExecuteCommandAsync();
+ await _db.Updateable().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.分拣出).ToString() }).Where(it => sortingOutIds.Contains(it.id)).ExecuteCommandAsync();
+ }
+ }
+ else throw new AppFriendlyException($"请输入物料明细", 500);
+ var carrys = await _db.Queryable().Where(it => carryIds.Contains(it.id)).ToListAsync();
+ if (carrys?.Count > 0)
+ {
+ List preTasks = new();
+ foreach (var carry in carrys)
+ {
+ WmsPointH sPoint = null;
+ WmsPointH ePoint = null;
+ if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
+ {
+ sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carry.location_id);
+ }
+ if (input.data.ContainsKey(nameof(WmsPointH.location_id)) && input.data[nameof(WmsPointH.location_id)].IsNotEmptyOrNull())
+ {
+ ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString());
+ }
+ if (sPoint != null && ePoint != null)
+ {
+ var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
+ //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
+ if (points?.Count > 0)
+ {
+ if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
+ var curPreTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
+ {
+ var sPoint = it.FirstOrDefault();
+ var ePoint = it.LastOrDefault();
+
+ WmsPretaskH preTask = new();
+ preTask.org_id = _userManager.User.OrganizeId;
+ preTask.startlocation_id = sPoint?.location_id;
+ preTask.startlocation_code = sPoint?.location_code;
+ preTask.endlocation_id = ePoint?.location_id;
+ preTask.endlocation_code = ePoint?.location_code;
+ preTask.start_floor = sPoint?.floor.ToString();
+ preTask.end_floor = ePoint?.floor.ToString();
+ preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
+ preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
+ preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSOUTSTOCK_ID;
+ preTask.task_type = WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_ID;
+ preTask.carry_id = carry.id;
+ preTask.carry_code = carry.carry_code;
+ preTask.area_id = sPoint?.area_id!;
+ preTask.area_code = it.Key;
+ preTask.require_id = input.data["ReturnIdentity"].ToString();
+ preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!;
+ preTask.create_id = _userManager.UserId;
+ preTask.create_time = DateTime.Now;
+ return preTask;
+ }).ToList();
+ preTasks.AddRange(curPreTasks);
+ }
+ }
+ }
+ var isOk = await _wareHouseService.GenPreTask(preTasks, null);
+ GenPreTaskUpInput genPreTaskAfterUpInput = new();
+ genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
+ await _wareHouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1 }, it => new BasLocation { is_lock = 1 });
+ }
+
+ }
+
+ await _db.Ado.CommitTranAsync();
+ }
+ catch (Exception)
+ {
+ await _db.Ado.RollbackTranAsync();
+ throw;
+ }
+ return Task.FromResult(true);
}
///