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

bug

Browse Source
This commit is contained in:
周科达
2024-06-26 15:12:15 +08:00
parent 5b7e724d58
commit bcfdf31497
2 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs
View File

@@ -406,12 +406,7 @@ namespace Tnb.ProductionMgr
List<PrdMaterialReceiptH> insertHList = new List<PrdMaterialReceiptH>(); List<PrdMaterialReceiptH> insertHList = new List<PrdMaterialReceiptH>();
List<PrdMaterialReceiptD> insertDList = new List<PrdMaterialReceiptD>(); List<PrdMaterialReceiptD> insertDList = new List<PrdMaterialReceiptD>();
string orgId = WmsWareHouseConst.AdministratorOrgId; string orgId = WmsWareHouseConst.AdministratorOrgId;
string userId = WmsWareHouseConst.AdministratorUserId; string userId = moTask.worker_id;
if (_userManager != null && _userManager.GetUserInfo() != null && _userManager.GetUserInfo().Result!=null)
{
orgId = _userManager.GetUserInfo().Result.organizeId;
userId = _userManager.UserId;
}
foreach(string carryId in input.carryIds) foreach(string carryId in input.carryIds)
{ {
WmsCarryH carry = await db.Queryable<WmsCarryH>().SingleAsync(x => x.id == carryId); WmsCarryH carry = await db.Queryable<WmsCarryH>().SingleAsync(x => x.id == carryId);

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

@@ -74,8 +74,6 @@ namespace Tnb.WarehouseMgr
} }
CarryQueryOutput data = new(); CarryQueryOutput data = new();
try
{
WmsCarryH carry = await _db.Queryable<WmsCarryH>().FirstAsync(a => a.carry_code == input.carry_code && a.status == 1); WmsCarryH carry = await _db.Queryable<WmsCarryH>().FirstAsync(a => a.carry_code == input.carry_code && a.status == 1);
if (carry.IsNull()) if (carry.IsNull())
{ {
@@ -117,12 +115,6 @@ namespace Tnb.WarehouseMgr
} }
data = carry.Adapt<CarryQueryOutput>(); data = carry.Adapt<CarryQueryOutput>();
data.wmsCarryCodes = carryCodes.Adapt<List<CarryCodeQueryOutput>>(); data.wmsCarryCodes = carryCodes.Adapt<List<CarryCodeQueryOutput>>();
}
catch (Exception)
{
await _db.Ado.RollbackTranAsync();
throw;
}
return data; return data;
} }
} }