Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

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

@@ -2223,6 +2223,16 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             if (bool1 && bool2) {
                 String blanckId = apsProcessOperationDo.getBlankid();
+                //取消第一道
+                if (StringUtils.isBlank(apsProcessOperationDo.getPreviousprocessid())) {
+                    //赋值坯料计划冗余字段 是否待领料
+                    String isWaitGetMaterial = apsBlankOrderDao.selectIsWaitGetMaterialById(blanckId);
+                    ApsBlankOrderDo apsBlankOrderDo = new ApsBlankOrderDo();
+                    apsBlankOrderDo.setId(blanckId);
+                    apsBlankOrderDo.setIswaitgetmaterial(isWaitGetMaterial);
+                    apsBlankOrderService.updateById(apsBlankOrderDo);
+                }
+
                 List<String> blankIds = Arrays.asList(blanckId.split(","));
                 List<ApsProcessOperationDo> apsProcessOperationList = apsProcessOperationService.getBaseMapper().selectList(new QueryWrapper<ApsProcessOperationDo>().lambda().eq(ApsProcessOperationDo::getBlankid, blanckId));
                 List<String> processIds = apsProcessOperationList.stream().map(ApsProcessOperationDo::getId).collect(Collectors.toList());