派工单 看板

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

@@ -135,6 +135,12 @@
         <if test="fbsMomOrderdetail.cinvname!=null and fbsMomOrderdetail.cinvname!=''">
             AND i.cInvName=#{fbsMomOrderdetail.cinvname}
         </if>
+        <if test="fbsMomOrderdetail.startDate!=null">
+            AND  DATE_FORMAT(mm.StartDate,'%Y-%m-%d')=DATE_FORMAT(#{fbsMomOrderdetail.startDate},'%Y-%m-%d')
+        </if>
+        <if test="fbsMomOrderdetail.dueDate!=null">
+            AND DATE_FORMAT(mm.DueDate,'%Y-%m-%d') =DATE_FORMAT(#{fbsMomOrderdetail.dueDate},'%Y-%m-%d')
+        </if>
         ORDER BY
         m.createtime DESC
     </select>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -132,6 +132,11 @@ public class FbsWorkshopDispatchListController {
 		if(StringUtils.isNotBlank(projectName)){
             fbsWorkshopDispatchList.setProjectName(null);
         }
+        //工作中心
+		String workCenter=fbsWorkshopDispatchList.getWorkCenter();
+		if(StringUtils.isNotBlank(workCenter)){
+			fbsWorkshopDispatchList.setWorkCenter(null);
+		}
 		QueryWrapper<FbsWorkshopDispatchList> queryWrapper = QueryGenerator.initQueryWrapper(fbsWorkshopDispatchList, req.getParameterMap());
 		queryWrapper.lambda().eq(FbsWorkshopDispatchList::getDelFlag,"0");
 		if(StringUtils.isNotBlank(start)&&StringUtils.isNotBlank(end)&&!start.equals("null")&&!end.equals("null")){
@@ -155,7 +160,9 @@ public class FbsWorkshopDispatchListController {
 		if(StringUtils.isNotBlank(projectName)){
 		    queryWrapper.lambda().like(FbsWorkshopDispatchList::getProjectName,projectName);
         }
-
+		if(StringUtils.isNotBlank(workCenter)){
+			queryWrapper.lambda().like(FbsWorkshopDispatchList::getWorkCenter,workCenter);
+		}
 
 		if(stateString!=null){
 			queryWrapper.apply("(1=1 ");

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

@@ -47,7 +47,7 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     * @Param []
     * @return java.util.Map<java.lang.String,java.lang.Object>
     */
-    Map<String,Object> getAbnormalHoursMonthReport(@Param("dateString")String dateString);
+    List<Map<String,Object>> getAbnormalHoursMonthReport(@Param("dateString")String dateString);
 
     /**
     * @Author chenchuang

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

@@ -130,26 +130,44 @@
     </select>
 
     <select id="getAbnormalHoursMonthReport" resultType="java.util.HashMap">
+        <!--SELECT-->
+            <!--IFNULL(sum( quality ),0) AS '质量',-->
+            <!--IFNULL(sum( design ),0) AS '设计',-->
+            <!--&lt;!&ndash;IFNULL(sum( rework ),0) AS '返工',&ndash;&gt;-->
+            <!--IFNULL(sum( materiel ),0) AS '物料',-->
+            <!--IFNULL(sum( energy ),0) AS '能源',-->
+            <!--&lt;!&ndash;IFNULL(sum( other ),0) AS '其他',&ndash;&gt;-->
+            <!--IFNULL(sum( equipment ),0) AS '设备',-->
+            <!--IFNULL(sum( plan ),0) AS '计划'-->
+        <!--FROM-->
+            <!--fbs_abnormal_working_hours-->
+        <!--WHERE-->
+            <!--del_flag = '0'-->
+            <!--<if test="dateString=='%Y-%m-%d'">-->
+                <!--AND date_format( date, #{dateString} ) = DATE_FORMAT( date_sub(curdate(),interval 1 day),  #{dateString} )-->
+            <!--</if>-->
+            <!--<if test="dateString=='%Y-%m'">-->
+                <!--AND date_format( date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} )-->
+            <!--</if>-->
+
         SELECT
-            IFNULL(sum( quality ),0) AS '质量',
-            IFNULL(sum( design ),0) AS '设计',
-            <!--IFNULL(sum( rework ),0) AS '返工',-->
-            IFNULL(sum( materiel ),0) AS '物料',
-            IFNULL(sum( energy ),0) AS '能源',
-            <!--IFNULL(sum( other ),0) AS '其他',-->
-            IFNULL(sum( equipment ),0) AS '设备',
-            IFNULL(sum( plan ),0) AS '计划'
-        FROM
-            fbs_abnormal_working_hours
+            fawhd.anomaly_classification AS type,
+            sum( fawhd.abnormal_working_hours ) AS working
+        FROM
+          `fbs_abnormal_working_hours_describe` fawhd
+          LEFT JOIN fbs_abnormal_working_hours fawh ON fawhd.abnormal_working_hours_id = fawh.id
         WHERE
-            del_flag = '0'
-            <if test="dateString=='%Y-%m-%d'">
-                AND date_format( date, #{dateString} ) = DATE_FORMAT( date_sub(curdate(),interval 1 day),  #{dateString} )
-            </if>
-            <if test="dateString=='%Y-%m'">
-                AND date_format( date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} )
-            </if>
-
+          fawhd.anomaly_classification IS NOT NULL
+          and fawh.del_flag='0'
+        <if test="dateString=='%Y-%m-%d'">
+            AND date_format( fawh.date, #{dateString} ) = DATE_FORMAT( date_sub(curdate(),interval 1 day),  #{dateString} )
+        </if>
+        <if test="dateString=='%Y-%m'">
+            AND date_format( fawh.date, #{dateString} ) = DATE_FORMAT( now( ),  #{dateString} )
+        </if>
+        GROUP BY
+          fawhd.anomaly_classification
+        ORDER BY fawhd.anomaly_classification
     </select>
 
     <select id="getAbnormalHoursMonthReportSameDay" resultType="java.util.HashMap">
@@ -433,6 +451,7 @@
         *,
         CONVERT ( IFNULL( (latest_completed_quantity), 0 )*IFNULL( (standard_working_hours_z), 0 ) / IFNULL( ( man_hours_completed  ), 0 ), DECIMAL ( 15, 2 ) ) * 100 as productionEfficiency,
         CONVERT ( IFNULL( (latest_completed_quantity), 0 ) / IFNULL( ( number_of_tasks  ), 0 ), DECIMAL ( 15, 2 ) ) * 100 as achievementRate
+        ,(number_of_tasks-latest_completed_quantity) as remainingQuantity
         FROM
         fbs_workshop_dispatch_list
         WHERE

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

@@ -559,7 +559,31 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
 
     @Override
     public Map<String, Object> getAbnormalHoursMonthReport(String dateString) {
-        return fbsWorkshopDispatchListMapper.getAbnormalHoursMonthReport(dateString);
+        Map<String,Object> map=new LinkedHashMap<>();
+        List<Map<String,Object>> mapList=fbsWorkshopDispatchListMapper.getAbnormalHoursMonthReport(dateString);
+        if(mapList!=null&&mapList.size()>0){
+            for(Map<String,Object> resultMap:mapList){
+                String type=String.valueOf(resultMap.get("type"));
+                if(type.equals("1")){
+                    map.put("设计",resultMap.get("working"));
+                }else if(type.equals("2")){
+                    map.put("物料",resultMap.get("working"));
+                }else if(type.equals("3")){
+                    map.put("计划",resultMap.get("working"));
+                }else if(type.equals("4")){
+                    map.put("制程",resultMap.get("working"));
+                }else if(type.equals("5")){
+                    map.put("其他",resultMap.get("working"));
+                }
+            }
+        }else{
+            map.put("设计",0);
+            map.put("物料",0);
+            map.put("计划",0);
+            map.put("制程",0);
+            map.put("其他",0);
+        }
+        return map;
     }
 
     @Override