aps-订单评审表单校验

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProductionOrderDao.java

@@ -35,6 +35,9 @@ public interface ApsProductionOrderDao extends BaseMapper<ApsProductionOrderDo>
             "where o.DELETED='0' and (o.AUDITSTATUS='待计划评审' or o.AUDITSTATUS='待技术评审')\n" +
             "\tand ((IFNULL(o.CHANGEDATE,'')='' and TIMESTAMPDIFF(HOUR,o.ORDERDATE,NOW())>48) or (IFNULL(o.CHANGEDATE,'')!='' and TIMESTAMPDIFF(HOUR,o.CHANGEDATE,NOW())>48))")
     List<ApsProductionOrderDo> getOrderOuttimeAudit();
+
+    @Select("SELECT count(1) FROM aps_production_order apo LEFT JOIN aps_blank_order abo ON apo.ID = abo.PRODUCTIONORDERID  AND abo.DELETED = 0 LEFT JOIN aps_process_operation apo2 ON abo.ID = apo2.BLANKID  AND apo2.DELETED = 0  LEFT JOIN aps_process_operation_process_equ apope ON apo2.ID = apope.PROCESSID AND apope.DELETED = 0 WHERE apo.DELETED = 0  AND apo.ID = #{id} AND (apope.CONFLICTDES is not null or apope.CONFLICTDES != '')")
+    int selectConflictdesCount(@Param("id") String id);
 }
 
 

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

@@ -171,6 +171,11 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                     return R.error("坯料计划 " + apsBlankOrderDo.getInputreportdescribe() + " 还未排程");
                 }
             }
+            //检查该订单所有作业明细，如果存在冲突，则错误提示：请先解决冲突再发布
+            int count = this.baseMapper.selectConflictdesCount(apsProductionOrderDo.getId());
+            if (count > 0) {
+                return R.error("请先解决冲突再发布");
+            }
         }
 
         //============校验承诺交期============
@@ -248,8 +253,8 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
             checkAndSaveOrUpdateBlankReq.setApsBlankOrderDo(apsBlankOrderDoList.get(i));
             checkAndSaveOrUpdateBlankReq.setApsProcessOutputProductDoList(apsProcessOutputProductService.list(new QueryWrapper<ApsProcessOutputProductDo>().lambda().eq(ApsProcessOutputProductDo::getBlankid, apsBlankOrderDoList.get(i).getId())));
             checkAndSaveOrUpdateBlankReq.setApsProductDetailDoList(productDetailDoList);
-            R r = apsBlankOrderService.checkBlankOrder(checkAndSaveOrUpdateBlankReq, i+1);
-            if(!r.getCode().equals("200")){
+            R r = apsBlankOrderService.checkBlankOrder(checkAndSaveOrUpdateBlankReq, i + 1);
+            if (!r.getCode().equals("200")) {
                 return R.error(r.getMsg());
             }
         }

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

@@ -402,6 +402,8 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         int unfinishroll = planprocessrall - needUpdateProcessOperationProcessEquDo.getReportroll();
         if(unfinishroll <= 0 || apsProcessOperationDo.getClosestatus().equals("已完工")){
             needUpdateProcessOperationProcessEquDo.setClosestatus("已完工");
+            //已完工时更新完工时间
+            needUpdateProcessOperationProcessEquDo.setActualfinishdate(DateUtil.date());
         }
         if(unfinishroll > 0 && apsProcessOperationDo.getClosestatus().equals("未完工")){
             needUpdateProcessOperationProcessEquDo.setClosestatus("未完工");