diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index e4fe4588..74b6d863 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -494,18 +494,36 @@ namespace Tnb.ProductionMgr .SetColumns(x => x.carry_status == ((int)EnumCarryStatus.空闲).ToString()) .Where(x => x.carry_code==input.carry_code) .ExecuteCommandAsync(); - - - Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result = await _wmsCarryUnbindService.CarryCodeUnbind(new CarryCodeUnbindInput() + + + if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID) { - carry_id = detail.member_carry_id - }); + Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result = await _wmsCarryUnbindService.CarryCodeUnbind(new CarryCodeUnbindInput() + { + carry_id = carry.id + }); - if (result.code != JNPF.Common.Enums.HttpStatusCode.OK) - { - throw Oops.Bah(result.msg); + if (result.code != JNPF.Common.Enums.HttpStatusCode.OK) + { + throw Oops.Bah(result.msg); + } } + else + { + Tnb.WarehouseMgr.Entities.Dto.Outputs.Result result = await _wmsCarryUnbindService.CarryCodeUnbind(new CarryCodeUnbindInput() + { + carry_id = detail.member_carry_id + }); + + + if (result.code != JNPF.Common.Enums.HttpStatusCode.OK) + { + throw Oops.Bah(result.msg); + } + } + + } } }