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

修改注释

Browse Source
This commit is contained in:
FanLian
2023-06-21 16:15:29 +08:00
parent 1d7dbe3b1a
commit 8d5ee4c0d7
3 changed files with 79 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
WarehouseMgr/Tnb.WarehouseMgr/WmsPDABindService.cs
View File

@@ -50,13 +50,13 @@ namespace Tnb.WarehouseMgr
} }
/// <summary> /// <summary>
/// 更换载具 /// PDA绑定操作
/// </summary> /// </summary>
/// <param name="input"> /// <param name="input">
/// 输入参数: /// 输入参数:
/// <br/>{ /// <br/>{
/// <br/> old_carry_id:老载具id /// <br/> old_carry_id: 载具料箱ID
/// <br/> new_carry_id：新载具ID /// <br/> new_carry_id：载具小车ID
/// <br/>} /// <br/>}
/// </param> /// </param>
/// <returns></returns> /// <returns></returns>

6
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs
View File

@@ -24,7 +24,7 @@ using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr namespace Tnb.WarehouseMgr
{ {
/// <summary> /// <summary>
/// 载具服务 /// PDA载具更换
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACEPDA_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACEPDA_ID)]
public class WmsPDACarryService : BaseWareHouseService, IWmsCarryService, IPdaStroage public class WmsPDACarryService : BaseWareHouseService, IWmsCarryService, IPdaStroage
@@ -50,12 +50,12 @@ namespace Tnb.WarehouseMgr
} }
/// <summary> /// <summary>
/// 更换载具 /// PDA载具更换
/// </summary> /// </summary>
/// <param name="input"> /// <param name="input">
/// 输入参数: /// 输入参数:
/// <br/>{ /// <br/>{
/// <br/> old_carry_id:老载具id /// <br/> old_carry_id:老载具ID
/// <br/> new_carry_id：新载具ID /// <br/> new_carry_id：新载具ID
/// <br/>} /// <br/>}
/// </param> /// </param>

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

