工序优化

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

@@ -1,7 +1,9 @@
 package com.rongwei.bscommon.sys.dao;
 
-import com.rongwei.bsentity.domain.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ApsBlankOrderDo;
+import com.rongwei.bsentity.domain.ApsProcessOperationProcessEquDo;
+import com.rongwei.bsentity.domain.AspCheckItemsDo;
 import com.rongwei.bsentity.vo.ApsBlankOrderVo;
 import com.rongwei.bsentity.vo.BlankIdAndProcessStatusVo;
 import com.rongwei.bsentity.vo.WashingMetal;
@@ -36,7 +38,7 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
             "<if test='tenantId != null and tenantId != &apos;&apos;'> " +
             "  and  b.TENANTID = #{tenantId} " +
             "</if></script>")
-    List<ApsBlankOrderVo> getFbNotLock(@Param("hasIds") String hasIds,@Param("tenantId") String tenantId);
+    List<ApsBlankOrderVo> getFbNotLock(@Param("hasIds") String hasIds, @Param("tenantId") String tenantId);
 
     @Select("select a.*,b.DELIVERYDATE,b.DELIVERYTIME from aps_blank_order a LEFT JOIN aps_production_order b on a.PRODUCTIONORDERID=b.ID " +
             "where b.PRODUCTIONSTATUS='20' and (a.LOCKMARK='n' or a.LOCKMARK is null) and a.DELETED='0' and b.DELETED='0' and b.TENANTID = #{tenantId}")
@@ -48,7 +50,7 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
             "<if test='hasIds != null and hasIds != &apos;&apos;'> " +
             "    and a.ID not in (${hasIds})" +
             "</if></script>")
-    List<ApsBlankOrderVo> getOrdersHasNotLockProcess(@Param("hasIds") String hasIds,@Param("tenantId") String tenantId);
+    List<ApsBlankOrderVo> getOrdersHasNotLockProcess(@Param("hasIds") String hasIds, @Param("tenantId") String tenantId);
 
     @Select("select * FROM (\n" +
             "select PROCESSDEVICEID,PLANSTARTDATE,PLANENDDATE,GROUP_CONCAT(PROCESSID) PROCESSID from (select * from aps_process_operation_process_equ " +
@@ -56,7 +58,11 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
             ") b where b.PROCESSID like '%${processid}%'")
     List<ApsProcessOperationProcessEquDo> getGroupProcessOperationProcessEqus(@Param("processid") String processid);
 
-    @Update("update aps_blank_order set CRAFTROUTEID = #{craftrouteid} where ID=#{blankId} ")
+    @Update("update aps_blank_order o \n" +
+            "join (select ID,PRODUCTTYPE,METAL,METALSTATE,THICKSTR,THICKEND,WIDTHSTR,WIDTHEND,LENGTHSTR,LENGTHEND from aps_craft_route where DELETED ='0' and ID=#{craftrouteid}) as r on 1=1\n" +
+            "set o.CRAFTROUTEID=r.ID,o.ROUTEPRODUCTTYPEID=r.PRODUCTTYPE,o.ROUTEMETAL=r.METAL,o.ROUTEMETALSTATE=r.METALSTATE,\n" +
+            "\to.ROUTETHICKSTR=r.THICKSTR,o.ROUTETHICKEND=r.THICKEND,o.ROUTEWIDTHSTR=r.WIDTHSTR,o.ROUTEWIDTHEND=r.WIDTHEND,o.ROUTELENGTHSTR=r.LENGTHSTR,o.ROUTELENGTHEND=r.LENGTHEND\n" +
+            "where o.ID=#{blankId} ")
     void upCraftrouteId(@Param("blankId") String blankId, @Param("craftrouteid") String craftrouteid);
 
     void publish(@Param("productionOrderIds") List<String> productionOrderIds);
@@ -79,7 +85,7 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
     @Select("select BLANKID AS 'blankId',MAX(PROCESSSTATUS) AS 'maxProcessStatus',MIN(PROCESSSTATUS) AS 'minProcessStatus' from aps_process_operation where BLANKID = (select BLANKID from aps_process_operation where ID = #{productProcessId})")
     BlankIdAndProcessStatusVo selectProcessStatusByProcessId(@Param("productProcessId") String productProcessId);
 
-    List<String> getIdByLockTime(@Param("lockTime") Date LockTime,@Param("lockMark") String lockMark);
+    List<String> getIdByLockTime(@Param("lockTime") Date LockTime, @Param("lockMark") String lockMark);
 
     int checkConflictByBlankId(@Param("blankIds") List<String> blankIds);
 
@@ -93,7 +99,7 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
     void processAddSecondRoll(@Param("processoperationid") String processoperationid);
 
     @Update("update aps_process_operation_process_equ set BACHMATERIALPROCESS = REPLACE(REPLACE(REPLACE(BACHMATERIALPROCESS,'${batchnumber},',''),',${batchnumber}',''),'${batchnumber}','') where DELETED = 0 AND PROCESSID IN (select ID from aps_process_operation where DELETED = 0 AND PREVIOUSPROCESSID = #{processoperationid})")
-    void processDeleteBatchNumber(@Param("batchnumber") String batchnumber,@Param("processoperationid") String processoperationid);
+    void processDeleteBatchNumber(@Param("batchnumber") String batchnumber, @Param("processoperationid") String processoperationid);
 
     @Update("update sys_mind_mapping set DELETED = 1 where BSID = #{id}")
     void removeMindMappingByBlankId(@Param("id") String id);

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

@@ -195,7 +195,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             sysMindMappingDo.setBstable("aps_process_operation");
             sysMindMappingDos.add(sysMindMappingDo);
 
-
             List<String> overRouteStepIds = new ArrayList<>();
             List<PreviousProcessVo> newProcessIds = new ArrayList<>();//前道工序信息
             List<ApsProcessOperationDo> apsProcessOperationDoList = new ArrayList<>();
@@ -553,8 +552,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 }
             }
 
-//            return R.ok();
-
             boolean bool1 = apsProcessOperationService.saveOrUpdateBatch(apsProcessOperationDoList);
             boolean bool2 = apsProcessOperationOutMaterService.saveOrUpdateBatch(apsProcessOperationOutMaterDoList);
             boolean bool3 = true;
@@ -564,10 +561,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             boolean bool4 = sysMindMappingService.saveOrUpdateBatch(sysMindMappingDos);
 
             if (bool1 && bool2 && bool3 && bool4) {
-                //更新坯料计划的所选工艺路线
+                //更新坯料计划的所选工艺路线相关信息
                 apsBlankOrderDao.upCraftrouteId(blanckdata.getStr("ID"), craftrouteid);
-//                r.setCode("200");
-//                r.putData(apsCraftRouteStepDoList);
                 return R.ok();
             } else {
                 return R.error();