Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
This commit is contained in:
@@ -18,10 +18,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 载具ID
|
/// 载具ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string carryId { get; set; }
|
public string carryId { get; set; }
|
||||||
/// <summary>
|
|
||||||
/// 服务模块
|
|
||||||
/// </summary>
|
|
||||||
public string serviceModule { get; set; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using JNPF.Common.Contracts;
|
using JNPF.Common.Contracts;
|
||||||
using JNPF.Common.Security;
|
using JNPF.Common.Security;
|
||||||
using SqlSugar;
|
using SqlSugar;
|
||||||
|
using SqlSugar.DbConvert;
|
||||||
|
|
||||||
namespace Tnb.WarehouseMgr.Entities;
|
namespace Tnb.WarehouseMgr.Entities;
|
||||||
|
|
||||||
@@ -42,7 +43,7 @@ public partial class WmsCarryH : BaseEntity<string>
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 载具状态
|
/// 载具状态
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string carry_status { get; set; }
|
public int carry_status { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 载具分类ID
|
/// 载具分类ID
|
||||||
|
|||||||
@@ -13,5 +13,5 @@ public partial class WmsDistaskH
|
|||||||
/// 载具状态
|
/// 载具状态
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[SugarColumn(IsIgnore = true)]
|
[SugarColumn(IsIgnore = true)]
|
||||||
public string carry_status { get; set; }
|
public int carry_status { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -446,11 +446,11 @@ namespace Tnb.WarehouseMgr
|
|||||||
for (int i = 0; i < multis.Count; i++)
|
for (int i = 0; i < multis.Count; i++)
|
||||||
{
|
{
|
||||||
var carryStatus = multis[i].carry_status;
|
var carryStatus = multis[i].carry_status;
|
||||||
if (multis[i].carry_status == "0")
|
if (multis[i].carry_status == (int)EnumCarryStatus.空闲)
|
||||||
{
|
{
|
||||||
carryStatus = "1";
|
carryStatus = (int)EnumCarryStatus.空闲;
|
||||||
}
|
}
|
||||||
await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = carryStatus, is_lock = 0 }).Where(it => it.id == multis[i].endlocation_id).ExecuteCommandAsync();
|
await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = carryStatus.ToString(), is_lock = 0 }).Where(it => it.id == multis[i].endlocation_id).ExecuteCommandAsync();
|
||||||
}
|
}
|
||||||
//更新业务主表的单据状态
|
//更新业务主表的单据状态
|
||||||
if (disTasks?.Count > 0)
|
if (disTasks?.Count > 0)
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ using Tnb.WarehouseMgr.Entities;
|
|||||||
using Tnb.WarehouseMgr.Entities.Attributes;
|
using Tnb.WarehouseMgr.Entities.Attributes;
|
||||||
using Tnb.WarehouseMgr.Entities.Consts;
|
using Tnb.WarehouseMgr.Entities.Consts;
|
||||||
using Tnb.WarehouseMgr.Entities.Dto;
|
using Tnb.WarehouseMgr.Entities.Dto;
|
||||||
|
using Tnb.WarehouseMgr.Entities.Enums;
|
||||||
using Tnb.WarehouseMgr.Interfaces;
|
using Tnb.WarehouseMgr.Interfaces;
|
||||||
|
|
||||||
namespace Tnb.WarehouseMgr
|
namespace Tnb.WarehouseMgr
|
||||||
@@ -69,9 +70,9 @@ namespace Tnb.WarehouseMgr
|
|||||||
var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId);
|
var subCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == subCarryId);
|
||||||
if (carry != null && subCarry != null)
|
if (carry != null && subCarry != null)
|
||||||
{
|
{
|
||||||
carry.carry_status = "1";
|
carry.carry_status = (int)EnumCarryStatus.占用;
|
||||||
var row = await _db.Updateable(carry).ExecuteCommandAsync();
|
var row = await _db.Updateable(carry).ExecuteCommandAsync();
|
||||||
subCarry.carry_status = "1";
|
subCarry.carry_status = (int)EnumCarryStatus.占用;
|
||||||
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
|
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
|
||||||
//更新载具明细表
|
//更新载具明细表
|
||||||
WmsCarryD wmsCarryD = new()
|
WmsCarryD wmsCarryD = new()
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
carryObj.status = 0;
|
carryObj.status = 0;
|
||||||
carryObj.carry_status = "0";
|
carryObj.carry_status = (int)EnumCarryStatus.空闲;
|
||||||
carryObj.location_id = null;
|
carryObj.location_id = null;
|
||||||
carryObj.location_code = null;
|
carryObj.location_code = null;
|
||||||
carryObj.out_status = "0";
|
carryObj.out_status = "0";
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ using Tnb.WarehouseMgr.Entities;
|
|||||||
using Tnb.WarehouseMgr.Entities.Attributes;
|
using Tnb.WarehouseMgr.Entities.Attributes;
|
||||||
using Tnb.WarehouseMgr.Entities.Consts;
|
using Tnb.WarehouseMgr.Entities.Consts;
|
||||||
using Tnb.WarehouseMgr.Entities.Dto;
|
using Tnb.WarehouseMgr.Entities.Dto;
|
||||||
|
using Tnb.WarehouseMgr.Entities.Enums;
|
||||||
using Tnb.WarehouseMgr.Interfaces;
|
using Tnb.WarehouseMgr.Interfaces;
|
||||||
|
|
||||||
namespace Tnb.WarehouseMgr
|
namespace Tnb.WarehouseMgr
|
||||||
@@ -91,9 +92,9 @@ namespace Tnb.WarehouseMgr
|
|||||||
wmsCarryUnbindCode.create_time = DateTime.Now;
|
wmsCarryUnbindCode.create_time = DateTime.Now;
|
||||||
row = await _db.Insertable(wmsCarryUnbindCode).ExecuteCommandAsync();
|
row = await _db.Insertable(wmsCarryUnbindCode).ExecuteCommandAsync();
|
||||||
}
|
}
|
||||||
carry.carry_status = "0";
|
carry.carry_status = (int)EnumCarryStatus.空闲;
|
||||||
row = await _db.Updateable(carry).ExecuteCommandAsync();
|
row = await _db.Updateable(carry).ExecuteCommandAsync();
|
||||||
subCarry.carry_status = "0";
|
subCarry.carry_status = (int)EnumCarryStatus.空闲;
|
||||||
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
|
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
|
||||||
isOk = (row > 0);
|
isOk = (row > 0);
|
||||||
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
|
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsDelivery.startlocation_id)].ToString());
|
var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == input.data[nameof(WmsDelivery.startlocation_id)].ToString());
|
||||||
{
|
{
|
||||||
//载具加锁,增加库位信息
|
//载具加锁,增加库位信息
|
||||||
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { carry_status = ((int)EnumCarryStatus.占用).ToString(),
|
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { carry_status = (int)EnumCarryStatus.占用,
|
||||||
is_lock = 1, location_id = input.data[nameof(WmsDelivery.startlocation_id)].ToString(), location_code = location.location_code}).Where(it => it.id == input.data[nameof(WmsDelivery.carry_id)].ToString()).ExecuteCommandAsync();
|
is_lock = 1, location_id = input.data[nameof(WmsDelivery.startlocation_id)].ToString(), location_code = location.location_code}).Where(it => it.id == input.data[nameof(WmsDelivery.carry_id)].ToString()).ExecuteCommandAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
var setQty = await _db.Queryable<WmsEmptyOutstockH>().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)].ToString());
|
var setQty = await _db.Queryable<WmsEmptyOutstockH>().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)].ToString());
|
||||||
var carrys = await _db.Queryable<WmsCarryH>().LeftJoin<BasLocation>((a, b) => a.location_id == b.id)
|
var carrys = await _db.Queryable<WmsCarryH>().LeftJoin<BasLocation>((a, b) => a.location_id == b.id)
|
||||||
.Where((a, b) => a.carrystd_id == input.data[nameof(WmsEmptyOutstockH.carrystd_id)].ToString()
|
.Where((a, b) => a.carrystd_id == input.data[nameof(WmsEmptyOutstockH.carrystd_id)].ToString()
|
||||||
&& a.carry_status == "0" && a.is_lock == 0 && b.is_lock == 0)
|
&& a.carry_status == (int)EnumCarryStatus.空闲 && a.is_lock == 0 && b.is_lock == 0)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
WmsPointH sPoint = null;
|
WmsPointH sPoint = null;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ using Tnb.WarehouseMgr.Entities;
|
|||||||
using Tnb.WarehouseMgr.Entities.Attributes;
|
using Tnb.WarehouseMgr.Entities.Attributes;
|
||||||
using Tnb.WarehouseMgr.Entities.Consts;
|
using Tnb.WarehouseMgr.Entities.Consts;
|
||||||
using Tnb.WarehouseMgr.Entities.Dto;
|
using Tnb.WarehouseMgr.Entities.Dto;
|
||||||
|
using Tnb.WarehouseMgr.Entities.Enums;
|
||||||
using Tnb.WarehouseMgr.Interfaces;
|
using Tnb.WarehouseMgr.Interfaces;
|
||||||
|
|
||||||
namespace Tnb.WarehouseMgr
|
namespace Tnb.WarehouseMgr
|
||||||
@@ -83,9 +84,9 @@ namespace Tnb.WarehouseMgr
|
|||||||
create_time = DateTime.Now
|
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 = (int)EnumCarryStatus.占用;
|
||||||
row = await _db.Updateable(carry).ExecuteCommandAsync();
|
row = await _db.Updateable(carry).ExecuteCommandAsync();
|
||||||
subCarry.carry_status = "1";
|
subCarry.carry_status = (int)EnumCarryStatus.占用;
|
||||||
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();
|
||||||
//更新载具绑定条码表
|
//更新载具绑定条码表
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ using Tnb.WarehouseMgr.Entities;
|
|||||||
using Tnb.WarehouseMgr.Entities.Attributes;
|
using Tnb.WarehouseMgr.Entities.Attributes;
|
||||||
using Tnb.WarehouseMgr.Entities.Consts;
|
using Tnb.WarehouseMgr.Entities.Consts;
|
||||||
using Tnb.WarehouseMgr.Entities.Dto;
|
using Tnb.WarehouseMgr.Entities.Dto;
|
||||||
|
using Tnb.WarehouseMgr.Entities.Enums;
|
||||||
using Tnb.WarehouseMgr.Interfaces;
|
using Tnb.WarehouseMgr.Interfaces;
|
||||||
|
|
||||||
namespace Tnb.WarehouseMgr
|
namespace Tnb.WarehouseMgr
|
||||||
@@ -90,9 +91,9 @@ namespace Tnb.WarehouseMgr
|
|||||||
wmsCarryUnbindCode.create_time = DateTime.Now;
|
wmsCarryUnbindCode.create_time = DateTime.Now;
|
||||||
row = await _db.Insertable(wmsCarryUnbindCode).ExecuteCommandAsync();
|
row = await _db.Insertable(wmsCarryUnbindCode).ExecuteCommandAsync();
|
||||||
}
|
}
|
||||||
carry.carry_status = "0";
|
carry.carry_status = (int)EnumCarryStatus.空闲;
|
||||||
row = await _db.Updateable(carry).ExecuteCommandAsync();
|
row = await _db.Updateable(carry).ExecuteCommandAsync();
|
||||||
subCarry.carry_status = "0";
|
subCarry.carry_status = (int)EnumCarryStatus.空闲;
|
||||||
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
|
row = await _db.Updateable(subCarry).ExecuteCommandAsync();
|
||||||
isOk = (row > 0);
|
isOk = (row > 0);
|
||||||
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
|
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
//载具加锁,增加库位信息
|
//载具加锁,增加库位信息
|
||||||
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH
|
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH
|
||||||
{
|
{
|
||||||
carry_status = ((int)EnumCarryStatus.占用).ToString(),
|
carry_status = (int)EnumCarryStatus.占用,
|
||||||
is_lock = 1,
|
is_lock = 1,
|
||||||
location_id = input.data[nameof(WmsDelivery.startlocation_id)].ToString(),
|
location_id = input.data[nameof(WmsDelivery.startlocation_id)].ToString(),
|
||||||
location_code = location.location_code
|
location_code = location.location_code
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
var setQty = await _db.Queryable<WmsEmptyOutstockH>().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)].ToString());
|
var setQty = await _db.Queryable<WmsEmptyOutstockH>().FirstAsync(it => it.bill_code == input.data[nameof(WmsEmptyOutstockH.bill_code)].ToString());
|
||||||
var carrys = await _db.Queryable<WmsCarryH>().LeftJoin<BasLocation>((a, b) => a.location_id == b.id)
|
var carrys = await _db.Queryable<WmsCarryH>().LeftJoin<BasLocation>((a, b) => a.location_id == b.id)
|
||||||
.Where((a, b) => a.carrystd_id == input.data[nameof(WmsEmptyOutstockH.carrystd_id)].ToString()
|
.Where((a, b) => a.carrystd_id == input.data[nameof(WmsEmptyOutstockH.carrystd_id)].ToString()
|
||||||
&& a.carry_status == "0" && a.is_lock == 0 && b.is_lock == 0)
|
&& a.carry_status ==(int)EnumCarryStatus.空闲 && a.is_lock == 0 && b.is_lock == 0)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
WmsPointH sPoint = null;
|
WmsPointH sPoint = null;
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
carryObj.status = 0;
|
carryObj.status = 0;
|
||||||
carryObj.carry_status = "0";
|
carryObj.carry_status = (int)EnumCarryStatus.空闲;
|
||||||
carryObj.location_id = null;
|
carryObj.location_id = null;
|
||||||
carryObj.location_code = null;
|
carryObj.location_code = null;
|
||||||
carryObj.out_status = "0";
|
carryObj.out_status = "0";
|
||||||
|
|||||||
@@ -239,7 +239,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
await _db.Insertable(carryCodes).ExecuteCommandAsync();
|
await _db.Insertable(carryCodes).ExecuteCommandAsync();
|
||||||
await _db.Insertable(instockCOdes).CallEntityMethod(it => it.Create(orgId)).ExecuteCommandAsync();
|
await _db.Insertable(instockCOdes).CallEntityMethod(it => it.Create(orgId)).ExecuteCommandAsync();
|
||||||
await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
|
await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
|
||||||
it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString()!, is_lock = 1, carry_status = ((int)EnumCarryStatus.占用).ToString(), location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode },
|
it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString()!, is_lock = 1, carry_status = (int)EnumCarryStatus.占用, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode },
|
||||||
it => new BasLocation { is_lock = 1, is_use = "1" });
|
it => new BasLocation { is_lock = 1, is_use = "1" });
|
||||||
if (instockCOdes?.Count > 0)
|
if (instockCOdes?.Count > 0)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
|
|
||||||
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,
|
||||||
it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode, carry_status = ((int)EnumCarryStatus.寄存).ToString(), bale_num = baleNum },
|
it => new WmsCarryH { is_lock = 1, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode, carry_status = (int)EnumCarryStatus.寄存, bale_num = baleNum },
|
||||||
it => new BasLocation { is_lock = 1 });
|
it => new BasLocation { is_lock = 1 });
|
||||||
//((int)EnumCarryStatus.寄存).ToString()
|
//((int)EnumCarryStatus.寄存).ToString()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
//载具加锁,增加库位信息
|
//载具加锁,增加库位信息
|
||||||
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH
|
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH
|
||||||
{
|
{
|
||||||
carry_status = ((int)EnumCarryStatus.占用).ToString(),
|
carry_status = (int)EnumCarryStatus.占用,
|
||||||
is_lock = 1,
|
is_lock = 1,
|
||||||
location_id = input.data[nameof(WmsTransfer.startlocation_id)].ToString(),
|
location_id = input.data[nameof(WmsTransfer.startlocation_id)].ToString(),
|
||||||
location_code = location.location_code
|
location_code = location.location_code
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
GenPreTaskUpInput genPreTaskAfterUpInput = new();
|
GenPreTaskUpInput genPreTaskAfterUpInput = new();
|
||||||
genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
|
genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
|
||||||
genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList();
|
genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList();
|
||||||
await _wareHouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1 }, it => new BasLocation { is_lock = 1 });
|
await _wareHouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1, carry_status = (int)EnumCarryStatus.齐套分拣 }, it => new BasLocation { is_use = ((int)EnumCarryStatus.齐套分拣).ToString() });
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,28 +57,40 @@ namespace Tnb.WarehouseMgr
|
|||||||
{
|
{
|
||||||
_dicBizType = await _dictionaryDataService.GetDictionaryByTypeId(WmsWareHouseConst.WMS_BIZTYPE_ID);
|
_dicBizType = await _dictionaryDataService.GetDictionaryByTypeId(WmsWareHouseConst.WMS_BIZTYPE_ID);
|
||||||
}
|
}
|
||||||
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.carryId);
|
try
|
||||||
if (carry != null)
|
|
||||||
{
|
{
|
||||||
var disTask = await _db.Queryable<WmsDistaskH>().SingleAsync(it => it.id == input.disTaskId);
|
await _db.Ado.BeginTranAsync();
|
||||||
if (disTask != null)
|
|
||||||
|
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.carryId);
|
||||||
|
if (carry != null)
|
||||||
{
|
{
|
||||||
if (_dicBizType.ContainsKey(disTask.biz_type))
|
var disTask = await _db.Queryable<WmsDistaskH>().SingleAsync(it => it.id == input.disTaskId);
|
||||||
|
if (disTask != null)
|
||||||
{
|
{
|
||||||
switch (_dicBizType[disTask.biz_type])
|
if (_dicBizType.ContainsKey(disTask.biz_type))
|
||||||
{
|
{
|
||||||
case "空载具出库":
|
switch (_dicBizType[disTask.biz_type])
|
||||||
case "寄存出库":
|
{
|
||||||
case "齐套出库":
|
case "空载具出库":
|
||||||
case "一般出库":
|
case "寄存出库":
|
||||||
await _wareCarryService.UpdateNullCarry(carry);
|
case "齐套出库":
|
||||||
break;
|
case "一般出库":
|
||||||
|
await _wareCarryService.UpdateNullCarry(carry);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == carry.location_id);
|
||||||
|
loc.is_use = "0";
|
||||||
|
await _db.Updateable(loc).UpdateColumns(it => it.is_use).ExecuteCommandAsync();
|
||||||
}
|
}
|
||||||
var loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == carry.location_id);
|
|
||||||
loc.is_use = "0";
|
await _db.Ado.CommitTranAsync();
|
||||||
await _db.Updateable(loc).UpdateColumns(it => it.is_use).ExecuteCommandAsync();
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
await _db.Ado.RollbackTranAsync();
|
||||||
|
throw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
//载具加锁,增加库位信息
|
//载具加锁,增加库位信息
|
||||||
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH
|
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH
|
||||||
{
|
{
|
||||||
carry_status = ((int)EnumCarryStatus.占用).ToString(),
|
carry_status = (int)EnumCarryStatus.占用,
|
||||||
is_lock = 1,
|
is_lock = 1,
|
||||||
location_id = input.data[nameof(WmsTransfer.startlocation_id)].ToString(),
|
location_id = input.data[nameof(WmsTransfer.startlocation_id)].ToString(),
|
||||||
location_code = location.location_code
|
location_code = location.location_code
|
||||||
|
|||||||
@@ -176,7 +176,7 @@ namespace Tnb.WarehouseMgr
|
|||||||
var subCarrys = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == ko.carry_id).ToListAsync();
|
var subCarrys = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == ko.carry_id).ToListAsync();
|
||||||
var carryIds = subCarrys.Select(x => x.carry_id).Concat(new[] { ko.carry_id }).Distinct().ToList();
|
var carryIds = subCarrys.Select(x => x.carry_id).Concat(new[] { ko.carry_id }).Distinct().ToList();
|
||||||
GenPreTaskUpInput genPreTaskInput = new() { CarryIds = carryIds, LocationIds = new List<string> { carry.location_id, ko.location_id } };
|
GenPreTaskUpInput genPreTaskInput = new() { CarryIds = carryIds, LocationIds = new List<string> { carry.location_id, ko.location_id } };
|
||||||
await _warehouseService.GenInStockTaskHandleAfter(genPreTaskInput, it => new WmsCarryH { is_lock = 1, carry_status = ((int)EnumCarryStatus.齐套).ToString() }, it => new BasLocation { is_lock = 1 });
|
await _warehouseService.GenInStockTaskHandleAfter(genPreTaskInput, it => new WmsCarryH { is_lock = 1, carry_status = (int)EnumCarryStatus.齐套 }, it => new BasLocation { is_lock = 1 });
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user