diff --git a/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java b/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java index 48aa369..8b3615f 100644 --- a/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java +++ b/src/main/java/com/gaotao/modules/production/service/impl/ProductionReturnServiceImpl.java @@ -587,7 +587,7 @@ public class ProductionReturnServiceImpl implements ProductionReturnService { newEngChgLevel = "1"; }else{ for(AnInventoryPartInStockVo vo:partInStock){ - if(vo.getPartNo().equals(request.getPartNo()) && vo.getLotBatchNo().equals(request.getBatchNo()) && vo.getLocationNo().equals(request.getLocationId())){ + if(vo.getContract().equals(request.getSite()) && vo.getPartNo().equals(request.getPartNo()) && vo.getLotBatchNo().equals(request.getBatchNo()) && vo.getLocationNo().equals(request.getLocationId())){ newReceiveDate = sdf.parse(vo.getReceiptDate()); newManufactureDate = sdf.parse(vo.getReceiptDate()); newExpireData = sdf.parse(vo.getExpirationDate());