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

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

Browse Source
This commit is contained in:
alex
2023-09-07 10:11:44 +08:00
parent c3749bb2ac bee9c7c98a
commit 22c91ab663
47 changed files with 2870 additions and 2761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ public partial class WmsHandleCode : BaseEntity<string>
/// <summary>
/// 条码数量
/// </summary>
public int codeqty { get; set; }
public decimal codeqty { get; set; }
/// <summary>
/// 单位ID

35
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs
View File

@@ -20,6 +20,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
@@ -131,6 +132,7 @@ namespace Tnb.WarehouseMgr
await _db.Insertable(instockD).ExecuteCommandAsync();
await _db.Insertable(instockCode).ExecuteCommandAsync();
var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = "26103372441637", Size = 1 };
var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
WmsPointH sPoint = new();
@@ -200,6 +202,7 @@ namespace Tnb.WarehouseMgr
var isOk = await _wareHouseService.GenPreTask(preTasks, pretaskCodes);
if (isOk)
{
var preTaskUpInput = new GenPreTaskUpInput();
preTaskUpInput.RquireId = instock.id;
preTaskUpInput.CarryId = carry.id;
@@ -207,6 +210,7 @@ namespace Tnb.WarehouseMgr
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault()!.location_code!;
preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList()!;
//生成操作记录
WmsHandleH handleH = new();
handleH.org_id = _userManager.User.OrganizeId;
handleH.startlocation_id = loc.id;
@@ -220,12 +224,35 @@ namespace Tnb.WarehouseMgr
handleH.create_id = _userManager.UserId;
handleH.create_time = DateTime.Now;
preTaskUpInput.PreTaskRecord = handleH;
//根据载具移入Id，回更单据状态
await _db.Updateable<WmsInstockH>().SetColumns(it => new WmsInstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
//生成操作记录条码表
WmsHandleCode handleCode = instockCode.Adapt<WmsHandleCode>();
handleCode.id = SnowflakeIdHelper.NextId();
handleCode.org_id = _userManager.User.OrganizeId;
handleCode.bill_id = handleH.id;
handleCode.create_id = _userManager.UserId;
handleCode.create_time = DateTime.Now;
preTaskUpInput.PreTaskHandleCodes.Add(handleCode);
//生成载具条码表
WmsCarryCode wmsCarryCode = instockCode.Adapt<WmsCarryCode>();
{
wmsCarryCode.id = SnowflakeIdHelper.NextId();
wmsCarryCode.carry_id = carry.id;
wmsCarryCode.is_out = 0;
wmsCarryCode.location_id = loc.id;
wmsCarryCode.location_code = loc.location_code;
wmsCarryCode.warehouse_id = instock.warehouse_id;
}
await _db.Insertable(wmsCarryCode).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 });
it => new WmsCarryH { carry_code = instock!.carry_code!, is_lock = 1, carry_status = ((int)EnumCarryStatus.占用).ToString(), location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode },
it => new BasLocation { is_lock = 1, is_use = ((int)EnumCarryStatus.占用).ToString() });
await _db.Updateable<WmsInstockD>().SetColumns(it => new WmsInstockD { line_status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => instockCode.bill_d_id == it.id).ExecuteCommandAsync();
await _db.Updateable<WmsInstockH>().SetColumns(it => new WmsInstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == instock!.id).ExecuteCommandAsync();
}
}
}