feature 代码提交

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

@@ -44,7 +44,9 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
                                     @Param("processids") String processids,
                                     @Param("productionLineIds")List<String> productionLineId,
                                     @Param("equIds") List<String> equId,
-                                    @Param("ids")List<String> ids);
+                                    @Param("ids")List<String> ids,
+                                    @Param("productionLineName") String  productionLineName,
+                                    @Param("equName") String  equName);
 
     void updateAboutStateByProcessId(@Param("updateIds") List<ProcessIdRelationVo> updateIds);
 

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

@@ -15,7 +15,7 @@ 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);
+                         List<String> productionLineId,List<String> equId,String  productionLineName,String  equName);
 
     List<ScheduleGanttVo> getListById(List<String> ids);
 }

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

@@ -70,7 +70,8 @@ public class GanttServiceImpl implements GanttService {
     @Override
     public R getListByCondition(Date startDate, Date endDate, String factoryId,
                                 List<String> workShopIdList, List<String> orderNoList,
-                                List<String> productionLineId, List<String> equId) {
+                                List<String> productionLineId, List<String> equId,
+                                String productionLineName, String equName) {
         log.info("甘特图查询开始时间：" + DateUtil.now());
         if (endDate == null && startDate != null) {
             List<Date> searchDateList = getSearchDate(startDate);
@@ -78,15 +79,8 @@ public class GanttServiceImpl implements GanttService {
             endDate = searchDateList.get(1);
         }
         List<GanttVos> apsProcessOperationProcessEquDos = apsProcessOperationProcessEquDao.getGanttDataList(
-                startDate,
-                endDate,
-                factoryId,
-                workShopIdList,
-                orderNoList,
-                null,
-                productionLineId,
-                equId,
-                null);
+                startDate, endDate, factoryId, workShopIdList, orderNoList,
+                null, productionLineId, equId, null, productionLineName, equName);
         List<ScheduleGanttVo> scheduleGanttVos = assembleGanttData(apsProcessOperationProcessEquDos);
         log.info("甘特图查询结束时间：" + DateUtil.now());
         return R.ok(scheduleGanttVos);
@@ -144,8 +138,8 @@ public class GanttServiceImpl implements GanttService {
     @Override
     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,
+                null, null, null, ids, null, null);
         return assembleGanttData(apsProcessOperationProcessEquDos);
     }
 
@@ -210,7 +204,8 @@ 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, joinids,
+                            null, null, null, null, null);
                 }
             }
 
@@ -226,6 +221,7 @@ public class GanttServiceImpl implements GanttService {
 
     /**
      * 工序名为 成退和中退 的清空下 加工时间相同的才可以合并
+     *
      * @param apsProcessOperationProcessEquDos
      * @return
      */
@@ -275,10 +271,10 @@ public class GanttServiceImpl implements GanttService {
 
                 // 对数据按照 计划开始时间+计划结束时间 分组
                 LinkedHashMap<String, List<GanttVos>> planDataMap = deviceEntry.getValue().stream().collect(Collectors.groupingBy(info -> {
-                        if(COMBINED_PROCESSING.equals(info.getProcessway())){
-                            return info.getPlanstartdate().toString() + info.getPlanenddate().toString();
-                        }
-                         return info.getUuid();
+                            if (COMBINED_PROCESSING.equals(info.getProcessway())) {
+                                return info.getPlanstartdate().toString() + info.getPlanenddate().toString();
+                            }
+                            return info.getUuid();
                         },
                         LinkedHashMap::new, Collectors.toList()));
 

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

@@ -209,6 +209,10 @@
             LEFT JOIN aps_resources_equipment ape on ape.EQUIPMENTID = a1.PROCESSDEVICEID
             LEFT JOIN aps_production_line apl on ape.MAINID =apl.ID
         </if>
+        <if test="productionLineName !=null and productionLineName!=''">
+            LEFT JOIN aps_resources_equipment ape on ape.EQUIPMENTID = a1.PROCESSDEVICEID
+            LEFT JOIN aps_production_line apl on ape.MAINID =apl.ID
+        </if>
         <where>
             a1.DELETED ='0'
             AND a2.DELETED = '0'
@@ -244,12 +248,20 @@
                     #{equId}
                 </foreach>
             </if>
+            <if test="equName !=null and equName!=''">
+                <bind name="pattern" value="'%' + equName + '%'"/>
+                and a1.PROCESSDEVICE like #{pattern}
+            </if>
             <if test="productionLineIds != null and productionLineIds.size()>0">
                 and apl.ID in
                 <foreach collection="productionLineIds" item="productionLineId" open="(" close=")" separator=",">
                     #{productionLineId}
                 </foreach>
             </if>
+            <if test="productionLineName !=null and productionLineName!=''">
+                <bind name="pattern" value="'%' + productionLineName + '%'"/>
+                and apl.PRODUCTLINENAME like #{pattern}
+            </if>
             <if test="factoryId != null and factoryId != '' and factoryId != 'ALL'">and a1.TENANTID = #{factoryId}</if>
 
             <if test="startTime != null and endTime != null ">

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

@@ -35,4 +35,12 @@ public class ProcessGanttListVo {
      * 设备ID
      */
     private List<String> equId;
+    /**
+     * 产线名称,模糊查询
+     */
+    private String  productionLineName;
+    /**
+     * 设备名称,模糊查询
+     */
+    private String  equName;
 }

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

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