diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index dec6060e..88d7cdd6 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -477,6 +477,11 @@ namespace Tnb.ProductionMgr // .Where(x => x.carry_id == detail.member_carry_id) // .ExecuteCommandAsync(); + await db.Updateable() + .SetColumns(x => x.carry_status == ((int)EnumCarryStatus.空闲).ToString()) + .Where(x => x.id==detail.member_carry_id) + .ExecuteCommandAsync(); + Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result = await _wmsCarryUnbindService.CarryCodeUnbind(new CarryCodeUnbindInput() { carry_id = detail.member_carry_id @@ -517,7 +522,8 @@ namespace Tnb.ProductionMgr List dList = await db.Queryable() .Where(x => x.material_receipt_id == prdMaterialReceiptH.id).ToListAsync(); - List carryIds = dList.Select(x => x.member_carry_id).ToList(); + //List carryIds = dList.Select(x => x.member_carry_id).ToList(); + List carryIds = new List(); carryIds.Add(prdMaterialReceiptH.carry_id); // foreach (var item in dList) // { diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 583e4008..5a996e9b 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1697,12 +1697,12 @@ namespace Tnb.ProductionMgr { // if (dic.TryGetValue(prdMoTask.workline_id, out string value)) // { - materialBoxCode = await _redisData.GetHash("value", "WBZX_x1_take_tp"); - if (materialBoxCode == null || materialBoxCode.IsEmpty()) - { - throw Oops.Bah("托盘条码信息未空"); - } - report.material_box_code = materialBoxCode; + // materialBoxCode = await _redisData.GetHash("value", "WBZX_x1_take_tp"); + // if (materialBoxCode == null || materialBoxCode.IsEmpty()) + // { + // throw Oops.Bah("托盘条码信息未空"); + // } + report.material_box_code = input.material_box_code; // } // else // {