feature 甘特图支持 坯料计划查询

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

@@ -46,7 +46,8 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
                                     @Param("equIds") List<String> equId,
                                     @Param("ids")List<String> ids,
                                     @Param("productionLineName") String  productionLineName,
-                                    @Param("equName") String  equName);
+                                    @Param("equName") String  equName,
+                                    @Param("blankNumber")String blankNumber);
 
     void updateAboutStateByProcessId(@Param("updateIds") List<ProcessIdRelationVo> updateIds);
 

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

@@ -14,8 +14,9 @@ import java.util.List;
  */
 public interface GanttService {
 
-    R getListByCondition(Date startDate,Date endDate, String factoryId, List<String> workshopId, List<String> orderNo,
-                         List<String> productionLineId,List<String> equId,String  productionLineName,String  equName);
+    R getListByCondition(Date startDate,Date endDate, String factoryId, List<String> workshopId,
+                         List<String> orderNo, List<String> productionLineId,List<String> equId,
+                         String  productionLineName,String  equName,String blankNumber);
 
     List<ScheduleGanttVo> getListById(List<String> ids);
 

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

@@ -91,7 +91,6 @@ public class GanttServiceImpl implements GanttService {
     /**
      * 根据条件获取gantt
      *
-     * @param searchDate
      * @param factoryId
      * @param workShopIdList
      * @param orderNoList
@@ -103,7 +102,7 @@ public class GanttServiceImpl implements GanttService {
     public R getListByCondition(Date startDate, Date endDate, String factoryId,
                                 List<String> workShopIdList, List<String> orderNoList,
                                 List<String> productionLineId, List<String> equId,
-                                String productionLineName, String equName) {
+                                String productionLineName, String equName,String blankNumber) {
         if (endDate == null && startDate != null) {
             List<Date> searchDateList = getSearchDate(startDate);
             startDate = searchDateList.get(0);
@@ -113,7 +112,7 @@ public class GanttServiceImpl implements GanttService {
         stopWatch.start();
         List<GanttVos> apsProcessOperationProcessEquDos = apsProcessOperationProcessEquDao.getGanttDataList(
                 startDate, endDate, factoryId, workShopIdList, orderNoList,
-                null, productionLineId, equId, null, productionLineName, equName);
+                null, productionLineId, equId, null, productionLineName, equName,blankNumber);
         stopWatch.stop();
         log.error("甘特图查询用时:{}", stopWatch.getTotalTimeSeconds());
         StopWatch stopWatch1 = new StopWatch();
@@ -128,7 +127,8 @@ public class GanttServiceImpl implements GanttService {
     public List<ScheduleGanttVo> getListById(List<String> ids) {
         List<GanttVos> apsProcessOperationProcessEquDos = apsProcessOperationProcessEquDao.getGanttDataList(
                 null, null, null, null, null,
-                null, null, null, ids, null, null);
+                null, null, null, ids, null, null,
+                null);
         return assembleGanttData(apsProcessOperationProcessEquDos);
     }
 
@@ -288,8 +288,9 @@ public class GanttServiceImpl implements GanttService {
                 if (queryProcessids != null && queryProcessids.size() > 0) {
                     String joinids = "'" + CollUtil.join(queryProcessids, "','") + "'";
                     retGantvos = apsProcessOperationProcessEquDao.getGanttDataList(
-                            null, null, null, null, null, joinids,
-                            null, null, null, null, null);
+                            null, null, null, null, null,
+                            joinids,null, null, null, null,
+                            null,null);
                 }
             }
 
@@ -373,6 +374,7 @@ public class GanttServiceImpl implements GanttService {
                 dateVo.setStart_date(ganttVos.get(0).getPlanstartdate());
                 dateVo.setEnd_date(ganttVos.get(0).getPlanenddate());
                 dateVo.setName(StringUtils.join(itemNames, "</br>"));
+                dateVo.setBlankNumber(ganttVos.stream().map(GanttVos::getBlankNumber).distinct().collect(Collectors.joining(",")));
                 dateVo.setProcessdetailids(ganttVos.stream().map(GanttVos::getId).distinct().collect(Collectors.joining(",")));
                 dateVo.setProcessids(ganttVos.stream().map(GanttVos::getProcessid).distinct().collect(Collectors.joining(",")));
                 dateVo.setGanttVos(ganttVos);

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

@@ -187,7 +187,8 @@
         Date(a6.PROMISEDELIVERYDATE) as PROMISEDELIVERYDATE,
         Date(a6.SCHEDULEDELIVERYDATE) as SCHEDULEDELIVERYDATE,
         a7.CUSTOMERABBREVIATION as CUSTOMERABBREVIATION,
-        a7.CUSTOMERUNIT
+        a7.CUSTOMERUNIT,
+        a3.BLANKNUMBER as blankNumber
         FROM
         aps_process_operation_process_equ a1
         LEFT JOIN aps_process_operation a2 ON a1.PROCESSID = a2.ID
@@ -234,6 +235,10 @@
                 and not (a1.PLANSTARTDATE > #{endTime} or a1.PLANENDDATE < #{startTime})
             </if>
             <if test="processids != null ">and a1.PROCESSID in (${processids})</if>
+            <if test="blankNumber != null and blankNumber != ''">
+                <bind name="blankNumberPattern" value="'%' + blankNumber + '%'"/>
+                and a3.BLANKNUMBER like #{blankNumberPattern}
+            </if>
         </where>
         order by a1.PROCESSWORKSHOP,a1.PROCESSDEVICE,a1.PLANSTARTDATE asc,a1.PLANENDDATE desc
     </select>

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

@@ -43,4 +43,8 @@ public class ProcessGanttListVo {
      * 设备名称,模糊查询
      */
     private String  equName;
+    /**
+     * 坯料计划编号
+     */
+    private String  blankNumber;
 }

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/GanttController.java

@@ -47,7 +47,8 @@ public class GanttController {
         return ganttService.getListByCondition(processGanttListVo.getStartTime(), processGanttListVo.getEndTime(), processGanttListVo.getFactoryId(),
                 processGanttListVo.getWorkshopId(), processGanttListVo.getOrderNo(),
                 processGanttListVo.getProductionLineId(), processGanttListVo.getEquId(),
-                processGanttListVo.getProductionLineName(), processGanttListVo.getEquName());
+                processGanttListVo.getProductionLineName(), processGanttListVo.getEquName(),
+                processGanttListVo.getBlankNumber());
     }
 
     /**