wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
alex
2023-06-20 20:20:07 +08:00
parent 536711a695 4ad5cca7ab
commit c84459abe3
15 changed files with 398 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs
View File

@@ -102,7 +102,7 @@ public partial class WmsDistaskH : BaseEntity<string>
/// <summary> /// <summary>
/// 是否签收 /// 是否签收
/// </summary> /// </summary>
public int is_sign { get; set; } public int is_sign { get; set; } = 1;
/// <summary> /// <summary>
/// 来源单据ID /// 来源单据ID

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs
View File

@@ -42,7 +42,7 @@ public partial class WmsInstockCode : BaseEntity<string>
/// <summary> /// <summary>
/// 明细状态 /// 明细状态
/// </summary> /// </summary>
public int line_status { get; set; } public string line_status { get; set; }
/// <summary> /// <summary>
/// 物品ID /// 物品ID

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskCode.cs
View File

@@ -94,10 +94,6 @@ public partial class WmsPretaskCode : BaseEntity<string>
/// </summary> /// </summary>
public DateTime? modify_time { get; set; } public DateTime? modify_time { get; set; }
/// <summary>
/// 行号
/// </summary>
public int no { get; set; }
/// <summary> /// <summary>
/// 子载具ID /// 子载具ID

33
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
View File

@@ -59,7 +59,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYBIND_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
if (input == null) throw new ArgumentNullException(nameof(input)); if (input == null) throw new ArgumentNullException(nameof(input));
@@ -67,18 +67,21 @@ namespace Tnb.WarehouseMgr
var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : "";
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId); var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId); var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId);
WmsCarrybindH wmsCarrybindH = carry.Adapt<WmsCarrybindH>(); WmsCarryD wmsCarryD = new()
{
id = SnowflakeIdHelper.NextId(),
carry_id = carry.id,
org_id = carry?.org_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
};
//WmsCarrybindH wmsCarrybindH = carry?.Adapt<WmsCarrybindH>()!;
if (carry != null && subCarry != null) if (carry != null && subCarry != null)
{ {
wmsCarrybindH.id = SnowflakeIdHelper.NextId(); var row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync();
wmsCarrybindH.org_id = carry.org_id;
wmsCarrybindH.carry_id = carry.id;
wmsCarrybindH.membercarry_id = subCarry.id;
wmsCarrybindH.membercarry_code = subCarry.carry_code;
wmsCarrybindH.loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1);
wmsCarrybindH.create_id = _userManager.UserId;
wmsCarrybindH.create_time = DateTime.Now;
var row = await _db.Insertable(wmsCarrybindH).ExecuteCommandAsync();
carry.carry_status = "1"; carry.carry_status = "1";
row = await _db.Updateable(carry).ExecuteCommandAsync(); row = await _db.Updateable(carry).ExecuteCommandAsync();
subCarry.carry_status = "1"; subCarry.carry_status = "1";
@@ -88,15 +91,15 @@ namespace Tnb.WarehouseMgr
{ {
WmsCarrybindCode wmsCarrybindCode = new(); WmsCarrybindCode wmsCarrybindCode = new();
wmsCarrybindCode.id = SnowflakeIdHelper.NextId(); wmsCarrybindCode.id = SnowflakeIdHelper.NextId();
wmsCarrybindCode.org_id = subCarry.id; wmsCarrybindCode.org_id = subCarry?.org_id!;
wmsCarrybindCode.carrybind_id = wmsCarrybindH.id; wmsCarrybindCode.carrybind_id = input.data["ReturnIdentity"]?.ToString()!;
wmsCarrybindCode.material_id = items[i].material_id; wmsCarrybindCode.material_id = items[i].material_id;
wmsCarrybindCode.material_code = items[i].material_code; wmsCarrybindCode.material_code = items[i].material_code;
wmsCarrybindCode.barcode = items[i].barcode; wmsCarrybindCode.barcode = items[i].barcode;
wmsCarrybindCode.code_batch = items[i].code_batch; wmsCarrybindCode.code_batch = items[i].code_batch;
wmsCarrybindCode.codeqty = items[i].codeqty; wmsCarrybindCode.codeqty = items[i].codeqty;
wmsCarrybindCode.membercarry_id = subCarry.id; wmsCarrybindCode.membercarry_id = subCarry?.id;
wmsCarrybindCode.membercarry_code = subCarry.carry_code; wmsCarrybindCode.membercarry_code = subCarry?.carry_code;
wmsCarrybindCode.unit_id = items[i].unit_id; wmsCarrybindCode.unit_id = items[i].unit_id;
wmsCarrybindCode.unit_code = items[i].unit_code; wmsCarrybindCode.unit_code = items[i].unit_code;
wmsCarrybindCode.create_id = _userManager.UserId; wmsCarrybindCode.create_id = _userManager.UserId;

24
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs
View File

@@ -58,7 +58,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYUNBIND_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
if (input == null) throw new ArgumentNullException(nameof(input)); if (input == null) throw new ArgumentNullException(nameof(input));
@@ -69,7 +69,27 @@ namespace Tnb.WarehouseMgr
//WmsCarryunbindH wmsCarryUnbindH = carry.Adapt<WmsCarryunbindH>(); //WmsCarryunbindH wmsCarryUnbindH = carry.Adapt<WmsCarryunbindH>();
if (carry != null && subCarry != null) if (carry != null && subCarry != null)
{ {
var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == subCarry.id).ExecuteCommandAsync(); var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).ExecuteCommandAsync();
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
WmsCarryunbindCode wmsCarryUnbindCode = new();
for (int i = 0; i < items.Count; i++)
{
wmsCarryUnbindCode.id = SnowflakeIdHelper.NextId();
wmsCarryUnbindCode.org_id = subCarry?.org_id!;
wmsCarryUnbindCode.carryunbind_id = input.data["ReturnIdentity"]?.ToString()!;
wmsCarryUnbindCode.material_id = items[i].material_id;
wmsCarryUnbindCode.material_code = items[i].material_code;
wmsCarryUnbindCode.barcode = items[i].barcode;
wmsCarryUnbindCode.code_batch = items[i].code_batch;
wmsCarryUnbindCode.codeqty = items[i].codeqty;
wmsCarryUnbindCode.membercarry_id = subCarry?.id;
wmsCarryUnbindCode.membercarry_code = subCarry?.carry_code;
wmsCarryUnbindCode.unit_id = items[i].unit_id;
wmsCarryUnbindCode.unit_code = items[i].unit_code;
wmsCarryUnbindCode.create_id = _userManager.UserId;
wmsCarryUnbindCode.create_time = DateTime.Now;
row = await _db.Insertable(wmsCarryUnbindCode).ExecuteCommandAsync();
}
carry.carry_status = "0"; carry.carry_status = "0";
row = await _db.Updateable(carry).ExecuteCommandAsync(); row = await _db.Updateable(carry).ExecuteCommandAsync();
subCarry.carry_status = "0"; subCarry.carry_status = "0";

237
WarehouseMgr/Tnb.WarehouseMgr/WmsOutBaleService.cs Normal file
View File

@@ -0,0 +1,237 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Extension;
using JNPF.Common.Security;
using JNPF.FriendlyException;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using 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;
namespace Tnb.WarehouseMgr
{
/// <summary>
/// 出库申请业务类
/// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSOUTSTOCK_ID)]
public class WmsOutBaleService : BaseWareHouseService, IWmsOutStockService
{
private readonly ISqlSugarClient _db;
private readonly IDictionaryDataService _dictionaryDataService;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly IWareHouseService _wareHouseService;
private readonly IUserManager _userManager;
private readonly IBillRullService _billRullService;
public WmsOutBaleService(
ISqlSugarRepository<WmsOutstockD> repository,
IDictionaryDataService dictionaryDataService,
IRunService runService,
IVisualDevService visualDevService,
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<dynamic> OutStockApplyFor(VisualDevModelDataCrInput input)
{
try
{
await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSOUTSTOCK_ID, true);
await _runService.Create(templateEntity, input);
//判断目标库位是否自动签收
var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString());
var carryIds = new List<string>();
//tablefield120 出库物料明细
if (input.data.ContainsKey("tablefield120") && input.data["tablefield120"].IsNotEmptyOrNull())
{
var outStockDList = input.data["tablefield120"].ToObject<List<WmsOutstockD>>();
if (outStockDList?.Count > 0)
{
List<WmsCarryMat> carryMats = new();
List<WmsCarryCode> carryCodes = new();
foreach (var os in outStockDList)
{
var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((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<WmsCarryCode>()
.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<List<WmsCarryMat>>();
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<string>();
var sortingOutIds = new List<string>();
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<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.全部出).ToString() }).Where(it => allOutIds.Contains(it.id)).ExecuteCommandAsync();
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { out_status = ((int)EnumOutStatus.分拣出).ToString() }).Where(it => sortingOutIds.Contains(it.id)).ExecuteCommandAsync();
}
var carrys = await _db.Queryable<WmsCarryH>().Where(it => carryIds.Contains(it.id)).ToListAsync();
if (carrys?.Count > 0)
{
List<WmsPretaskH> preTasks = new();
List<string> locIds = new();
foreach (var carry in carrys)
{
WmsPointH sPoint = null;
WmsPointH ePoint = null;
if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
{
sPoint = await _db.Queryable<WmsPointH>().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<WmsPointH>().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);
locIds.AddRange(points.Select(x => x.location_id).ToList()!);
//根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
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();
if (loc.is_sign == 0)
{
curPreTasks[^1].is_sign = 0; // 修改最后一个元素的是否签收值
}
preTasks.AddRange(curPreTasks);
}
}
}
var isOk = await _wareHouseService.GenPreTask(preTasks, null);
GenPreTaskUpInput genPreTaskAfterUpInput = new();
genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList();
await _wareHouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1 }, it => new BasLocation { is_lock = 1 });
}
}
else throw new AppFriendlyException($"请输入物料明细", 500);
}
await _db.Ado.CommitTranAsync();
}
catch (Exception)
{
await _db.Ado.RollbackTranAsync();
throw;
}
return Task.FromResult(true);
}
/// <summary>
/// 根据出库申请单ID获取申请单明细信息
/// </summary>
/// <param name="billId"></param>
/// <returns></returns>
[HttpGet]
public async Task<dynamic> GetInStockDetailsListById([FromRoute] string billId)
{
var dic = await _dictionaryDataService.GetDictionaryByTypeId(WmsWareHouseConst.WMS_INSTOCK_D_BILL_STATUS_TYPEID);
var items = await _db.Queryable<WmsOutstockD>().Where(it => it.bill_id == billId).ToListAsync();
_db.ThenMapper(items,
it => it.line_status = dic.ContainsKey(it.line_status) ? dic[it.line_status]?.ToString()! : "");
return items;
}
}
}

