Преглед на файлове

feature 解锁时 将坯料计划排程状态改为待发布

xiahan преди 1 година
родител
ревизия
ce38955c0f
променени са 1 файла, в които са добавени 8 реда и са изтрити 1 реда
  1. 8 1
      cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

+ 8 - 1
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -71,6 +71,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     @Autowired
     private ApsBlankOrderDao apsBlankOrderDao;
     @Autowired
+    private ApsBlankOrderService apsBlankOrderService;
+    @Autowired
     private ApsProcessOperationProcessEquServiceImpl processOperationProcessEquService;
     @Autowired
     private ApsScheduleConfigService apsScheduleConfigService;
@@ -412,11 +414,16 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         processOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
                 .set(ApsProcessOperationProcessEquDo::getLockmark, lockMark)
                 .in(ApsProcessOperationProcessEquDo::getBlankid, blackOrderId));
+        // 解锁
         if (LOCKMARK_N.equals(lockMark)) {
             // 更新坯料计划对应工序作业的生产状态为待发布
             apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
                     .in(ApsProcessOperationDo::getBlankid, blackOrderId)
-                    .set(ApsProcessOperationDo::getProcessstatus, "20"));
+                    .set(ApsProcessOperationDo::getProcessstatus, "20")
+            );
+            apsBlankOrderService.update(new LambdaUpdateWrapper<ApsBlankOrderDo>()
+                    .eq(ApsBlankOrderDo::getId,blackOrderId)
+                    .set(ApsBlankOrderDo::getSchedulingstatus,"20"));
         }
         // 回传坯料计划ID 用于前段更新锁定状态
         return R.ok(blackOrderId);