aps-生产作业跟踪页面增加字段

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

@@ -3427,6 +3427,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     if (column.getField().equals("productionOrderStatus")) {
                         param.setProductionOrderStatus(column.getValue());
                     }
+                    if (column.getField().equals("isOutPromiseDate")) {
+                        param.setIsOutPromiseDate(column.getValue());
+                    }
                 }
             }
             if (columnQueryType.getColumnInnerRelation().equals("OR")) {

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

@@ -493,7 +493,7 @@
         where a.rn_asc=1 or a.rn_desc=1 order by a.PLANENDDATE
     </select>
     <select id="selectPageReport" resultType="com.rongwei.bsentity.vo.ProductPlanReportVo">
-        SELECT a.* from (SELECT
+        SELECT a.*,ado.DELIVERYOFFSET,IF(ado.DELIVERYOFFSET > 0,'是','否') AS 'isOutPromiseDate' from (SELECT
             apo.*,
             abo.PROMISEDATESTART AS 'promiseDateStart',
             abo.PROMISEDATEEND AS 'promiseDateEnd',
@@ -577,7 +577,7 @@
             <if test="param.tenantId != ''">
                 AND apo.TENANTID = #{param.tenantId}
             </if>
-            )a
+            )a left join (select BLANKID,MAX(DELIVERYOFFSET) AS 'DELIVERYOFFSET' from aps_delivery_offset where DELETED = 0 GROUP BY BLANKID) ado ON a.blankId = ado.BLANKID
         <where>
             <if test="param.productionOrderStatus != ''">
                 AND a.productionOrderStatus = #{param.productionOrderStatus}
@@ -588,6 +588,9 @@
             <if test="param.customOrderNo != ''">
                 AND a.newCustomOrderNo like concat('%',#{param.customOrderNo},'%')
             </if>
+            <if test="param.isOutPromiseDate != ''">
+                AND IF(ado.DELIVERYOFFSET > 0,'是','否') = #{param.isOutPromiseDate}
+            </if>
             <if test="param.likeSearchAll != ''">
                 AND (a.newCustomName like concat('%',#{param.likeSearchAll},'%')
                 OR a.newCustomOrderNo like concat('%',#{param.likeSearchAll},'%')

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ProductPlanReportParamVo.java

@@ -19,6 +19,9 @@ public class ProductPlanReportParamVo {
 
     private String productionOrderStatus = "";
 
+    //是否超交期
+    private String isOutPromiseDate;
+
     private String orders = "";
 
     //输出工厂

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ProductPlanReportVo.java

@@ -91,4 +91,7 @@ public class ProductPlanReportVo extends ApsProductionOrderDo {
      */
     private String newCustomOrderNo;
 
+    //是否超交期
+    private String isOutPromiseDate;
+
 }