0412更新

src/main/java/com/heai/modules/board/controller/BoardController.java

@@ -9,6 +9,7 @@ import com.heai.modules.production.entity.ShopOrderRoutingData;
 import com.heai.modules.production.entity.SiteData;
 import com.heai.modules.production.entity.StockPrintData;
 import com.heai.modules.production.service.DailyPlanService;
+import com.heai.modules.taskmanage.vo.TaskListVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -286,7 +287,23 @@ public class BoardController {
         List<StockPrintData> resultList = boardService.getStockPrintListHunlian();
         return R.ok().put("rows", resultList);
     }
-
+    /**
+     * @Description 沟通看板
+     * @Title getTaskDetailListBoard
+     * @param
+     * @author rq
+     * @date 2021/8/13 14:08
+     * @return double
+     * @throw
+     */
+    @PostMapping("/getTaskDetailListBoard")
+    public Object getTaskDetailListBoard(@RequestBody TaskListVo inData){
+        Map<String, Object> map =boardService.getTaskDetailListBoard(inData);
+        map.put("code",200);
+        map.put("msg", "success");
+        return map;
+        // return R.ok().put("rows", list).put("total",list.size());
+    }
     /**
      * 取消派工单
      * @param inData

src/main/java/com/heai/modules/board/service/BoardService.java

@@ -6,6 +6,7 @@ import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData;
 import com.heai.modules.production.entity.SORoutingData;
 import com.heai.modules.production.entity.SiteData;
 import com.heai.modules.production.entity.StockPrintData;
+import com.heai.modules.taskmanage.vo.TaskListVo;
 
 import java.util.List;
 import java.util.Map;
@@ -151,7 +152,16 @@ public interface BoardService {
      * @throw
      */
     Map<String, Object> SORoutingBoardForBaoZhuang(int pageIndex);
-
+    /**
+     * @Description 沟通看板
+     * @Title getTaskDetailListBoard
+     * @param
+     * @author rq
+     * @date 2021/8/25 15:37
+     * @return List<ViewKanbanCODelNotifyData>
+     * @throw
+     */
+    Map<String, Object> getTaskDetailListBoard(TaskListVo inData);
     /**
      * @Description
      * @Title 外购件看板

src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java

@@ -1,6 +1,7 @@
 package com.heai.modules.board.service.impl;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.heai.common.utils.DateUtil;
 import com.heai.common.utils.WeekUtil;
 import com.heai.modules.board.dao.BoardMapper;
@@ -9,6 +10,9 @@ import com.heai.modules.board.service.BoardService;
 import com.heai.modules.production.entity.SORoutingData;
 import com.heai.modules.production.entity.SiteData;
 import com.heai.modules.production.entity.StockPrintData;
+import com.heai.modules.taskmanage.dao.TaskDetailDao;
+import com.heai.modules.taskmanage.vo.TaskDetailVo;
+import com.heai.modules.taskmanage.vo.TaskListVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +21,8 @@ import java.util.*;
 
 @Service
 public class BoardServiceImpl implements BoardService {
-
+    @Autowired
+    private TaskDetailDao baseMapper;
     @Autowired
     private BoardMapper boardMapper;
     @Override
@@ -318,6 +323,33 @@ public class BoardServiceImpl implements BoardService {
         map.put("total",result.size());
         return map;
     }
+
+    @Override
+    public Map<String, Object> getTaskDetailListBoard(TaskListVo inData ){
+        int pageIndex=inData.getNumber();
+
+        List<TaskDetailVo> list =baseMapper.taskDetailList(inData);
+        double number=list.size();
+        int maxPage=(int)Math.ceil(number/16);
+        if(pageIndex>maxPage){
+            pageIndex=1;
+        }
+        List<TaskDetailVo> result =new ArrayList<>();
+        if(pageIndex<maxPage){
+            for(int i=0;i<16;i++){
+                result.add(list.get((pageIndex-1)*16+i));
+            }
+        }else {
+            for(int i=0;(pageIndex-1)*16+i<number;i++){
+                result.add(list.get((pageIndex-1)*16+i));
+            }
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("maxPage", maxPage);
+        map.put("rows", result);
+        map.put("total",result.size());
+        return map;
+    }
     @Override
     public Map<String, Object> SeqNoForLiuHua(int pageIndex){
         List<SORoutingData> list =boardMapper.SeqNoForLiuHua();

src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java

@@ -24,6 +24,7 @@ public class ShopOrderRoutingData extends ShopOrderData{
     private float efficiency;
     private float scheduledQty;
     private float qtyfinished;
+    private Double partPlanQty;
     private Integer eLevels;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -288,4 +289,12 @@ public class ShopOrderRoutingData extends ShopOrderData{
     public void setUserId(String userId) {
         this.userId = userId;
     }
+
+    public Double getPartPlanQty() {
+        return partPlanQty;
+    }
+
+    public void setPartPlanQty(Double partPlanQty) {
+        this.partPlanQty = partPlanQty;
+    }
 }

src/main/java/com/heai/modules/taskmanage/vo/TaskListVo.java

@@ -28,6 +28,6 @@ public class TaskListVo {
     private Date finishStartDate;
     private Date finishEndDate;
     private String ipAddress;
-
+    private int number;
 
 }

src/main/resources/mapper/production/DailyPlanMapper.xml

@@ -204,7 +204,7 @@
         select   a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,
         P.PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.qtyReported,S.qtyApprove,S.machSetupTime,
         S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,isnull(SOP.TotalFinishedQty,0) lastApproveQty,dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo) weightFactor,
-        Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.LotSize,2) weight
+        Round(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderNo)*a.LotSize,2) weight,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderNo) partPlanQty
         FROM ShopOrder a
         LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
         LEFT JOIN SORouting S on S.site=a.site and S.OrderNo=a.orderNo
@@ -262,7 +262,7 @@
         select   a.site, a.OrderNo,a.PartNo,a.Status,a.OrderRef1,a.OrderDate,a.OrderQty as LotSize,
         P.PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.machSetupTime,
         S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc,s.Efficiency,a.qtyfinished,a.finishFlag,ROUND(dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1)*a.OrderQty,2) as weight,
-        dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1) as weightFactor
+        dbo.Get_PartWeightFactorForReport(a.site,a.PartNo,a.OrderRef1) as weightFactor,dbo.Get_PartPlanQty(a.site,a.PartNo,a.OrderRef1) partPlanQty
         FROM SOTaskOrderHeader a
         LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
         LEFT JOIN SORouting S on S.site=a.site and S.OrderNo=a.OrderRef1