This commit is contained in:
2024-06-28 16:27:30 +08:00
parent 8a9708ffc7
commit cf241dcd56
2 changed files with 7 additions and 7 deletions

View File

@@ -501,8 +501,8 @@ namespace Tnb.ProductionMgr
List<PrdMaterialReceiptD> dList = await db.Queryable<PrdMaterialReceiptD>() List<PrdMaterialReceiptD> dList = await db.Queryable<PrdMaterialReceiptD>()
.Where(x => x.material_receipt_id == prdMaterialReceiptH.id).ToListAsync(); .Where(x => x.material_receipt_id == prdMaterialReceiptH.id).ToListAsync();
foreach (var item in dList) // foreach (var item in dList)
{ // {
Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result2 = await _wmsCarryUnbindService.CarryUnbind(new CarryBindInput() Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result2 = await _wmsCarryUnbindService.CarryUnbind(new CarryBindInput()
{ {
org = prdFeedingH.org_id, org = prdFeedingH.org_id,
@@ -510,15 +510,15 @@ namespace Tnb.ProductionMgr
carry_id = prdMaterialReceiptH.carry_id, carry_id = prdMaterialReceiptH.carry_id,
carry_code = prdMaterialReceiptH.carry_code, carry_code = prdMaterialReceiptH.carry_code,
carrystd_id = carry.carrystd_id, carrystd_id = carry.carrystd_id,
membercarry_code = item.member_carry_code, membercarry_code = "",
membercarry_id = item.member_carry_id, membercarry_id = "",
}); });
if (result2.code != JNPF.Common.Enums.HttpStatusCode.OK) if (result2.code != JNPF.Common.Enums.HttpStatusCode.OK)
{ {
throw Oops.Bah(result2.msg); throw Oops.Bah(result2.msg);
} }
} // }
await db.Updateable<PrdMaterialReceiptH>() await db.Updateable<PrdMaterialReceiptH>()
.SetColumns(x => x.first_feed == true) .SetColumns(x => x.first_feed == true)

View File

@@ -104,7 +104,7 @@ namespace Tnb.ProductionMgr
if (await db.Queryable<PrdMaterialReceiptD>() if (await db.Queryable<PrdMaterialReceiptD>()
.AnyAsync(x => x.member_carry_code == qrCode && x.is_all_feeding == 0)) .AnyAsync(x => x.member_carry_code == qrCode && x.is_all_feeding == 0 && ids.Contains(x.material_receipt_id)))
{ {
FeedingDetailOutput result = await db.Queryable<PrdMaterialReceiptD>() FeedingDetailOutput result = await db.Queryable<PrdMaterialReceiptD>()
.LeftJoin<WmsCarryH>((a, b) => b.carry_code==qrCode) .LeftJoin<WmsCarryH>((a, b) => b.carry_code==qrCode)
@@ -134,7 +134,7 @@ namespace Tnb.ProductionMgr
{ {
FeedingDetailOutput result = await db.Queryable<PrdMaterialReceiptH>() FeedingDetailOutput result = await db.Queryable<PrdMaterialReceiptH>()
.LeftJoin<WmsCarryH>((a, b) => b.carry_code==qrCode) .LeftJoin<WmsCarryH>((a, b) => b.carry_code==qrCode)
.Where((a) => a.carry_code == qrCode) .Where((a) => a.carry_code == qrCode && ids.Contains(a.id))
.Select((a, b) => new FeedingDetailOutput .Select((a, b) => new FeedingDetailOutput
{ {
carry_id = a.carry_id, carry_id = a.carry_id,