Browse Source

aps-去除订单的排程状态字段,查询条件中改为生产状态字段查询

sucheng 1 year ago
parent
commit
88d817ef2e

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

@@ -31,11 +31,11 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
     List<ApsBlankOrderVo> getByOrderId(@Param("orderId") String orderId);
     List<ApsBlankOrderVo> getByOrderId(@Param("orderId") String orderId);
 
 
     @Select("select a.*,b.DELIVERYDATE from aps_blank_order a LEFT JOIN aps_production_order b on a.PRODUCTIONORDERID=b.ID " +
     @Select("select a.*,b.DELIVERYDATE from aps_blank_order a LEFT JOIN aps_production_order b on a.PRODUCTIONORDERID=b.ID " +
-            "where (a.LOCKMARK is null or a.LOCKMARK='n') and a.DELETED='0' and b.DELETED='0' and b.SCHEDULSTATUS='待发布' and a.ID not in (${hasIds})")
+            "where (a.LOCKMARK is null or a.LOCKMARK='n') and a.DELETED='0' and b.DELETED='0' and b.PRODUCTIONSTATUS='20' and a.ID not in (${hasIds})")
     List<ApsBlankOrderVo> getFbNotLock(@Param("hasIds") String hasIds);
     List<ApsBlankOrderVo> getFbNotLock(@Param("hasIds") String hasIds);
 
 
     @Select("select a.*,b.DELIVERYDATE from aps_blank_order a LEFT JOIN aps_production_order b on a.PRODUCTIONORDERID=b.ID " +
     @Select("select a.*,b.DELIVERYDATE from aps_blank_order a LEFT JOIN aps_production_order b on a.PRODUCTIONORDERID=b.ID " +
-            "where b.SCHEDULSTATUS='待发布' and (a.LOCKMARK='n' or a.LOCKMARK is null) and a.DELETED='0' and b.DELETED='0' and b.TENANTID = #{tenantId}")
+            "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}")
     List<ApsBlankOrderVo> getNotLockOrders(@Param("tenantId") String tenantId);
     List<ApsBlankOrderVo> getNotLockOrders(@Param("tenantId") String tenantId);
 
 
     @Update("update aps_blank_order set CRAFTROUTEID = #{craftrouteid} where ID=#{blankId} ")
     @Update("update aps_blank_order set CRAFTROUTEID = #{craftrouteid} where ID=#{blankId} ")