产线看板a

src/main/java/org/jeecg/modules/fbsInventory/service/IFbsInventoryService.java

@@ -35,4 +35,12 @@ public interface IFbsInventoryService extends IService<FbsInventory> {
      */
     Map<String,Object> getAllStockList();
 
+    /**
+    * @Author chenchuang
+    * @Description //TODO 根据多个id(code)查询库存信息
+    * @Date 2020/10/26 16:30
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsInventory.entity.FbsInventory>
+    */
+    List<FbsInventory> getListByIds(List<String> stringList);
 }

src/main/java/org/jeecg/modules/fbsInventory/service/impl/FbsInventoryServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.fbsInventory.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.modules.fbsInventory.entity.FbsInventory;
 import org.jeecg.modules.fbsInventory.mapper.FbsInventoryMapper;
 import org.jeecg.modules.fbsInventory.service.IFbsInventoryService;
@@ -27,6 +28,7 @@ public class FbsInventoryServiceImpl extends ServiceImpl<FbsInventoryMapper, Fbs
     @Resource
     FbsInventoryMapper fbsInventoryMapper;
 
+
     @Override
     public List<FbsInventory> getInventoryGetByOrderId(String moId) {
         return fbsInventoryMapper.getInventoryGetByOrderId(moId);
@@ -48,4 +50,11 @@ public class FbsInventoryServiceImpl extends ServiceImpl<FbsInventoryMapper, Fbs
         }
         return map;
     }
+
+    @Override
+    public List<FbsInventory> getListByIds(List<String> stringList) {
+        LambdaQueryWrapper<FbsInventory> fbsInventoryLambdaQueryWrapper=new LambdaQueryWrapper<>();
+        fbsInventoryLambdaQueryWrapper.in(FbsInventory::getCinvcode,stringList);
+        return fbsInventoryMapper.selectList(fbsInventoryLambdaQueryWrapper);
+    }
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsWorkshopDispatchList.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -492,4 +493,73 @@ public class FbsWorkshopDispatchListController {
 		 }
 		 return result;
 	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 产线看板：当日考勤
