feature 坯料计划字段修改

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

@@ -140,15 +140,15 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         apsBlankOrderDo.setId(vo.getBlankId());
         //如果作业最大生产状态<加工中(40)，则作业状态=待开工
         if(Integer.parseInt(vo.getMaxProcessStatus()) < 40){
-            apsBlankOrderDo.setSchedulingtatus(JOBSTATUS_TO_BE_START);
+            apsBlankOrderDo.setSchedulingstatus(JOBSTATUS_TO_BE_START);
         }
         //如果作业最小生产状态=已完工(50)，则作业状态=已完工
         if (vo.getMinProcessStatus().equals("50")) {
-            apsBlankOrderDo.setSchedulingtatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_END);
+            apsBlankOrderDo.setSchedulingstatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_END);
         }
         //如果作业最大生产状态>=加工中(40)，并且作业最小生产状态<已完工(50)，则作业状态=加工中
         if (Integer.parseInt(vo.getMaxProcessStatus()) >= 40 && Integer.parseInt(vo.getMinProcessStatus()) < 50) {
-            apsBlankOrderDo.setSchedulingtatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_STARTING);
+            apsBlankOrderDo.setSchedulingstatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_STARTING);
         }
         //更新坯料计划的作业状态
         this.updateById(apsBlankOrderDo);
@@ -184,7 +184,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         // 更新坯料计划的生产状态为已发布
         this.update(new LambdaUpdateWrapper<ApsBlankOrderDo>().in(ApsBlankOrderDo::getId, blankIds)
                 .set(ApsBlankOrderDo::getProductstatus, "30")
-                .set(ApsBlankOrderDo::getSchedulingtatus, JOBSTATUS_TO_BE_START)
+                .set(ApsBlankOrderDo::getSchedulingstatus, JOBSTATUS_TO_BE_START)
                 .set(ApsBlankOrderDo::getLockmark, LOCKMARK_Y));
         // 更新坯料计划对应工序作业的状态为待开工
         apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
@@ -234,7 +234,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         // 更新坯料计划的生产状态为已发布
         this.update(new LambdaUpdateWrapper<ApsBlankOrderDo>().in(ApsBlankOrderDo::getId, blankIds)
                 .set(ApsBlankOrderDo::getProductstatus, "20")
-                .set(ApsBlankOrderDo::getSchedulingtatus, JOBSTATUS_TO_BE_START)
+                .set(ApsBlankOrderDo::getSchedulingstatus, JOBSTATUS_TO_BE_START)
                 .set(ApsBlankOrderDo::getLockmark, LOCKMARK_N));
         // 更新坯料计划对应工序作业的状态为待开工
         apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsBlankOrderDao.xml

@@ -42,7 +42,7 @@
             <result property="craftrouteid" column="CRAFTROUTEID" jdbcType="VARCHAR"/>
             <result property="lockmark" column="LOCKMARK" jdbcType="VARCHAR"/>
             <result property="isstag" column="ISSTAG" jdbcType="VARCHAR"/>
-            <result property="schedulingtatus" column="SCHEDULINGTATUS" jdbcType="VARCHAR"/>
+            <result property="schedulingstatus" column="SCHEDULINGSTATUS" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -58,7 +58,7 @@
         CREATEUSERID,MODIFYDATE,MODIFYUSERID,
         CREATEUSERNAME,MODIFYUSERNAME,PRODUCTTYPEID,
         INPUTREPORTDESCRIBE,CRAFTROUTEID,LOCKMARK,
-        ISSTAG,SCHEDULINGTATUS
+        ISSTAG,SCHEDULINGSTATUS
     </sql>
     <update id="publish">
         <if test="productionOrderIds != null and productionOrderIds.size() >0">
@@ -82,7 +82,7 @@
                 <set>
                     LOCKMARK='n',
                     PRODUCTSTATUS='10',
-                    SCHEDULINGTATUS='10'
+                    SCHEDULINGSTATUS='10'
                 </set>
                 <where>
                     DELETED='0'
@@ -96,9 +96,9 @@
     <update id="reportCheckUpdateJobStatus">
         update  aps_blank_order
         <set>
-            SCHEDULINGTATUS = if((select GROUP_CONCAT(DISTINCT PROCESSSTATUS)='50' from aps_process_operation where
+            SCHEDULINGSTATUS = if((select GROUP_CONCAT(DISTINCT PROCESSSTATUS)='50' from aps_process_operation where
             DELETED ='0' and BLANKID=#{id}),
-            '50',SCHEDULINGTATUS)
+            '50',SCHEDULINGSTATUS)
         </set>
         <where>
             DELETED ='0'

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsBlankOrderDo.java

@@ -175,6 +175,6 @@ public class ApsBlankOrderDo extends BaseDo {
     /**
      * 排程状态
      */
-    @TableField("JOBSTATUS")
-    private String schedulingtatus;
+    @TableField("SCHEDULINGSTATUS")
+    private String schedulingstatus;
 }