فهرست منبع

feature 取消使用发布状态

xiahan 1 سال پیش
والد
کامیت
99f43103d8

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

@@ -536,7 +536,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         apsProductionOrderDo.setScheduledeliverydate(DateUtil.offsetHour(v, productionOrderDo.getDeliverytime()));
                     }
                     // 排程状态更新为待发布
-                    apsProductionOrderDo.setSchedulstatus(SCHEDULSTATUS_TORELEASE);
+//                    apsProductionOrderDo.setSchedulstatus(SCHEDULSTATUS_TORELEASE);
                     apsProductionOrderService.updateById(apsProductionOrderDo);
                 });
             }
@@ -1062,7 +1062,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         for (String apsProductionOrderId : apsProductionOrderIds) {
             ApsProductionOrderDo productionOrderDo = new ApsProductionOrderDo();
             productionOrderDo.setId(apsProductionOrderId);
-            productionOrderDo.setSchedulstatus(SaveConstans.SchedulstatusTyep.SCHEDULSTATUS_TOSCHEDULE);
+//            productionOrderDo.setSchedulstatus(SaveConstans.SchedulstatusTyep.SCHEDULSTATUS_TOSCHEDULE);
             productionOrderDo.setScheduledeliverydate(null);
             productionOrderDo.setProductionstatus(TO_BE_SCHEDULED);
             productionOrderDos.add(productionOrderDo);

+ 9 - 9
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -265,15 +265,15 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         ApsProductionOrderDo apsProductionOrderDo = new ApsProductionOrderDo();
         apsProductionOrderDo.setId(three.getOrderId());
         apsProductionOrderDo.setProductionstatus(three.getProductionStatus());
-        if (three.getProductionStatus().equals("10")) {
-            apsProductionOrderDo.setSchedulstatus("待排程");
-        }
-        if (three.getProductionStatus().equals("20")) {
-            apsProductionOrderDo.setSchedulstatus("待发布");
-        }
-        if ("30,40,50".contains(three.getProductionStatus())) {
-            apsProductionOrderDo.setSchedulstatus("已发布");
-        }
+//        if (three.getProductionStatus().equals("10")) {
+//            apsProductionOrderDo.setSchedulstatus("待排程");
+//        }
+//        if (three.getProductionStatus().equals("20")) {
+//            apsProductionOrderDo.setSchedulstatus("待发布");
+//        }
+//        if ("30,40,50".contains(three.getProductionStatus())) {
+//            apsProductionOrderDo.setSchedulstatus("已发布");
+//        }
         apsProductionOrderService.updateById(apsProductionOrderDo);
 
         //更新产品明细的生产状态

+ 1 - 1
cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProductionOrderDao.xml

@@ -86,7 +86,7 @@
         <result property="enddate" column="ENDDATE" jdbcType="TIMESTAMP"/>
         <result property="plandate" column="PLANDATE" jdbcType="TIMESTAMP"/>
         <result property="reviewtype" column="REVIEWTYPE" jdbcType="VARCHAR"/>
-        <result property="schedulstatus" column="SCHEDULSTATUS" jdbcType="VARCHAR"/>
+<!--        <result property="schedulstatus" column="SCHEDULSTATUS" jdbcType="VARCHAR"/>-->
     </resultMap>
 
     <sql id="Base_Column_List">

+ 2 - 2
cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProductionOrderDo.java

@@ -388,8 +388,8 @@ public class ApsProductionOrderDo extends BaseDo implements Serializable {
     /**
      * 排程状态
      */
-    @Deprecated
-    private String schedulstatus;
+//    @Deprecated
+//    private String schedulstatus;
 
     /**
      * 调整日期