aps-生产计划跟踪报表

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProductionOrderDao.java

@@ -78,6 +78,8 @@ public interface ApsProductionOrderDao extends BaseMapper<ApsProductionOrderDo>
     ApsProcessOperationDo selectNeedBorrowOperation(@Param("joboutputmaterialid") String joboutputmaterialid);
 
     List<BlankIdAndWorkShopVo> getWorkShopByBlankId(@Param("blankIdList") List<String> blankIdList);
+
+    List<ApsProcessOperationDo> selectListAndPlanDate(@Param("blankIdList") List<String> blankIdList);
 }
 
 

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

@@ -2758,7 +2758,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         }
 
         //查询坯料计划对应的工序作业信息
-        List<ApsProcessOperationDo> processOperationDoList = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().in(ApsProcessOperationDo::getBlankid, blankIdList));
+//        List<ApsProcessOperationDo> processOperationDoList = apsProcessOperationService.list(new QueryWrapper<ApsProcessOperationDo>().lambda().in(ApsProcessOperationDo::getBlankid, blankIdList));
+        List<ApsProcessOperationDo> processOperationDoList = apsProcessOperationDao.selectListAndPlanDate(blankIdList);
 
         //构造生产进度
         //获取所有的最终工序ID集合

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

@@ -241,4 +241,112 @@
         GROUP BY
             apo.BLANKID
     </select>
+    <select id="selectListAndPlanDate" resultType="com.rongwei.bsentity.domain.ApsProcessOperationDo">
+        SELECT a.ID,
+            a.TENANTID,
+            a.ROPTION,
+            a.DELETED,
+            a.REMARK,
+            a.CREATEDATE,
+            a.CREATEUSERID,
+            a.MODIFYDATE,
+            a.MODIFYUSERID,
+            a.CREATEUSERNAME,
+            a.MODIFYUSERNAME,
+            a.OWNEDFACTORY,
+            a.CRAFTSTEPID,
+            a.STEPNUM,
+            a.PROCESSID,
+            a.PROCESSCODE,
+            a.PROCESS,
+            a.PROCESSNAME,
+            a.PROCESSWAY,
+            a.NUMUNIT,
+            a.ONCEPROCESSVAL,
+            a.ONCEPROCESSMIN,
+            a.PERTIMECAPACITY,
+            a.TIMEUNIT,
+            a.PREPRESSWORKMIN,
+            a.LOADINGMIN,
+            a.CUTTINGMIN,
+            a.CUTFINISHMIN,
+            a.MINFLOWBATCH,
+            a.MINFLOWWAITMIN,
+            a.MAXFLOWWAITMIN,
+            a.IFBLANKPROCESS,
+            a.MATERIALCODE,
+            a.MATERIALNAME,
+            a.THICKNESS,
+            a.THICKSTR,
+            a.THICKEND,
+            a.PROWIDTH,
+            a.WIDTHSTR,
+            a.WIDTHEND,
+            a.PROLENGTH,
+            a.LENGTHSTR,
+            a.LENGTHEND,
+            a.INMATERCONDITION,
+            a.OUTMATERREQUEST,
+            a.CANCHOOSEDEVICEID,
+            a.CHOOSEEQU,
+            a.BLANKID,
+            a.PLANINPUTID,
+            a.PLANINPUT,
+            a.PLANOUTPUT,
+            a.PLANINRALL,
+            a.PLANBLANKRALL,
+            a.PLANPROCESSRALL,
+            a.PROCESSWORKSHOPID,
+            a.PROCESSWORKSHOP,
+            a.PROCESSDEVICEID,
+            a.PROCESSDEVICE,
+            MIN(b.PLANSTARTDATE) AS 'PLANSTARTDATE',
+            a.ACTUALSTARTDATE,
+            MAX(b.PLANENDDATE) AS 'PLANENDDATE',
+            a.ACTUALFINISHDATE,
+            a.ACTUALIMPUTROLL,
+            a.INPUTUNQUALIFIEDROLL,
+            a.ACTUALCANPROCESSROLL,
+            a.CLOSESTATUS,
+            a.SECONDROLL,
+            a.STARTINGROLL,
+            a.REPORTROLL,
+            a.CHECKOUTROLL,
+            a.UNFINISHROLL,
+            a.CANCELROLL,
+            a.WORKSTATUS,
+            a.PROCESSSTATUS,
+            a.BACHMATERIALPROCESS,
+            a.PROCESSTOTALTIME,
+            a.WAITREPORTID,
+            a.PLANPROCESSNUM,
+            a.PREVIOUSPROCESSID,
+            a.PREVIOUSPROCESS,
+            a.NEXTPROCESSID,
+            a.NEXTPROCESS,
+            a.LEVEL,
+            a.PRODUCTTYPEID,
+            a.PRODUCTTYPE,
+            a.METAL,
+            a.METALSTATE,
+            a.OUTPUTQUALIFIEDNUM,
+            a.OUTPUTUNQUALIFIEDNUM,
+            a.CHANGEINMETER,
+            a.SINGLEROLLWEIGHT,
+            a.LOCKMARK,
+            a.TIMEWAY,
+            a.WORKSPEED,
+            a.LEAVEWAITJOBROLL,
+            a.LEAVEWAITWORKROLL,
+            a.ISSUBSECTION
+             FROM aps_process_operation a LEFT JOIN aps_process_operation_process_equ b ON b.DELETED = 0 AND a.ID = b.PROCESSID WHERE a.DELETED='0' 
+             <if test="blankIdList != null and blankIdList.size > 0">
+                 AND a.BLANKID IN
+                 <foreach collection="blankIdList" separator="," open="(" close=")" item="item">
+                     #{item}
+                 </foreach>
+             </if>
+            GROUP BY 
+                a.ID
+    </select>
 </mapper>