Browse Source

aps-排程期间可以发布和撤回发布坯料计划

sucheng 4 months ago
parent
commit
d759637a3b

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

@@ -200,11 +200,14 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R publish(List<String> blankIds) {
-        ApsUtils.checkScheduling(null);
         if (blankIds == null || blankIds.isEmpty()) {
             log.debug("坯料计划为空");
             return R.error("坯料计划id 必传");
         }
+        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        for (String blankId : blankIds) {
+            ApsUtils.checkSchedulingByBlankId(currentUser, blankId);
+        }
         // 校验是否存在冲突的工序作业明细
         int i = this.baseMapper.checkConflictByBlankId(blankIds);
         if (i != 0) {
@@ -299,11 +302,14 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R publishCancel(List<String> blankIds) {
-        ApsUtils.checkScheduling(null);
         if (blankIds == null || blankIds.isEmpty()) {
             log.debug("坯料计划为空");
             return R.error("坯料计划id 必传");
         }
+        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+        for (String blankId : blankIds) {
+            ApsUtils.checkSchedulingByBlankId(currentUser, blankId);
+        }
         List<String> productionOrderIds = new ArrayList<>();
         // 虚幻坯料计划
         blankIds.forEach(blankId -> {