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/ApsBlankOrderServiceImpl.java

@@ -1745,6 +1745,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
         //获取坯料计划内容
         ApsBlankOrderDo apsBlankOrderDo = req.getApsBlankOrderDo();
+
+        //如果数据库存在此坯料计划 并且 坯料计划的生产状态和数据库的生产状态不一致，提示
+        ApsBlankOrderDo newBlankOrder = this.getById(apsBlankOrderDo.getId());
+        if (ObjectUtil.isNotEmpty(newBlankOrder) && !apsBlankOrderDo.getProductstatus().equals(newBlankOrder.getProductstatus())) {
+            return R.error("该坯料计划状态已被其他人修改，请刷新页面后重新进入");
+        }
+
         //获取当前用户信息
         //获取当前用户的所属工厂
         SysUserVo currentUser = CXCommonUtils.getCurrentUser();