注释修改
This commit is contained in:
@@ -67,15 +67,13 @@ namespace Tnb.WarehouseMgr
|
|||||||
var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_id"]?.ToString() : "";
|
var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_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>()!;
|
|
||||||
if (carry != null && subCarry != null)
|
if (carry != null && subCarry != null)
|
||||||
{
|
{
|
||||||
|
|
||||||
carry.carry_status = "1";
|
carry.carry_status = "1";
|
||||||
var row = await _db.Updateable(carry).ExecuteCommandAsync();
|
var row = await _db.Updateable(carry).ExecuteCommandAsync();
|
||||||
subCarry.carry_status = "1";
|
subCarry.carry_status = "1";
|
||||||
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
|
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
|
||||||
|
//更新载具明细表
|
||||||
WmsCarryD wmsCarryD = new()
|
WmsCarryD wmsCarryD = new()
|
||||||
{
|
{
|
||||||
id = SnowflakeIdHelper.NextId(),
|
id = SnowflakeIdHelper.NextId(),
|
||||||
@@ -89,6 +87,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
};
|
};
|
||||||
row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync();
|
row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync();
|
||||||
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
|
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
|
||||||
|
//更新载具绑定条码表
|
||||||
for (int i = 0; i < items.Count; i++)
|
for (int i = 0; i < items.Count; i++)
|
||||||
{
|
{
|
||||||
WmsCarrybindCode wmsCarrybindCode = new();
|
WmsCarrybindCode wmsCarrybindCode = new();
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
{
|
{
|
||||||
var row = await _db.Deleteable<WmsCarryD>().Where(it => it.carry_id == carryId && it.membercarry_id == subCarryId).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();
|
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
|
||||||
|
//更新载具解绑记录条码表
|
||||||
WmsCarryunbindCode wmsCarryUnbindCode = new();
|
WmsCarryunbindCode wmsCarryUnbindCode = new();
|
||||||
for (int i = 0; i < items.Count; i++)
|
for (int i = 0; i < items.Count; i++)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -67,27 +67,28 @@ namespace Tnb.WarehouseMgr
|
|||||||
var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_id"]?.ToString() : "";
|
var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_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);
|
||||||
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)].ParseToInt(1),
|
|
||||||
create_id = _userManager.UserId,
|
|
||||||
create_time = DateTime.Now
|
|
||||||
};
|
|
||||||
//WmsCarrybindH wmsCarrybindH = carry?.Adapt<WmsCarrybindH>()!;
|
|
||||||
if (carry != null && subCarry != null)
|
if (carry != null && subCarry != null)
|
||||||
{
|
{
|
||||||
|
//更新载具明细
|
||||||
|
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)].ParseToInt(1),
|
||||||
|
create_id = _userManager.UserId,
|
||||||
|
create_time = DateTime.Now
|
||||||
|
};
|
||||||
var row = await _db.Insertable(wmsCarryD).ExecuteCommandAsync();
|
var row = await _db.Insertable(wmsCarryD).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";
|
||||||
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
|
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
|
||||||
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
|
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
|
||||||
|
//更新载具绑定条码表
|
||||||
for (int i = 0; i < items.Count; i++)
|
for (int i = 0; i < items.Count; i++)
|
||||||
{
|
{
|
||||||
WmsCarrybindCode wmsCarrybindCode = new();
|
WmsCarrybindCode wmsCarrybindCode = new();
|
||||||
|
|||||||
@@ -65,8 +65,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
|
|
||||||
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTKPDA_ID, true);
|
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTKPDA_ID, true);
|
||||||
await _runService.Create(templateEntity, input);
|
await _runService.Create(templateEntity, input);
|
||||||
//入库取终点
|
//出库取起点
|
||||||
//var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };
|
|
||||||
var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString());
|
var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString());
|
||||||
WmsPointH sPoint = null;
|
WmsPointH sPoint = null;
|
||||||
WmsPointH ePoint = null;
|
WmsPointH ePoint = null;
|
||||||
|
|||||||
@@ -66,11 +66,11 @@ namespace Tnb.WarehouseMgr
|
|||||||
var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_id"]?.ToString() : "";
|
var subCarryId = input.data.ContainsKey("membercarry_id") ? input.data["membercarry_id"]?.ToString() : "";
|
||||||
var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == carryId);
|
var carry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == carryId);
|
||||||
var subCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == subCarryId);
|
var subCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == subCarryId);
|
||||||
//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 == carryId && it.membercarry_id == subCarryId).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();
|
var items = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == subCarryId).ToListAsync();
|
||||||
|
//更新载具解绑记录
|
||||||
WmsCarryunbindCode wmsCarryUnbindCode = new();
|
WmsCarryunbindCode wmsCarryUnbindCode = new();
|
||||||
for (int i = 0; i < items.Count; i++)
|
for (int i = 0; i < items.Count; i++)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -68,9 +68,6 @@ namespace Tnb.WarehouseMgr
|
|||||||
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID, true);
|
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYOUTSTKPDA_ID, true);
|
||||||
await _runService.Create(templateEntity, input);
|
await _runService.Create(templateEntity, input);
|
||||||
|
|
||||||
/*//入库取终点
|
|
||||||
var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 };
|
|
||||||
var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);*/
|
|
||||||
//判断目标库位是否自动签收
|
//判断目标库位是否自动签收
|
||||||
var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString());
|
var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsPointH.location_id)].ToString());
|
||||||
|
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
|
var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carryId).ToListAsync();
|
||||||
if (carry != null && feedBox != null)
|
if (carry != null && feedBox != null)
|
||||||
{
|
{
|
||||||
|
//更新投料箱
|
||||||
feedBox.material_id = carryMaterial.material_id;
|
feedBox.material_id = carryMaterial.material_id;
|
||||||
feedBox.material_code = carryMaterial.material_code;
|
feedBox.material_code = carryMaterial.material_code;
|
||||||
feedBox.qty = carryMaterial.qty;
|
feedBox.qty = carryMaterial.qty;
|
||||||
@@ -89,6 +90,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
feedBox.create_id = _userManager.UserId;
|
feedBox.create_id = _userManager.UserId;
|
||||||
feedBox.create_time = DateTime.Now;
|
feedBox.create_time = DateTime.Now;
|
||||||
var row = await _db.Updateable(feedBox).ExecuteCommandAsync();
|
var row = await _db.Updateable(feedBox).ExecuteCommandAsync();
|
||||||
|
//更新投料记录条码表
|
||||||
foreach (var carryCode in carryCodes)
|
foreach (var carryCode in carryCodes)
|
||||||
{
|
{
|
||||||
WmsFeedingrecordCode wmsFeedingrecordCode = new();
|
WmsFeedingrecordCode wmsFeedingrecordCode = new();
|
||||||
@@ -106,6 +108,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
wmsFeedingrecordCode.create_time = DateTime.Now;
|
wmsFeedingrecordCode.create_time = DateTime.Now;
|
||||||
row = await _db.Insertable(wmsFeedingrecordCode).ExecuteCommandAsync();
|
row = await _db.Insertable(wmsFeedingrecordCode).ExecuteCommandAsync();
|
||||||
}
|
}
|
||||||
|
//更新载具
|
||||||
row = await UpdateNullCarry(carry);
|
row = await UpdateNullCarry(carry);
|
||||||
isOk = (row > 0);
|
isOk = (row > 0);
|
||||||
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
|
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
|
||||||
|
|||||||
Reference in New Issue
Block a user