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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-07-31 11:59:18 +08:00
parent 05dcc210bf b79ce73d42
commit 5229030165
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,8 +69,8 @@ namespace Tnb.WarehouseMgr
var data = new CarryQueryOutput(); var data = new CarryQueryOutput();
try try
{ {
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carry_code); var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carry_code && it.status == 1);
if (carry.IsNull()) throw new AppFriendlyException($"编号{input.carry_code},对应载具不存在", 500); if (carry.IsNull()) throw new AppFriendlyException($"编号{input.carry_code},对应载具不存在或被禁用", 500);
List<WmsCarryCode> carryCodes = new(); List<WmsCarryCode> carryCodes = new();
var carryDsLst = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carry.id).ToListAsync(); var carryDsLst = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carry.id).ToListAsync();
if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && carryDsLst?.Count > 0) if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && carryDsLst?.Count > 0)

3
WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
View File

@@ -104,7 +104,7 @@ namespace Tnb.WarehouseMgr
loginType = "web", loginType = "web",
bizTypeId = disTask.biz_type, bizTypeId = disTask.biz_type,
requireId = disTask!.require_id!, requireId = disTask!.require_id!,
carryIds = new List<string> { input.carryId }, carryIds = new List<string> { carry!.id },
distaskCodes = input.distaskCodes distaskCodes = input.distaskCodes
}; };
await DoUpdate(upInput); //回更业务 await DoUpdate(upInput); //回更业务
@@ -132,6 +132,7 @@ namespace Tnb.WarehouseMgr
var isSuccessFul = false; var isSuccessFul = false;
if (input.IsNull()) throw new ArgumentNullException("input"); if (input.IsNull()) throw new ArgumentNullException("input");
var signInput = input.Adapt<SignForDeliveryInput>(); var signInput = input.Adapt<SignForDeliveryInput>();
if (signInput.carryId.IsNotEmptyOrNull()) signInput.carryId = "";
try try
{ {
await SignForDelivery(signInput); await SignForDelivery(signInput);