退料修改

1 month ago · d69d0205aa
1 changed files with 1 additions and 1 deletions
--- 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());