制造看板 产线看板

src/main/java/org/jeecg/modules/appInterface/entity/FbsWorkingStatistics.java

@@ -121,8 +121,11 @@ public class FbsWorkingStatistics implements Serializable {
 	@TableField(exist = false)
 	private String productId;
 
+
 	/**
 	 * 批次号（以英文逗号分割）
 	 */
 	private String batchCode;
+
+
 }

src/main/java/org/jeecg/modules/appInterface/mapper/FbsWorkingStatisticsMapper.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 
 /**
  * @Description: 工时统计接口
@@ -32,4 +33,13 @@ public interface FbsWorkingStatisticsMapper extends BaseMapper<FbsWorkingStatist
     * @return java.util.List<org.jeecg.modules.appInterface.entity.FbsWorkingStatistics>
     */
     List<FbsWorkingStatistics> getWorkingHours();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 根据项目名称分组查询派工单
+    * @Date 2020/11/11 11:35
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+    */
+    List<FbsWorkshopDispatchList> getWorkingHoursGroupProjectName();
 }

src/main/java/org/jeecg/modules/appInterface/mapper/xml/FbsWorkingStatisticsMapper.xml

@@ -18,7 +18,7 @@
       </select>-->
 
     <select id="getByMaterial" resultType="java.util.HashMap">
-        SELECT
+        <!--SELECT
             sum( fwdl.man_hours_completed ) AS '生产',
             ( SELECT sum( train ) + sum( meeting ) + sum( five_s ) FROM fbs_abnormal_working_hours WHERE del_flag = '0' AND date_format( date, #{dateString} ) = DATE_FORMAT( now( ), #{dateString} ) ) AS '其他（5S、会议、培训）'
         FROM
@@ -27,7 +27,34 @@
         WHERE
             fwdl.del_flag = '0'
             AND fws.final_state = '3'
-            AND date_format( fws.final_time, #{dateString} ) = DATE_FORMAT( now( ), #{dateString} )
+            AND date_format( fws.final_time, #{dateString} ) = DATE_FORMAT( now( ), #{dateString} )-->
+        SELECT
+        sum( fwdl.man_hours_completed ) AS '生产',
+        (
+        SELECT
+        IFNULL(sum( train ),0) + IFNULL(sum( meeting ),0) + IFNULL(sum( five_s ),0) + IFNULL(sum( research_and_development ),0)
+        FROM
+        fbs_abnormal_working_hours
+        WHERE
+        del_flag = '0'
+        AND date_format(
+        date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} ) ) AS '其他（5S、会议、培训）',
+        (
+        SELECT
+        IFNULL(sum( quality ),0) + IFNULL(sum( design ),0) + IFNULL(sum( rework ),0) + IFNULL(sum( materiel ),0) + IFNULL(sum( energy ),0) + IFNULL(sum( other ),0)+IFNULL(sum(equipment),0) + IFNULL(sum( plan ),0)
+        FROM
+        fbs_abnormal_working_hours
+        WHERE
+        del_flag = '0'
+        AND date_format(
+        date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} ) ) as '异常'
+
+        FROM
+        fbs_workshop_dispatch_list fwdl
+        WHERE
+        fwdl.del_flag = '0'
+        and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ >= ]]> DATE_FORMAT(fwdl.planned_start_time,#{dateString})
+        and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ <= ]]> DATE_FORMAT(fwdl.planned_end_time,#{dateString})
     </select>
 
     <select id="getWorkingHours" resultType="org.jeecg.modules.appInterface.entity.FbsWorkingStatistics">
@@ -45,4 +72,16 @@
             fwdl.production_order_number_name,
             fwdl.product_id
     </select>
+
+    <select id="getWorkingHoursGroupProjectName" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
+        SELECT
+            fwdl.project_name,
+            sum( fwdl.man_hours_completed ) as man_hours_completed
+        FROM
+            fbs_workshop_dispatch_list fwdl
+        WHERE
+            fwdl.del_flag = '0'
+        GROUP BY
+            fwdl.project_name
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/appInterface/service/IFbsWorkingStatisticsService.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.appInterface.service;
 import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 
 import java.util.List;
 import java.util.Map;
@@ -29,4 +30,6 @@ public interface IFbsWorkingStatisticsService extends IService<FbsWorkingStatist
     * @return java.util.List<org.jeecg.modules.appInterface.entity.FbsWorkingStatistics>
     */
     List<FbsWorkingStatistics> getWorkingHours();
+
+    List<FbsWorkshopDispatchList> getWorkingHoursGroupProjectName();
 }