@@ -9,11 +9,11 @@ using JNPF.FriendlyException;
using JNPF.Logging; using JNPF.Logging;
using JNPF.Systems.Interfaces.System; using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev; using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
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.Common.Utils; using Tnb.Common.Utils;
using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts; using Tnb.WarehouseMgr.Entities.Consts;
@@ -24,85 +24,101 @@ using Tnb.WarehouseMgr.Interfaces;
namespace Tnb.WarehouseMgr namespace Tnb.WarehouseMgr
{ {
/// <summary> /// <summary>
/// 载具服务 /// PDA投料记录
/// </summary> /// </summary>
[OverideVisualDev(ModuleConsts.MODULE_WMSFEEDINGRECORDPDA_ID)] [OverideVisualDev(ModuleConsts.MODULE_WMSFEEDINGRECORDPDA_ID)]
public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IPdaStroage
{ {
//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 IRunService _runService;
private static Dictionary<string, object> dicMaterial = new Dictionary<string, object>(); private readonly IVisualDevService _visualDevService;
public WmsPDAFeedingService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService, WmsCarryService wmsCarryService) public WmsPDAFeedingService(
ISqlSugarRepository<WmsCarryH> repository,
IUserManager userManager,
IBillRullService billRullService,
IRunService runService,
IVisualDevService visualDevService)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_userManager = userManager; _userManager = userManager;
_billRullService = billRullService; _billRullService = billRullService;
_wmsCarryService = wmsCarryService; _runService = runService;
OverideFuncs.CreateAsync = WmsPDAFeeding; _visualDevService = visualDevService;
OverideFuncs.CreateAsync = WmsPDABind;
} }
private async Task<dynamic> WmsPDAFeeding(VisualDevModelDataCrInput input) /// <summary>
/// PDA投料记录
/// </summary>
/// <param name="input">
/// 输入参数:
/// <br/>{
/// <br/> old_carry_id: 料箱ID
/// <br/> new_carry_id：新载具ID
/// <br/>}
/// </param>
/// <returns></returns>
/// <exception cref="ArgumentNullException"></exception>
private async Task<dynamic> WmsPDABind(VisualDevModelDataCrInput input)
{ {
var isOk = false; var isOk = false;
try try
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
var feedBoxCode = input.data.ContainsKey("feedbox_code") ? input.data["feedbox_code"]?.ToString() : "";
var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == carryId);
var feedBox = await _db.Queryable<WmsFeedbox>().FirstAsync(it => it.feedbox_code == feedBoxCode);
var citem = await _db.Queryable<WmsCarryMat>().FirstAsync(it => it.carry_id == carryId);
if (carry != null && feedBox != null)
{
feedBox.material_id = citem.material_id;
feedBox.material_code = citem.material_code;
feedBox.qty = citem.qty;
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
}
)*/
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync(); VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSFEEDINGRECORDPDA_ID, true);
foreach (var item in items) await _runService.Create(templateEntity, input);
{
WmsFeedingrecordCode wmsFeedingRecordCode = new(); var oldCarryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : "";
wmsFeedingRecordCode.id = SnowflakeIdHelper.NextId(); var newCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : "";
wmsFeedingRecordCode.org_id = carry?.org_id!; var oldCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == oldCarryId);
wmsFeedingRecordCode.record_id = input.data["ReturnIdentity"]?.ToString()!; var newCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == newCarryId);
wmsFeedingRecordCode.material_id = item.material_id; if (oldCarry != null && newCarry != null)
wmsFeedingRecordCode.material_code = item.material_code; {
wmsFeedingRecordCode.barcode = item.barcode; ExChangeCarryInput carryInput = new() { old_carry_id = oldCarry.id, new_carry_id = newCarry.id };
wmsFeedingRecordCode.code_batch = item.code_batch; isOk = await _updateSubCarry<WmsCarryD>(carryInput);
wmsFeedingRecordCode.codeqty = item.codeqty; isOk = await _updateSubCarry<WmsCarryMat>(carryInput);
wmsFeedingRecordCode.unit_id = item.unit_id; isOk = await _updateSubCarry<WmsCarryCode>(carryInput);
wmsFeedingRecordCode.unit_code = item.unit_code;
wmsFeedingRecordCode.create_id = _userManager.UserId; newCarry.status = oldCarry.status;
wmsFeedingRecordCode.create_time = DateTime.Now; newCarry.carry_status = oldCarry.carry_status;
row = await _db.Insertable(wmsFeedingRecordCode).ExecuteCommandAsync(); newCarry.location_id = oldCarry.location_id;
} newCarry.location_code = oldCarry.location_code;
row = await UpdateNullCarry(carry); newCarry.is_lock = oldCarry.is_lock;
newCarry.out_status = oldCarry.out_status;
newCarry.is_check = oldCarry.is_check;
newCarry.bale_num = oldCarry.bale_num;
newCarry.collocation_scheme_id = oldCarry.collocation_scheme_id;
newCarry.collocation_scheme_code = oldCarry.collocation_scheme_code;
newCarry.source_id = oldCarry.source_id;
newCarry.source_code = oldCarry.source_code;
newCarry.create_id = _userManager.UserId;
newCarry.create_time = DateTime.Now;
var row = await _db.Updateable(newCarry).ExecuteCommandAsync();
WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt<WmsCarryReplaceH>();
wmsCarryReplaceH.id = SnowflakeIdHelper.NextId();
wmsCarryReplaceH.org_id = oldCarry.org_id;
wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE);
wmsCarryReplaceH.carry_id = oldCarry.id;
wmsCarryReplaceH.carry_code = oldCarry.carry_code;
wmsCarryReplaceH.newcarry_id = newCarry.id;
wmsCarryReplaceH.newcarry_code = newCarry.carry_code;
row = await _db.Insertable(wmsCarryReplaceH).ExecuteCommandAsync();
row = await UpdateNullCarry(oldCarry);
isOk = (row > 0); isOk = (row > 0);
if (!isOk) throw Oops.Oh(ErrorCode.COM1001); if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
} }
else else
{ {
if (carry == null) if (oldCarry == null)
{ {
throw new AppFriendlyException("没有可用的旧载具", 500); throw new AppFriendlyException("没有可用的旧载具", 500);
} }
if (feedBox == null) if (newCarry == null)
{ {
throw new AppFriendlyException("没有可用的新载具", 500); throw new AppFriendlyException("没有可用的新载具", 500);
} }
@@ -137,6 +153,7 @@ namespace Tnb.WarehouseMgr
carryObj.source_id = null; carryObj.source_id = null;
carryObj.source_code = null; carryObj.source_code = null;
row = await _db.Updateable(carryObj).ExecuteCommandAsync(); row = await _db.Updateable(carryObj).ExecuteCommandAsync();
//删除对应明细表
//删除载具明细 //删除载具明细
await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == carryObj.id).ExecuteCommandHasChangeAsync(); await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == carryObj.id).ExecuteCommandHasChangeAsync();
//删除载具分拣物料明细 //删除载具分拣物料明细
@@ -175,34 +192,5 @@ namespace Tnb.WarehouseMgr
} }
return (row > 0); return (row > 0);
} }
/// <summary>
/// 根据载具Id获取载具条码记录
/// </summary>
/// <param name="carryId"></param>
/// <returns></returns>
[HttpGet]
public async Task<dynamic> GetCarryCodeList([FromRoute] string carryId)
{
if (dicMaterial.Count < 1)
{
dicMaterial = await _db.Queryable<BasMaterial>().ToDictionaryAsync(x => x.id, x => x.name);
}
var items = await _db.Queryable<WmsCarryCode>().Where(a => a.carry_id == carryId)
.Select(a => new CarryCodeDetailOutput
{
barcode = a.barcode,
code_batch = a.code_batch,
codeqty = a.codeqty,
material_code = a.material_code,
material_id = a.material_id,
unit_id = a.unit_id,
})
.Mapper(it => it.material_name = dicMaterial.ContainsKey(it.material_id) ? dicMaterial[it.material_id].ToString()! : "")
.ToListAsync();
return items;
}
} }
} }