8
WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs → WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs
View File

@@ -24,14 +24,14 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 载具服务 /// 载具服务
/// </summary> /// </summary>
[OverideVisualDev(ModuleId)] [OverideVisualDev(ModuleConsts.MODULE_WMSBINDINGPDA_ID)]
public class WmsBindService : BaseWareHouseService, IWmsCarryService public class WmsPDABindService : BaseWareHouseService, IWmsCarryService
{ {
private const string ModuleId = "26496560237333"; //private const string ModuleId = "26496560237333";
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
public WmsBindService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService) public WmsPDABindService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_userManager = userManager; _userManager = userManager;

33
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs
View File

@@ -59,7 +59,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYBINDPDA_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
if (input == null) throw new ArgumentNullException(nameof(input)); if (input == null) throw new ArgumentNullException(nameof(input));
@@ -67,18 +67,21 @@ namespace Tnb.WarehouseMgr
var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : "";
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId); var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == carryId);
var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId); var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId);
WmsCarrybindH wmsCarrybindH = carry.Adapt<WmsCarrybindH>(); WmsCarryD wmsCarryD = new()
{
id = SnowflakeIdHelper.NextId(),
carry_id = carry.id,
org_id = carry?.org_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
};
//WmsCarrybindH wmsCarrybindH = carry?.Adapt<WmsCarrybindH>()!;
if (carry != null && subCarry != null) if (carry != null && subCarry != null)
{ {
wmsCarrybindH.id = SnowflakeIdHelper.NextId(); var row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync();
wmsCarrybindH.org_id = carry.org_id;
wmsCarrybindH.carry_id = carry.id;
wmsCarrybindH.membercarry_id = subCarry.id;
wmsCarrybindH.membercarry_code = subCarry.carry_code;
wmsCarrybindH.loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1);
wmsCarrybindH.create_id = _userManager.UserId;
wmsCarrybindH.create_time = DateTime.Now;
var row = await _db.Insertable(wmsCarrybindH).ExecuteCommandAsync();
carry.carry_status = "1"; carry.carry_status = "1";
row = await _db.Updateable(carry).ExecuteCommandAsync(); row = await _db.Updateable(carry).ExecuteCommandAsync();
subCarry.carry_status = "1"; subCarry.carry_status = "1";
@@ -88,15 +91,15 @@ namespace Tnb.WarehouseMgr
{ {
WmsCarrybindCode wmsCarrybindCode = new(); WmsCarrybindCode wmsCarrybindCode = new();
wmsCarrybindCode.id = SnowflakeIdHelper.NextId(); wmsCarrybindCode.id = SnowflakeIdHelper.NextId();
wmsCarrybindCode.org_id = subCarry.id; wmsCarrybindCode.org_id = subCarry?.org_id!;
wmsCarrybindCode.carrybind_id = wmsCarrybindH.id; wmsCarrybindCode.carrybind_id = input.data["ReturnIdentity"]?.ToString()!;
wmsCarrybindCode.material_id = items[i].material_id; wmsCarrybindCode.material_id = items[i].material_id;
wmsCarrybindCode.material_code = items[i].material_code; wmsCarrybindCode.material_code = items[i].material_code;
wmsCarrybindCode.barcode = items[i].barcode; wmsCarrybindCode.barcode = items[i].barcode;
wmsCarrybindCode.code_batch = items[i].code_batch; wmsCarrybindCode.code_batch = items[i].code_batch;
wmsCarrybindCode.codeqty = items[i].codeqty; wmsCarrybindCode.codeqty = items[i].codeqty;
wmsCarrybindCode.membercarry_id = subCarry.id; wmsCarrybindCode.membercarry_id = subCarry?.id;
wmsCarrybindCode.membercarry_code = subCarry.carry_code; wmsCarrybindCode.membercarry_code = subCarry?.carry_code;
wmsCarrybindCode.unit_id = items[i].unit_id; wmsCarrybindCode.unit_id = items[i].unit_id;
wmsCarrybindCode.unit_code = items[i].unit_code; wmsCarrybindCode.unit_code = items[i].unit_code;
wmsCarrybindCode.create_id = _userManager.UserId; wmsCarrybindCode.create_id = _userManager.UserId;

24
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs
View File

@@ -58,7 +58,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYUNBINDPDA_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
if (input == null) throw new ArgumentNullException(nameof(input)); if (input == null) throw new ArgumentNullException(nameof(input));
@@ -69,7 +69,27 @@ namespace Tnb.WarehouseMgr
//WmsCarryunbindH wmsCarryUnbindH = carry.Adapt<WmsCarryunbindH>(); //WmsCarryunbindH wmsCarryUnbindH = carry.Adapt<WmsCarryunbindH>();
if (carry != null && subCarry != null) if (carry != null && subCarry != null)
{ {
var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == subCarry.id).ExecuteCommandAsync(); var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).ExecuteCommandAsync();
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
WmsCarryunbindCode wmsCarryUnbindCode = new();
for (int i = 0; i < items.Count; i++)
{
wmsCarryUnbindCode.id = SnowflakeIdHelper.NextId();
wmsCarryUnbindCode.org_id = subCarry?.org_id!;
wmsCarryUnbindCode.carryunbind_id = input.data["ReturnIdentity"]?.ToString()!;
wmsCarryUnbindCode.material_id = items[i].material_id;
wmsCarryUnbindCode.material_code = items[i].material_code;
wmsCarryUnbindCode.barcode = items[i].barcode;
wmsCarryUnbindCode.code_batch = items[i].code_batch;
wmsCarryUnbindCode.codeqty = items[i].codeqty;
wmsCarryUnbindCode.membercarry_id = subCarry?.id;
wmsCarryUnbindCode.membercarry_code = subCarry?.carry_code;
wmsCarryUnbindCode.unit_id = items[i].unit_id;
wmsCarryUnbindCode.unit_code = items[i].unit_code;
wmsCarryUnbindCode.create_id = _userManager.UserId;
wmsCarryUnbindCode.create_time = DateTime.Now;
row = await _db.Insertable(wmsCarryUnbindCode).ExecuteCommandAsync();
}
carry.carry_status = "0"; carry.carry_status = "0";
row = await _db.Updateable(carry).ExecuteCommandAsync(); row = await _db.Updateable(carry).ExecuteCommandAsync();
subCarry.carry_status = "0"; subCarry.carry_status = "0";

4
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyOutstockService .cs
View File

@@ -30,7 +30,7 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 空载具出库 /// 空载具出库
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSEMPTYOUTSTK_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID)]
public class WmsPDAEmptyOutstockService : BaseWareHouseService, IPdaStroage public class WmsPDAEmptyOutstockService : BaseWareHouseService, IPdaStroage
{ {
@@ -65,7 +65,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYOUTSTK_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
/*//入库取终点 /*//入库取终点

92
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
View File

@@ -11,6 +11,7 @@ using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev; using JNPF.VisualDev;
using Mapster; using Mapster;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen;
using SqlSugar; using SqlSugar;
using Tnb.BasicData.Entities; using Tnb.BasicData.Entities;
using Tnb.Common.Utils; using Tnb.Common.Utils;
@@ -25,16 +26,16 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 载具服务 /// 载具服务
/// </summary> /// </summary>
[OverideVisualDev(ModuleId)] [OverideVisualDev(ModuleConsts.MODULE_WMSFEEDINGRECORDPDA_ID)]
public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService
{ {
private const string ModuleId = "26496913096981"; //private const string ModuleId = "26496913096981";
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IBillRullService _billRullService; private readonly IBillRullService _billRullService;
private readonly WmsCarryService _wmsCarryService; private readonly WmsCarryService _wmsCarryService;
private static Dictionary<string, object> dicMaterial = new Dictionary<string, object>(); private static Dictionary<string, object> dicMaterial = new Dictionary<string, object>();
public WmsPDAFeedingService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService,WmsCarryService wmsCarryService) public WmsPDAFeedingService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService, WmsCarryService wmsCarryService)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_userManager = userManager; _userManager = userManager;
@@ -42,60 +43,67 @@ namespace Tnb.WarehouseMgr
_wmsCarryService = wmsCarryService; _wmsCarryService = wmsCarryService;
OverideFuncs.CreateAsync = WmsPDAFeeding; OverideFuncs.CreateAsync = WmsPDAFeeding;
} }
private async Task<dynamic> WmsPDAFeeding(VisualDevModelDataCrInput input) private async Task<dynamic> WmsPDAFeeding(VisualDevModelDataCrInput input)
{ {
var isOk = false;
try try
{ {
var isOk = false;
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
var oldCarryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
var newCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; var feedBoxCode = input.data.ContainsKey("feedbox_code") ? input.data["feedbox_code"]?.ToString() : "";
var oldCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == oldCarryId); var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == carryId);
var newCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == newCarryId); var feedBox = await _db.Queryable<WmsFeedbox>().FirstAsync(it => it.feedbox_code == feedBoxCode);
if (oldCarry != null && newCarry != null) var citem = await _db.Queryable<WmsCarryMat>().FirstAsync(it => it.carry_id == carryId);
if (carry != null && feedBox != null)
{ {
ExChangeCarryInput carryInput = new() { old_carry_id = oldCarry.id, new_carry_id = newCarry.id }; feedBox.material_id = citem.material_id;
isOk = await _updateSubCarry<WmsCarryD>(carryInput); feedBox.material_code = citem.material_code;
isOk = await _updateSubCarry<WmsCarryMat>(carryInput); feedBox.qty = citem.qty;
isOk = await _updateSubCarry<WmsCarryCode>(carryInput); feedBox.batch = citem?.code_batch!;
var row = await _db.Updateable(feedBox).UpdateColumns(it => new
{
it.material_id,
it.material_code,
it.qty,
it.batch
}).ExecuteCommandAsync();
/* var row = await _db.Updateable(feedBox).SetColumns(it => new
{
it.material_id == item.material_id,it.material_code
}
)*/
newCarry.status = oldCarry.status; var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
newCarry.carry_status = oldCarry.carry_status; foreach (var item in items)
newCarry.location_id = oldCarry.location_id; {
newCarry.location_code = oldCarry.location_code; WmsFeedingrecordCode wmsFeedingRecordCode = new();
newCarry.is_lock = oldCarry.is_lock; wmsFeedingRecordCode.id = SnowflakeIdHelper.NextId();
newCarry.out_status = oldCarry.out_status; wmsFeedingRecordCode.org_id = carry?.org_id!;
newCarry.is_check = oldCarry.is_check; wmsFeedingRecordCode.record_id = input.data["ReturnIdentity"]?.ToString()!;
newCarry.bale_num = oldCarry.bale_num; wmsFeedingRecordCode.material_id = item.material_id;
newCarry.collocation_scheme_id = oldCarry.collocation_scheme_id; wmsFeedingRecordCode.material_code = item.material_code;
newCarry.collocation_scheme_code = oldCarry.collocation_scheme_code; wmsFeedingRecordCode.barcode = item.barcode;
newCarry.source_id = oldCarry.source_id; wmsFeedingRecordCode.code_batch = item.code_batch;
newCarry.source_code = oldCarry.source_code; wmsFeedingRecordCode.codeqty = item.codeqty;
newCarry.create_id = _userManager.UserId; wmsFeedingRecordCode.unit_id = item.unit_id;
newCarry.create_time = DateTime.Now; wmsFeedingRecordCode.unit_code = item.unit_code;
var row = await _db.Updateable(newCarry).ExecuteCommandAsync(); wmsFeedingRecordCode.create_id = _userManager.UserId;
WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt<WmsCarryReplaceH>(); wmsFeedingRecordCode.create_time = DateTime.Now;
wmsCarryReplaceH.id = SnowflakeIdHelper.NextId(); row = await _db.Insertable(wmsFeedingRecordCode).ExecuteCommandAsync();
wmsCarryReplaceH.org_id = oldCarry.org_id; }
wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE); row = await UpdateNullCarry(carry);
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); isOk = (row > 0);
if (!isOk) throw Oops.Oh(ErrorCode.COM1001); if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
} }
else else
{ {
if (oldCarry == null) if (carry == null)
{ {
throw new AppFriendlyException("没有可用的旧载具", 500); throw new AppFriendlyException("没有可用的旧载具", 500);
} }
if (newCarry == null) if (feedBox == null)
{ {
throw new AppFriendlyException("没有可用的新载具", 500); throw new AppFriendlyException("没有可用的新载具", 500);
} }

21
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
View File

@@ -78,9 +78,9 @@ namespace Tnb.WarehouseMgr
var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
WmsPointH sPoint = null; WmsPointH sPoint = null;
WmsPointH ePoint = null; WmsPointH ePoint = null;
if (input.data.ContainsKey(nameof(WmsPointH.location_id))) if (input.data.ContainsKey(nameof(WmsHandleH.startlocation_id)))
{ {
sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsHandleH.startlocation_id)].ToString());
} }
if (endLocations?.Count > 0) if (endLocations?.Count > 0)
{ {
@@ -148,7 +148,7 @@ namespace Tnb.WarehouseMgr
var requireIdField = "require_id"; var requireIdField = "require_id";
var preTaskUpInput = new GenPreTaskUpInput(); var preTaskUpInput = new GenPreTaskUpInput();
preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString()!; preTaskUpInput.RquireId = input.data[nameof(WmsHandleH.require_id)].ToString();
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
@@ -199,7 +199,22 @@ namespace Tnb.WarehouseMgr
var instockDetails = await _db.Queryable<WmsInstockD>() var instockDetails = await _db.Queryable<WmsInstockD>()
.Where(b => b.bill_id == input.data[requireIdField].ToString()) .Where(b => b.bill_id == input.data[requireIdField].ToString())
.ToListAsync(); .ToListAsync();
//var instockProps = typeof(WmsInstockD).GetProperties().Select(p => p.Name).ToList();
//var instockCodeProps = typeof(WmsInstockCode).GetProperties().Select(p => p.Name).ToList();
//var ssss = instockCodeProps.Intersect(instockProps).ToList();
//var instockTypes = typeof(WmsInstockD).GetProperties().Where(p => ssss.Contains(p.Name)).Select(p => p.PropertyType.Name).ToList();
//var instockCodeTypes = typeof(WmsInstockCode).GetProperties().Where(p => ssss.Contains(p.Name)).Select(p => p.PropertyType.Name).ToList();
//var dddf = instockTypes.Except(instockCodeTypes).ToList();
//var ddd = instockDetails[0].Adapt<WmsInstockCode>();
//org_id,bill_id,line_status,material_id,material_code,code_batch,unit_id,unit_code,source_id,
// source_code,source_type,source_line,source_detail_id,remark,extras,time_stamp,create_id,
// create_time,modify_id,modify_time,mo_code,mo_line,mo_bom_detail_id,id
var items = instockDetails.Adapt<List<WmsInstockCode>>(); var items = instockDetails.Adapt<List<WmsInstockCode>>();
items.ForEach(it => it.org_id = _userManager.User.OrganizeId);
List<WmsInstockCode> instockCOdes = new(); List<WmsInstockCode> instockCOdes = new();
jArr = JArray.Parse(input.data["tablefield115"].ToString()!); jArr = JArray.Parse(input.data["tablefield115"].ToString()!);
if (jArr?.Children().Count() > 0) if (jArr?.Children().Count() > 0)

2
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInbaleService.cs
View File

@@ -141,7 +141,7 @@ namespace Tnb.WarehouseMgr
handleH.create_time = DateTime.Now; handleH.create_time = DateTime.Now;
preTaskUpInput.PreTaskRecord = handleH; preTaskUpInput.PreTaskRecord = handleH;
//根据载具移入Id，回更单据状态 //根据载具移入Id，回更单据状态
await _db.Updateable<WmsInbale>().SetColumns(it => new WmsInbale { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync(); await _db.Updateable<WmsInbale>().SetColumns(it => new WmsInbale { status = WmsWareHouseConst.BILLSTATUS_ON_ID}).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
var baleNum = input.data[nameof(WmsCarryH.bale_num)]?.ToString(); var baleNum = input.data[nameof(WmsCarryH.bale_num)]?.ToString();
await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,

4
WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs
View File

@@ -30,7 +30,7 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// PDA库内转移 /// PDA库内转移
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFERPDA_ID)]
[ServiceModule(BizTypeId)] [ServiceModule(BizTypeId)]
public class WmsPDATransferService : BaseWareHouseService, IPdaStroage public class WmsPDATransferService : BaseWareHouseService, IPdaStroage
{ {
@@ -65,7 +65,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFERPDA_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
// 计算路径，插入预任务申请 // 计算路径，插入预任务申请
WmsPointH sPoint = null; WmsPointH sPoint = null;

4
WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs
View File

@@ -30,7 +30,7 @@ namespace Tnb.WarehouseMgr
/// <summary> /// <summary>
/// 库内转移 /// 库内转移
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFERPDA_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)]
[ServiceModule(BizTypeId)] [ServiceModule(BizTypeId)]
public class WmsTransferService : BaseWareHouseService, IPdaStroage public class WmsTransferService : BaseWareHouseService, IPdaStroage
{ {
@@ -65,7 +65,7 @@ namespace Tnb.WarehouseMgr
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFERPDA_ID, true); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true);
await _runService.Create(templateEntity, input); await _runService.Create(templateEntity, input);
// 计算路径，插入预任务申请 // 计算路径，插入预任务申请
WmsPointH sPoint = null; WmsPointH sPoint = null;