Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

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

@@ -43,7 +43,6 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
                                     @Param("endTime") Date endTime,
                                     @Param("factoryId") String factoryId,
                                     @Param("workshopIds") List<String> workshopId,
-                                    @Param("orderNos") List<String> orderNo,
                                     @Param("processids") String processids,
                                     @Param("productionLineIds")List<String> productionLineId,
                                     @Param("equIds") List<String> equId,

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,String blankNumber);
 
     List<ScheduleGanttVo> getListById(List<String> ids);

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

@@ -110,7 +110,7 @@ public class GanttServiceImpl implements GanttService {
      */
     @Override
     public R getListByCondition(Date startDate, Date endDate, String factoryId,
-                                List<String> workShopIdList, List<String> orderNoList,
+                                List<String> workShopIdList,
                                 List<String> productionLineId, List<String> equId,
                                 String productionLineName, String equName, String blankNumber) {
         if (endDate == null && startDate != null) {
@@ -121,7 +121,7 @@ public class GanttServiceImpl implements GanttService {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
         List<GanttVos> apsProcessOperationProcessEquDos = apsProcessOperationProcessEquDao.getGanttDataList(
-                startDate, endDate, factoryId, workShopIdList, orderNoList,
+                startDate, endDate, factoryId, workShopIdList,
                 null, productionLineId, equId, null, productionLineName, equName, blankNumber);
         stopWatch.stop();
         log.error("甘特图查询用时:{}", stopWatch.getTotalTimeSeconds());
@@ -137,7 +137,7 @@ 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, ids, null, null,
                 null);
         return assembleGanttData(apsProcessOperationProcessEquDos);
     }
@@ -315,7 +315,7 @@ public class GanttServiceImpl implements GanttService {
                 if (queryProcessids != null && queryProcessids.size() > 0) {
                     String joinids = "'" + CollUtil.join(queryProcessids, "','") + "'";
                     retGantvos = apsProcessOperationProcessEquDao.getGanttDataList(
-                            null, null, null, null, null,
+                            null, null, null, null,
                             joinids, null, null, null, null,
                             null, null);
                 }

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

@@ -190,19 +190,15 @@
         DATE(abo.PROMISEDATESTART) AS PROMISEDATESTART,
         DATE(abo.PROMISEDATEEND) AS PROMISEDATEEND,
         DATE(abo.DELIVERYDATE) AS DELIVERYDATE,
-        apop.PRODUCTNAME ,
-        apro.ID AS productionorderid,
+        abo.OUTPUTORDERPRODUCT AS PRODUCTNAME ,
+        abo.ID AS productionorderid,
         abo.ORDERNO,
-        abo.CUSTOMEASYNAME,
-        apro.ORDERDATE,
+        abo.CUSTOMEASYNAME AS 'CUSTOMNAME',
         art.ROLLERTYPE,
         apope.ROLLERID,
         apo.CANCHOOSEDEVICEID,
         abo.CUSTOMORDERNO,
-        Date(apro.PROMISEDELIVERYDATE) as PROMISEDELIVERYDATE,
-        Date(apro.SCHEDULEDELIVERYDATE) as SCHEDULEDELIVERYDATE,
         abo.CUSTOMEASYNAME as CUSTOMERABBREVIATION,
-        acm.CUSTOMERUNIT,
         abo.BLANKNUMBER as blankNumber,
         abo.PLANHAVEMATERIALDATE as planhavematerialdate,
         apo.SINGLEROLLWEIGHT,
@@ -226,21 +222,7 @@
         aps_process_operation_process_equ apope
         JOIN aps_process_operation apo ON apope.PROCESSID = apo.ID
         join aps_blank_order abo ON apo.BLANKID = abo.ID
-        JOIN aps_production_order apro ON abo.PRODUCTIONORDERID = apro.ID
         LEFT JOIN aps_roller_type art on apope.ROLLERID = art.ID
-        LEFT JOIN aps_customer_management acm ON apro.CUSTOMID = acm.ID
-        LEFT JOIN (
-        SELECT
-        apop.BLANKID, GROUP_CONCAT( apop.PRODUCTNAME ) as PRODUCTNAME,
-        GROUP_CONCAT( distinct apd.CUSTOMORDERNO) as CUSTOMORDERNO
-        FROM
-        aps_process_output_product apop
-        left join aps_product_detail apd on apop.PRODUCTID = apd.id
-        WHERE
-        apop.DELETED = '0'
-        GROUP BY
-        apop.BLANKID
-        ) apop on abo.id=apop.BLANKID
         <where>
             <if test="factoryId != null and factoryId != '' and factoryId != 'ALL'">
                 apope.TENANTID = #{factoryId}
@@ -250,7 +232,6 @@
             and apope.DELETED = '0'
             and apo.DELETED = '0'
             and abo.DELETED = '0'
-            and apro.DELETED = '0'
             and (apope.PROCESSDEVICE is not null and apope.PROCESSDEVICE !='' )
             and (apope.PROCESSWORKSHOP is not null and apope.PROCESSWORKSHOP !='' )
             <if test="ids != null and ids.size()>0">
@@ -265,12 +246,6 @@
                     #{workshopId}
                 </foreach>
             </if>
-            <if test="orderNos !=null and orderNos.size()>0">
-                and apro.ORDERNO in
-                <foreach collection="orderNos" item="orderNo" open="(" close=")" separator=",">
-                    #{orderNo}
-                </foreach>
-            </if>
             <if test="equIds != null and equIds.size()>0">
                 and apope.PROCESSDEVICEID in
                 <foreach collection="equIds" item="equId" open="(" close=")" separator=",">

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

@@ -125,15 +125,6 @@ public class GanttVos {
      * 工序作业明细ID
      */
     private String id;
-    /**
-     * 承诺交货日期
-     */
-    @Deprecated
-    private Date promisedeliverydate;
-    /**
-     * 排程交货日期
-     */
-    private Date scheduledeliverydate;
 
     /**
      * 订单编号

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

@@ -45,7 +45,7 @@ public class GanttController {
     @PostMapping("/processGanttList")
     public R processGanttList(@RequestBody ProcessGanttListVo processGanttListVo) {
         return ganttService.getListByCondition(processGanttListVo.getStartTime(), processGanttListVo.getEndTime(), processGanttListVo.getFactoryId(),
-                processGanttListVo.getWorkshopId(), processGanttListVo.getOrderNo(),
+                processGanttListVo.getWorkshopId(),
                 processGanttListVo.getProductionLineId(), processGanttListVo.getEquId(),
                 processGanttListVo.getProductionLineName(), processGanttListVo.getEquName(),
                 processGanttListVo.getBlankNumber());