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-10-09 17:32:15 +08:00
parent 17b3ceaeda
commit 05714f027d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -608,6 +608,7 @@ namespace Tnb.ProductionMgr
List<PrdMaterialReceiptD> insertDList = new List<PrdMaterialReceiptD>(); List<PrdMaterialReceiptD> insertDList = new List<PrdMaterialReceiptD>();
List<PrdFeedingH> insertFHList = new List<PrdFeedingH>(); List<PrdFeedingH> insertFHList = new List<PrdFeedingH>();
List<PrdFeedingD> insertFDList = new List<PrdFeedingD>(); List<PrdFeedingD> insertFDList = new List<PrdFeedingD>();
List<string> clearCarryIds = new List<string>();
string orgId = WmsWareHouseConst.AdministratorOrgId; string orgId = WmsWareHouseConst.AdministratorOrgId;
// string userId = moTask.worker_id; // string userId = moTask.worker_id;
string userId = WmsWareHouseConst.AdministratorUserId; string userId = WmsWareHouseConst.AdministratorUserId;
@@ -617,6 +618,7 @@ namespace Tnb.ProductionMgr
} }
foreach(string carryId in input.carryIds) foreach(string carryId in input.carryIds)
{ {
clearCarryIds.Add(carryId);
WmsCarryH carry = await db.Queryable<WmsCarryH>().SingleAsync(x => x.id == carryId); WmsCarryH carry = await db.Queryable<WmsCarryH>().SingleAsync(x => x.id == carryId);
string code = await _billRullService.GetBillNumber(Tnb.BasicData.CodeTemplateConst.MATERIAL_RECEIPT_CODE); string code = await _billRullService.GetBillNumber(Tnb.BasicData.CodeTemplateConst.MATERIAL_RECEIPT_CODE);
PrdMaterialReceiptH prdMaterialReceiptH = new PrdMaterialReceiptH() PrdMaterialReceiptH prdMaterialReceiptH = new PrdMaterialReceiptH()
@@ -676,7 +678,7 @@ namespace Tnb.ProductionMgr
memberCarrys = await db.Queryable<WmsCarryH>().Where(x=>memberCarryIds.Contains(x.id)).ToListAsync(); memberCarrys = await db.Queryable<WmsCarryH>().Where(x=>memberCarryIds.Contains(x.id)).ToListAsync();
carryCodes = await db.Queryable<WmsCarryCode>().Where(x=>memberCarryIds.Contains(x.carry_id)).ToListAsync(); carryCodes = await db.Queryable<WmsCarryCode>().Where(x=>memberCarryIds.Contains(x.carry_id)).ToListAsync();
clearCarryIds.AddRange(memberCarrys.Select(x=>x.id).ToList());
} }
if (carryCodes != null && carryCodes.Count > 0) if (carryCodes != null && carryCodes.Count > 0)
@@ -768,7 +770,7 @@ namespace Tnb.ProductionMgr
} }
if (carry.carrystd_id==WmsWareHouseConst.CARRY_LXSTD_ID) if (carry.carrystd_id==WmsWareHouseConst.CARRY_LXSTD_ID || carry.carrystd_id==WmsWareHouseConst.CARRY_LJSTD_ID)
{ {
Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result2 = await _wmsCarryUnbindService.CarryUnbind(new CarryBindInput() Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result2 = await _wmsCarryUnbindService.CarryUnbind(new CarryBindInput()
{ {
@@ -793,7 +795,7 @@ namespace Tnb.ProductionMgr
await db.Updateable<WmsCarryH>() await db.Updateable<WmsCarryH>()
.SetColumns(x => x.carry_status == ((int)EnumCarryStatus.空闲).ToString()) .SetColumns(x => x.carry_status == ((int)EnumCarryStatus.空闲).ToString())
.SetColumns(x => x.is_check == ((int)EnumCheckConclusion.待检).ToString()) .SetColumns(x => x.is_check == ((int)EnumCheckConclusion.待检).ToString())
.Where(x => input.carryIds.Contains(x.id)) .Where(x => clearCarryIds.Contains(x.id))
.ExecuteCommandAsync(); .ExecuteCommandAsync();
if (insertHList.Count <= 0 || insertDList.Count <= 0) if (insertHList.Count <= 0 || insertDList.Count <= 0)