+	 * @Date 2020/10/26 15:05
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.Map<java.lang.String,java.lang.Object>>
+	 */
+	 @GetMapping(value = "/getAttendanceOfTheDay")
+	 public Result<Map<String,Object>> getAttendanceOfTheDay(){
+		 Result<Map<String,Object>> result=new Result<>();
+		 try {
+			 Map<String,Object> map=fbsWorkshopDispatchListService.getAttendanceOfTheDay();
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 产线看板：当前生产信息
+	 * @Date 2020/10/26 16:58
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>>
+	 */
+	 @GetMapping(value = "/getDoingListByOrder")
+	 public Result<List<FbsWorkshopDispatchList>> getDoingListByOrder(){
+		 Result<List<FbsWorkshopDispatchList>> result=new Result<>();
+
+		 try {
+			 //派工数据及完工信息
+			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getProductList();
+			 if(fbsWorkshopDispatchListList!=null){
+                 List<String> stringList=new ArrayList<>();//存储库存产品id(code)
+                 for(FbsWorkshopDispatchList dispatchList:fbsWorkshopDispatchListList){
+                     if(StringUtils.isNotBlank(dispatchList.getProductId())){
+                        stringList.add(dispatchList.getProductId());
+                    }
+                }
+                if(stringList.size()>0){
+                     //根据库存产品id查询U8库存产品获取规格
+                    List<FbsInventory> fbsInventoryList=iFbsInventoryService.getListByIds(stringList);
+                    //循环当前数据跟U8数据对应获取数据
+                    for(FbsWorkshopDispatchList dispatchList:fbsWorkshopDispatchListList){
+                        for(FbsInventory fbsInventory:fbsInventoryList){
+                            //判断寻找对应的库存产品id
+                            if(dispatchList.getProductId().equals(fbsInventory.getCinvcode())){
+                                //获取规格
+                                dispatchList.setCinvstd(fbsInventory.getCinvstd());
+                            }
+                        }
+                    }
+                }
+                result.setResult(fbsWorkshopDispatchListList);
+                 result.success("操作成功");
+             }else{
+                 result.setResult(new ArrayList<>());
+                 result.success("未查询到数据");
+             }
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.success("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -180,4 +180,7 @@ public class FbsWorkshopDispatchList implements Serializable {
 	@TableField(exist = false)
 	private Date firstTime;
 
+	/**库存规格*/
+	@TableField(exist = false)
+	private String cinvstd;
 }

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

@@ -88,10 +88,31 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
 
     /**
     * @Author chenchuang
-    * @Description //TODO 当日达成率
+    * @Description //TODO 产线看板： 当日达成率
     * @Date 2020/10/22 15:27
     * @Param []
     * @return java.util.Map<java.lang.String,java.lang.Object>
     */
     Map<String,Object> getAchievementRate();
+
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 产线看板：当日考勤
+    * @Date 2020/10/26 14:38
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getAttendanceOfTheDay();
+
+    /**
+     * @Author chenchuang
+     * @Description //TODO 查询最近的派工单以及完工信息
+     * @Date 2020/10/26 16:20
+     * @Param []
+     * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+     */
+    List<FbsWorkshopDispatchList> getProductList();
+
+
 }

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

@@ -157,5 +157,37 @@
 
           <!--   需要加入单日时间判断 派工单根据计划时间 现场单根据完工时间  -->
     </select>
+
+    <select id="getAttendanceOfTheDay" resultType="java.util.HashMap">
+        SELECT
+            count( pdl.pk_workshop_dispatch_list ) AS '考勤人数',
+            count( fwdl.id ) - count( pdl.pk_workshop_dispatch_list ) AS '未考勤人数'
+        FROM
+            fbs_workshop_dispatch_list fwdl
+            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, '%d' ) = DATE_FORMAT( now( ), '%d' )
+    </select>
+
+    <select id="getProductList" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
+        SELECT
+            fwdl.production_order_number_name,
+            fws.end_date,
+            fwdl.product,
+            fwdl.number_of_tasks,
+            fws.qualified_number,
+            fwdl.product_id
+        FROM
+            fbs_workshop_dispatch_list fwdl
+            LEFT JOIN fbs_working_statistics fws ON fwdl.id = fws.pk_workshop_dispatch_list
+            AND fws.del_flag = '0'
+            AND fws.final_state = '3'
+        WHERE
+            fwdl.del_flag = '0'
+        ORDER BY
+            fwdl.date DESC
+            LIMIT 6
+    </select>
     
 </mapper>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/IFbsWorkshopDispatchListService.java

@@ -91,4 +91,22 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     * @return java.util.Map<java.lang.String,java.lang.Object>
     */
     Map<String,Object> getAchievementRate();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 产线看板：当日考勤
+    * @Date 2020/10/26 14:49
+    * @Param []
+    * @return java.util.Map<java.lang.String,java.lang.Object>
+    */
+    Map<String,Object> getAttendanceOfTheDay();
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询最近的派工单以及完工信息
+    * @Date 2020/10/26 16:25
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList>
+    */
+    List<FbsWorkshopDispatchList> getProductList();
 }

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

@@ -359,5 +359,16 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         return fbsWorkshopDispatchListMapper.getAchievementRate();
     }
 
+    @Override
+    public Map<String, Object> getAttendanceOfTheDay() {
+        Map<String, Object> map=fbsWorkshopDispatchListMapper.getAttendanceOfTheDay();
+        return fbsWorkshopDispatchListMapper.getAttendanceOfTheDay();
+    }
+
+    @Override
+    public List<FbsWorkshopDispatchList> getProductList() {
+        return fbsWorkshopDispatchListMapper.getProductList();
+    }
+
 
 }