From 24036530a5556b8b97c2f76c342cdad374e01dfa Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 29 Nov 2022 16:01:37 +0800 Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../board/controller/BoardController.java | 19 ++++++++++- .../modules/board/service/BoardService.java | 12 ++++++- .../board/service/impl/BoardServiceImpl.java | 34 ++++++++++++++++++- .../entity/ShopOrderRoutingData.java | 9 +++++ .../modules/taskmanage/vo/TaskListVo.java | 2 +- .../mapper/production/DailyPlanMapper.xml | 4 +-- 6 files changed, 74 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/heai/modules/board/controller/BoardController.java b/src/main/java/com/heai/modules/board/controller/BoardController.java index 49fb841..884931d 100644 --- a/src/main/java/com/heai/modules/board/controller/BoardController.java +++ b/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 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 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 diff --git a/src/main/java/com/heai/modules/board/service/BoardService.java b/src/main/java/com/heai/modules/board/service/BoardService.java index a017ed6..8dc542d 100644 --- a/src/main/java/com/heai/modules/board/service/BoardService.java +++ b/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 SORoutingBoardForBaoZhuang(int pageIndex); - + /** + * @Description 沟通看板 + * @Title getTaskDetailListBoard + * @param + * @author rq + * @date 2021/8/25 15:37 + * @return List + * @throw + */ + Map getTaskDetailListBoard(TaskListVo inData); /** * @Description * @Title 外购件看板 diff --git a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java index 21a2c9b..998c9ca 100644 --- a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java +++ b/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 getTaskDetailListBoard(TaskListVo inData ){ + int pageIndex=inData.getNumber(); + + List list =baseMapper.taskDetailList(inData); + double number=list.size(); + int maxPage=(int)Math.ceil(number/16); + if(pageIndex>maxPage){ + pageIndex=1; + } + List result =new ArrayList<>(); + if(pageIndex map = new HashMap<>(); + map.put("maxPage", maxPage); + map.put("rows", result); + map.put("total",result.size()); + return map; + } @Override public Map SeqNoForLiuHua(int pageIndex){ List list =boardMapper.SeqNoForLiuHua(); diff --git a/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java b/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java index 08167db..a97fcdf 100644 --- a/src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java +++ b/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; + } } diff --git a/src/main/java/com/heai/modules/taskmanage/vo/TaskListVo.java b/src/main/java/com/heai/modules/taskmanage/vo/TaskListVo.java index 91fd4a9..eb16aac 100644 --- a/src/main/java/com/heai/modules/taskmanage/vo/TaskListVo.java +++ b/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; } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index ef4658a..49ae34e 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/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