取消作业

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -1963,13 +1963,13 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             map.put("MAINID", apsProcessOperationDo.getId());
             List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDos = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
             for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
-                apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + (curcancelroll * apsProcessOperationOutMaterDo.getPlanrollnum() / apsProcessOperationDo.getPlanprocessrall()));
-                apsProcessOperationOutMaterDo.setProdcancelroll(apsProcessOperationOutMaterDo.getProdcancelroll() + (curcancelroll * apsProcessOperationOutMaterDo.getPlanprodrollnum() / apsProcessOperationDo.getPlanprocessrall()));
-                apsProcessOperationOutMaterDo.setProdleaveoutroll(apsProcessOperationOutMaterDo.getProdleaveoutroll() - (curcancelroll * apsProcessOperationOutMaterDo.getPlanprodrollnum() / apsProcessOperationDo.getPlanprocessrall()));
-                apsProcessOperationOutMaterDo.setStockcancelroll(apsProcessOperationOutMaterDo.getStockcancelroll() + (curcancelroll * apsProcessOperationOutMaterDo.getPlanstockrollnum() / apsProcessOperationDo.getPlanprocessrall()));
-                apsProcessOperationOutMaterDo.setStockleaveoutroll(apsProcessOperationOutMaterDo.getStockleaveoutroll() - (curcancelroll * apsProcessOperationOutMaterDo.getPlanstockrollnum() / apsProcessOperationDo.getPlanprocessrall()));
-                apsProcessOperationOutMaterDo.setMovecancelroll(apsProcessOperationOutMaterDo.getMovecancelroll() + (curcancelroll * apsProcessOperationOutMaterDo.getPlanmoverollnum() / apsProcessOperationDo.getPlanprocessrall()));
-                apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getMoveleaveoutroll() - (curcancelroll * apsProcessOperationOutMaterDo.getPlanmoverollnum() / apsProcessOperationDo.getPlanprocessrall()));
+                apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+                apsProcessOperationOutMaterDo.setProdcancelroll(apsProcessOperationOutMaterDo.getProdcancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanprodrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+                apsProcessOperationOutMaterDo.setProdleaveoutroll(apsProcessOperationOutMaterDo.getProdleaveoutroll() - ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanprodrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+                apsProcessOperationOutMaterDo.setStockcancelroll(apsProcessOperationOutMaterDo.getStockcancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanstockrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+                apsProcessOperationOutMaterDo.setStockleaveoutroll(apsProcessOperationOutMaterDo.getStockleaveoutroll() - ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanstockrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+                apsProcessOperationOutMaterDo.setMovecancelroll(apsProcessOperationOutMaterDo.getMovecancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanmoverollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+                apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getMoveleaveoutroll() - ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanmoverollnum()) / apsProcessOperationDo.getPlanprocessrall())));
 
 
 //                Integer curOutMaterCancelRoll = curcancelroll;//输出物料本次取消卷数
@@ -2041,7 +2041,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     cancelProcessOperationVo1.setCraftrouteid(craftrouteid);
                     cancelProcessOperationVo1.setSetincancelroll(false);
                     cancelProcessOperationVo1.setUpdatecuropration(false);
-                    Integer nextCurCancelRoll = curcancelroll * processOperationDo.getPlanprocessrall() / apsProcessOperationDo.getPlanprocessrall();
+                    Integer nextCurCancelRoll = (int) Math.floor((double) (curcancelroll * processOperationDo.getPlanprocessrall()) / apsProcessOperationDo.getPlanprocessrall());
                     cancelProcessOperationVo1.setCurcancelroll(nextCurCancelRoll);
                     processOperationDo.setInputunqualifiedroll(processOperationDo.getInputunqualifiedroll() + nextCurCancelRoll);
                     cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);
@@ -2167,7 +2167,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         if (StringUtils.isNotBlank(processOperationProcessEquDo.getNextprocessesids())) {
             List<ApsProcessOperationProcessEquDo> processOperationProcessEquDos = apsProcessOperationDao.getNextProcessOperationEqus(processOperationProcessEquDo.getNextprocessesids().replace(",", "','"));
             for (ApsProcessOperationProcessEquDo processOperationEquDo : processOperationProcessEquDos) {
-                cancelProcessOperationEqu(curEquCancelRoll * processOperationEquDo.getPlanprocessrall() / processOperationProcessEquDo.getPlanprocessrall(), apsProcessOperationDo, processOperationEquDo);
+                cancelProcessOperationEqu((int) Math.floor((double) (curEquCancelRoll * processOperationEquDo.getPlanprocessrall()) / processOperationProcessEquDo.getPlanprocessrall()), apsProcessOperationDo, processOperationEquDo);
             }
         }