PTR替换数量

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java

@@ -94,6 +94,9 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
     @Autowired
     private  MesWorkCenterRepository workCenterRao;
 
+    @Autowired
+    private MesPartPtrDetailRepository partPtrDetailRao;
+
     @Override
     public void execute(MesPartProdGroup partProdGroup, List<MesCustSortInfo> sortInfoList, List<MesPartProdGroupDetail> details) {
         try {
@@ -422,6 +425,19 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
                         isModifyPOrder = true;
                     }
                     //更新mes_part_ptr的实际数量 + 1
+                   mesPartPtr.setPrtVehicleActualCount(mesPartPtr.getPrtVehicleActualCount() + 1);
+                    ConvertBean.saveOrUpdate(mesPartPtr,"JOB");
+                    partPtrRao.update(mesPartPtr);
+                    DdlPackBean partPtrDetailPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+                    DdlPreparedPack.getNumEqualPack(mesPartPtr.getId(),"ptrId",partPtrDetailPackBean);
+                    DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(),"totalPartNo",partPtrDetailPackBean);
+                    List<MesPartPtrDetail> partPtrDetailList = partPtrDetailRao.findByHqlWhere(partPtrDetailPackBean);
+                    if (!partPtrDetailList.isEmpty()){
+                        MesPartPtrDetail mesPartPtrDetail = partPtrDetailList.get(0);
+                        mesPartPtrDetail.setQty(mesPartPtrDetail.getQty() + 1);
+                        ConvertBean.saveOrUpdate(mesPartPtrDetail,"JOB");
+                        partPtrDetailRao.update(mesPartPtrDetail);
+                    }
                     //更新mes_part_ptr_detail 的workOrder.partNo  数量加 1 ;替换了几次还是什么
                 }
             }
@@ -797,7 +813,9 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         DdlPreparedPack.getStringBiggerPack(TimeTool.getNowTime("yyyy-MM-dd HH:mm:ss"), "endTime", partPtrPackBean);
         DdlPreparedPack.getIsNotNull("prtVehicleCount", partPtrPackBean);
         List<MesPartPtr> partPtrList = partPtrRao.findByHqlWhere(partPtrPackBean);
-        partPtrList = partPtrList.stream().filter(item -> item.getPrtVehicleCount() != null && item.getPrtVehicleCount() > 0).collect(Collectors.toList());
+        partPtrList = partPtrList.stream().filter(item -> item.getPrtVehicleCount() != null && item.getPrtVehicleCount() > 0)
+                .filter(item-> item.getPrtVehicleCount() > item.getPrtVehicleActualCount())
+                .collect(Collectors.toList());
         return partPtrList;
     }
     //根据排序信息PTR零件号 获取 ptr信息