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

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.*,ado.DELIVERYOFFSET,IF(ado.DELIVERYOFFSET > 0,'是','否') AS 'isOutPromiseDate' from (SELECT
+        SELECT a.*,ado.DELIVERYOFFSET AS 'deliveryOffset',IF(ado.DELIVERYOFFSET > 0,'是','否') AS 'isOutPromiseDate' from (SELECT
             apo.*,
             abo.PROMISEDATESTART AS 'promiseDateStart',
             abo.PROMISEDATEEND AS 'promiseDateEnd',
@@ -595,6 +595,7 @@
                 AND (a.newCustomName like concat('%',#{param.likeSearchAll},'%')
                 OR a.newCustomOrderNo like concat('%',#{param.likeSearchAll},'%')
                 OR a.blankNumber like concat('%',#{param.likeSearchAll},'%')
+                OR IF(ado.DELIVERYOFFSET > 0,'是','否') like concat('%',#{param.likeSearchAll},'%')
                 )
             </if>
         </where>

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

@@ -816,21 +816,18 @@
         max(apro.AUDITDATE) as auditDate, -- 订单评审日期
         -- 坯料批次号
         max(
-        IF(apope.ID = apope.ROOTTASKID,
         IF(apope.BLANKBATCHNUMBER is not null and apope.BLANKBATCHNUMBER!='',
         apope.BLANKBATCHNUMBER,
         IF(abo.PREPAREMATERIAL = '是',
         SUBSTRING_INDEX( abo.PREPAREMATERIALBATCHNO, ',', 1 ),
         apope.BACHMATERIALPROCESS
         )
-        ),
-        null
         )
         ) AS blankBatchNumber,
-        max(IF(apope.ID = apope.ROOTTASKID, ifnull(arr.REPORTOUTMATERREQUEST,abo.INPUTREPORTDESCRIBE), null)) as blankDesc , -- 坯料描述
-        max(IF(apope.ID = apope.ROOTTASKID, arr.ID, null)) as reportId, -- 坯料报工记录ID
-        max(IF(apope.ID = apope.ROOTTASKID, arr.CHECKDATE, null)) as checkDate, -- 坯料检验日期
-        max(IF(apope.ID = apope.ROOTTASKID, arr.BLANKLEVEL, null)) as insepctionLevel, -- 坯料检验等级
+        max(ifnull(arr.REPORTOUTMATERREQUEST,abo.INPUTREPORTDESCRIBE)) as blankDesc , -- 坯料描述
+        max(arr.ID) as reportId, -- 坯料报工记录ID
+        max(arr.CHECKDATE) as checkDate, -- 坯料检验日期
+        max(arr.BLANKLEVEL) as insepctionLevel, -- 坯料检验等级
         -- 卡片状态
         apope.status,
         -- 最近修改时间
@@ -937,21 +934,18 @@
         max(apro.AUDITDATE) as auditDate, -- 订单评审日期
         -- 坯料批次号
         max(
-        IF(apope.ID = apope.ROOTTASKID,
         IF(apope.BLANKBATCHNUMBER is not null and apope.BLANKBATCHNUMBER!='',
         apope.BLANKBATCHNUMBER,
         IF(abo.PREPAREMATERIAL = '是',
         SUBSTRING_INDEX( abo.PREPAREMATERIALBATCHNO, ',', 1 ),
         apope.BACHMATERIALPROCESS
         )
-        ),
-        null
         )
         ) AS blankBatchNumber,
-        max(IF(apope.ID = apope.ROOTTASKID, ifnull(arr.REPORTOUTMATERREQUEST,abo.INPUTREPORTDESCRIBE), null)) as blankDesc , -- 坯料描述
-        max(IF(apope.ID = apope.ROOTTASKID, arr.ID, null)) as reportId, -- 坯料报工记录ID
-        max(IF(apope.ID = apope.ROOTTASKID, arr.CHECKDATE, null)) as checkDate, -- 坯料检验日期
-        max(IF(apope.ID = apope.ROOTTASKID, arr.BLANKLEVEL, null)) as insepctionLevel, -- 坯料检验等级
+        max(ifnull(arr.REPORTOUTMATERREQUEST,abo.INPUTREPORTDESCRIBE)) as blankDesc , -- 坯料描述
+        max(arr.ID) as reportId, -- 坯料报工记录ID
+        max(arr.CHECKDATE) as checkDate, -- 坯料检验日期
+        max(arr.BLANKLEVEL) as insepctionLevel, -- 坯料检验等级
         -- 卡片状态
         apope.status,
         -- 最近修改时间

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

@@ -20,7 +20,7 @@ public class ProductPlanReportParamVo {
     private String productionOrderStatus = "";
 
     //是否超交期
-    private String isOutPromiseDate;
+    private String isOutPromiseDate = "";
 
     private String orders = "";
 

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

@@ -94,4 +94,6 @@ public class ProductPlanReportVo extends ApsProductionOrderDo {
     //是否超交期
     private String isOutPromiseDate;
 
+    //交期偏差
+    private String deliveryOffset;
 }