src/main/java/org/jeecg/modules/appInterface/service/impl/FbsWorkingStatisticsServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
 import org.jeecg.modules.appInterface.mapper.FbsWorkingStatisticsMapper;
 import org.jeecg.modules.appInterface.service.IFbsWorkingStatisticsService;
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -42,4 +43,9 @@ public class FbsWorkingStatisticsServiceImpl extends ServiceImpl<FbsWorkingStati
     public List<FbsWorkingStatistics> getWorkingHours() {
         return fbsWorkingStatisticsMapper.getWorkingHours();
     }
+
+    @Override
+    public List<FbsWorkshopDispatchList> getWorkingHoursGroupProjectName() {
+        return fbsWorkingStatisticsMapper.getWorkingHoursGroupProjectName();
+    }
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursController.java

@@ -467,4 +467,26 @@ public class FbsAbnormalWorkingHoursController {
 		 result.success("操作成功");
 		 return result;
 	 }
+
+
+	/**
+	* @Author chenchuang
+	* @Description //TODO  制造看板：人员出勤率
+	* @Date 2020/11/11 13:24
+	* @Param []
+	* @return org.jeecg.common.api.vo.Result<java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>
+	*/
+	 @GetMapping(value = "/getMonthAttendance")
+	 public Result<List<Map<String,Object>>> getMonthAttendance(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+		 try {
+			 List<Map<String,Object>> map=fbsAbnormalWorkingHoursService.getMonthAttendance();
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHours.java

@@ -177,4 +177,8 @@ public class FbsAbnormalWorkingHours implements Serializable {
 	//不良品总数
 	@TableField(exist = false)
 	private String rejectsNumberTotal;
+
+	//月份
+	@TableField(exist = false)
+	private String months;
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/FbsAbnormalWorkingHoursMapper.java

@@ -41,4 +41,13 @@ public interface FbsAbnormalWorkingHoursMapper extends BaseMapper<FbsAbnormalWor
    * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
    */
     List<FbsAbnormalWorkingHours> getRejectsNumberSameDay();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 根据月份分组查询总共的应到人数和实到人数
+    * @Date 2020/11/11 13:16
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
+    */
+    List<FbsAbnormalWorkingHours> getMonthAttendance();
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/mapper/xml/FbsAbnormalWorkingHoursMapper.xml

@@ -14,7 +14,7 @@
     </select>
 
     <select id="getRejectsNumber" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours">
-        SELECT
+       <!-- SELECT
             fawh.product,
             sum( fawh.rejects_number ) as rejectsNumberTotal
         FROM
@@ -25,7 +25,20 @@
             AND fawh.product IS NOT NULL
             AND date_format( fawh.date, #{dateString} ) = DATE_FORMAT( now( ), #{dateString} )
         GROUP BY
-            fawh.product
+            fawh.product -->
+        SELECT
+          fawhd.product,
+          sum( fawhd.rejects_number ) rejectsNumberTotal
+        FROM
+          fbs_abnormal_working_hours_describe fawhd
+          LEFT JOIN fbs_abnormal_working_hours fawh ON fawhd.abnormal_working_hours_id = fawh.id
+        WHERE
+            fawhd.del_flag = '0'
+            AND fawhd.del_flag = '0'
+            AND fawhd.product IS NOT NULL
+            AND date_format( fawh.date, #{dateString} ) = DATE_FORMAT( now( ), #{dateString} )
+        GROUP BY
+            fawhd.product
     </select>
 
     <select id="getRejectsNumberSameDay" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours">
@@ -42,4 +55,18 @@
         GROUP BY
         fawh.product
     </select>
+
+    <select id="getMonthAttendance" resultType="org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours">
+        SELECT
+            DATE_FORMAT( date, '%m' ) months,
+            IfNULL( sum( number_of_people_to_arrive ), 0 ) number_of_people_to_arrive,
+            IfNULL( sum( actual_number_of_people ), 0 ) actual_number_of_people
+        FROM
+            fbs_abnormal_working_hours
+        WHERE
+            del_flag = '0'
+            AND DATE_FORMAT( date, '%Y' ) = DATE_FORMAT( now( ), '%Y' )
+        GROUP BY
+            DATE_FORMAT( date, '%m' )
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/IFbsAbnormalWorkingHoursService.java

@@ -77,4 +77,13 @@ public interface IFbsAbnormalWorkingHoursService extends IService<FbsAbnormalWor
     * @return java.util.List<org.jeecg.modules.fbsAbnormalWorkingHours.entity.FbsAbnormalWorkingHours>
     */
     List<FbsAbnormalWorkingHours> getRejectsNumberSameDay();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板：人员出勤率
+    * @Date 2020/11/11 13:17
+    * @Param []
+    * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+    */
+    List<Map<String,Object>> getMonthAttendance();
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursServiceImpl.java

@@ -300,4 +300,43 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
         return fbsAbnormalWorkingHoursMapper.getRejectsNumberSameDay();
     }
 
+    @Override
+    public List<Map<String, Object>> getMonthAttendance() {
+        List<Map<String, Object>> mapList=new ArrayList<>();
+        //查询月份分组的出勤数据
+        List<FbsAbnormalWorkingHours> fbsAbnormalWorkingHoursList=fbsAbnormalWorkingHoursMapper.getMonthAttendance();
+        for(int i=1;i<=12;i++){
+            String month="";
+            //获取月份字符
+            if(i<10){
+                month="0"+i;
+            }else{
+                month=i+"";
+            }
+            boolean ismonth=false;//是否该月的数据
+            if(fbsAbnormalWorkingHoursList!=null){
+                for(FbsAbnormalWorkingHours fbsAbnormalWorkingHours:fbsAbnormalWorkingHoursList){
+                    //查询是否有
+                    if(month.equals(fbsAbnormalWorkingHours.getMonths())){
+                        ismonth=true;
+                        Map<String, Object> map=new HashMap<>();
+                        map.put("label",month);
+                        map.put("sum1",fbsAbnormalWorkingHours.getActualNumberOfPeople());
+                        map.put("sum2",fbsAbnormalWorkingHours.getNumberOfPeopleToArrive());
+                        mapList.add(map);
+                    }
+                }
+            }
+            //如果没有则
+            if(ismonth==false){
+                Map<String, Object> map=new HashMap<>();
+                map.put("label",month);
+                map.put("sum1",0);
+                map.put("sum2",0);
+                mapList.add(map);
+            }
+        }
+        return mapList;
+    }
+
 }

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderdetailController.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -316,6 +317,34 @@ public class FbsMomOrderdetailController {
 	  return result;
   }
 
+	 @GetMapping(value = "/getMonthListGroupDefine12")
+	 public Result<List<FbsMomOrderdetail>> getMonthListGroupDefine12(){
+		 Result<List<FbsMomOrderdetail>> result=new Result<>();
+		 try {
+			 //U8数据
+			 List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getMonthListGroupDefine12();
+			 //扫码记录的工时
+			 List<FbsWorkshopDispatchList> fbsWorkingStatisticsList=iFbsWorkingStatisticsService.getWorkingHoursGroupProjectName();
+			 //找到对应的单据匹配工时
+			 if(fbsMomOrderdetailList!=null&&fbsWorkingStatisticsList!=null){
+				 for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
+					 for(FbsWorkshopDispatchList fbsWorkingStatistics:fbsWorkingStatisticsList){
+						 if(fbsMomOrderdetail.getDefine12().equals(fbsWorkingStatistics.getProjectName())){
+							 fbsMomOrderdetail.setManHoursInvested(fbsWorkingStatistics.getManHoursCompleted()+"");
+						 }
+					 }
+				 }
+			 }
+
+			 result.setResult(fbsMomOrderdetailList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
   /**
   * @Author chenchuang
   * @Description //TODO 产线看板：日生产计划

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/FbsMomOrderdetailMapper.java

@@ -51,6 +51,15 @@ public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
     */
     List<FbsMomOrderdetail> getMonthList();
 
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板：项目完工进度
+    * @Date 2020/11/11 11:25
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getMonthListGroupDefine12();
+
     /**
     * @Author chenchuang
     * @Description //TODO 产线看板：日生产计划

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -2,7 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.fbsMomOrder.mapper.FbsMomOrderdetailMapper">
     <select id="getFbsMomOrderdetailSum" resultType="java.util.HashMap">
-        select sum(QualifiedInQty) as '已完成',sum(Qty)-sum(QualifiedInQty) as '未完成' from mom_orderdetail
+        SELECT
+            sum( MOD.QualifiedInQty ) AS '已完成',
+            sum( MOD.Qty ) - sum( MOD.QualifiedInQty ) AS '未完成'
+        FROM
+            mom_orderdetail
+            MOD LEFT JOIN mom_order mo ON MOD.MoId = mo.MoId
+        WHERE
+            substring( mo.MoCode, 3, 4 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 4 )
     </select>
 
     <select id="getQualifiedInQty" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
@@ -54,6 +61,23 @@
             substring( m.MoCode, 3, 4 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 4 )
     </select>
 
+    <select id="getMonthListGroupDefine12" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
+        SELECT SUM
+            ( i.cInvDefine13 ) cInvDefine13,
+            SUM ( mo.Qty ) Qty,
+            SUM ( mo.QualifiedInQty ) QualifiedInQty,
+            m.Define12
+        FROM
+            mom_orderdetail mo
+            LEFT JOIN mom_order m ON mo.MoId= m.MoId
+            LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        WHERE
+            SUBSTRING ( m.MoCode, 3, 4 ) = SUBSTRING ( CONVERT ( VARCHAR ( 100 ), GETDATE( ), 112 ), 3, 4 )
+            AND m.Define12 IS NOT NULL
+        GROUP BY
+            m.Define12
+    </select>
+
     <select id="getDayList" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
         SELECT
             m.MoCode,

src/main/java/org/jeecg/modules/fbsMomOrder/service/IFbsMomOrderdetailService.java

@@ -49,6 +49,15 @@ public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
     */
     List<FbsMomOrderdetail> getMonthList();
 
+    /**
+    * @Author chenchuang
+    * @Description //TODO 制造看板：项目完工进度
+    * @Date 2020/11/11 11:26
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail>
+    */
+    List<FbsMomOrderdetail> getMonthListGroupDefine12();
+
     /**
     * @Author chenchuang
     * @Description //TODO 产线看板：日生产计划

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderdetailServiceImpl.java

@@ -54,6 +54,11 @@ public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailM
         return fbsMomOrderdetailMapper.getMonthList();
     }
 
+    @Override
+    public List<FbsMomOrderdetail> getMonthListGroupDefine12() {
+        return fbsMomOrderdetailMapper.getMonthListGroupDefine12();
+    }
+
     @Override
     public List<FbsMomOrderdetail> getDayList() {
         return fbsMomOrderdetailMapper.getDayList();

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -210,7 +210,7 @@
 
     <!--   需要加入当日时间判断   -->
     <select id="getProductionEfficiency" resultType="java.lang.String">
-        SELECT CONVERT
+        <!--SELECT CONVERT
             ( count( fws.pk_workshop_dispatch_list ) / count( fwdl.id ), DECIMAL ( 15, 2 ) ) * 100
         FROM
             fbs_workshop_dispatch_list fwdl
@@ -221,7 +221,15 @@
         WHERE
             fwdl.del_flag = '0'
             and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ >= ]]> DATE_FORMAT(fwdl.planned_start_time,#{dateString})
-            and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ <= ]]> DATE_FORMAT(fwdl.planned_end_time,#{dateString})
+            and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ <= ]]> DATE_FORMAT(fwdl.planned_end_time,#{dateString})-->
+        SELECT CONVERT
+          ( sum( latest_completed_quantity ) / sum( number_of_tasks ), DECIMAL ( 15, 2 ) ) * 100
+        FROM
+          fbs_workshop_dispatch_list
+        WHERE
+            del_flag = '0'
+            and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ >= ]]> DATE_FORMAT(planned_start_time,#{dateString})
+            and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ <= ]]> DATE_FORMAT(planned_end_time,#{dateString})
     </select>
 
     <select id="getAchievementRate" resultType="java.util.HashMap">
@@ -240,7 +248,7 @@
     </select>
 
     <select id="getAttendanceOfTheDay" resultType="java.util.HashMap">
-        SELECT
+       <!-- SELECT
             count( pdl.pk_workshop_dispatch_list ) AS '考勤人数',
             count( fwdl.id ) - count( pdl.pk_workshop_dispatch_list ) AS '未考勤人数'
         FROM
@@ -248,7 +256,15 @@
             LEFT JOIN ( SELECT * FROM fbs_working_statistics WHERE del_flag = '0' GROUP BY pk_workshop_dispatch_list ) pdl ON fwdl.id = pdl.pk_workshop_dispatch_list
         WHERE
             fwdl.del_flag = '0'
-            AND date_format( fwdl.date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' )
+            AND date_format( fwdl.date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' ) -->
+        SELECT
+          IfNULL( sum( actual_number_of_people ), 0 ) AS '实到人数',
+          IfNULL( ( number_of_people_to_arrive ), 0 )-IfNULL( sum( actual_number_of_people ), 0 )  AS '未到人数'
+        FROM
+          fbs_abnormal_working_hours
+        WHERE
+          del_flag = '0'
+          AND DATE_FORMAT( date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' )
     </select>
 
     <select id="getProductList" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -165,18 +165,20 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
             String productionLineId="";
             Integer sort=1;
             for(FbsWorkshopDispatchList fbsWorkshopDispatchList:fbsWorkshopDispatchListList){
-                Integer mergeLines=0;
-                if(productionLineId.equals("")||!productionLineId.equals(fbsWorkshopDispatchList.getProductionLineId())){
-                    productionLineId=fbsWorkshopDispatchList.getProductionLineId();
-                    for(FbsWorkshopDispatchList workshopDispatchList:fbsWorkshopDispatchListList){
-                        if(productionLineId.equals(workshopDispatchList.getProductionLineId())){
-                            mergeLines++;
-                        }
-                    }
-                    fbsWorkshopDispatchList.setSort(sort);
-                    sort++;
-                }
-                fbsWorkshopDispatchList.setMergeLines(mergeLines);
+//                Integer mergeLines=0;
+//                if(productionLineId.equals("")||!productionLineId.equals(fbsWorkshopDispatchList.getProductionLineId())){
+//                    productionLineId=fbsWorkshopDispatchList.getProductionLineId();
+//                    for(FbsWorkshopDispatchList workshopDispatchList:fbsWorkshopDispatchListList){
+//                        if(productionLineId.equals(workshopDispatchList.getProductionLineId())){
+//                            mergeLines++;
+//                        }
+//                    }
+//                    fbsWorkshopDispatchList.setSort(sort);
+//                    sort++;
+//                }
+//                fbsWorkshopDispatchList.setMergeLines(mergeLines);
+                fbsWorkshopDispatchList.setSort(sort);
+                sort++;
             }
         }
     }