From be70721d7ccbd0d169f153c8f9e4a780320ed2f7 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 12 Apr 2022 11:22: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 | 20 +++ .../heai/modules/board/dao/BoardMapper.java | 12 +- .../entity/ViewKanbanSoLiuhuaPlanData.java | 138 ++++++++++++++++++ .../modules/board/service/BoardService.java | 11 ++ .../board/service/impl/BoardServiceImpl.java | 32 ++++ .../resources/mapper/board/BoardMapper.xml | 16 ++ 6 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/heai/modules/board/entity/ViewKanbanSoLiuhuaPlanData.java 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 3b92ae9..7a45c15 100644 --- a/src/main/java/com/heai/modules/board/controller/BoardController.java +++ b/src/main/java/com/heai/modules/board/controller/BoardController.java @@ -3,6 +3,7 @@ package com.heai.modules.board.controller; import com.heai.common.utils.R; import com.heai.modules.board.entity.ViewKanbanCODelNotifyData; import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData; +import com.heai.modules.board.entity.ViewKanbanSoLiuhuaPlanData; import com.heai.modules.board.service.BoardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -75,4 +76,23 @@ public class BoardController { return map; // return R.ok().put("rows", list).put("total",list.size()); } + + + /** + * @Description 硫化看板 + * @Title soLiuhuaBoard + * @param + * @author rq + * @date 2021/8/13 14:08 + * @return double + * @throw + */ + @PostMapping("/soLiuhuaBoard") + public Object soLiuhuaBoard(@RequestBody ViewKanbanSoLiuhuaPlanData inData){ + Map map =boardService.soLiuhuaBoard(inData.getNumber()); + map.put("code",200); + map.put("msg", "success"); + return map; + // return R.ok().put("rows", list).put("total",list.size()); + } } diff --git a/src/main/java/com/heai/modules/board/dao/BoardMapper.java b/src/main/java/com/heai/modules/board/dao/BoardMapper.java index 193c154..881dd5f 100644 --- a/src/main/java/com/heai/modules/board/dao/BoardMapper.java +++ b/src/main/java/com/heai/modules/board/dao/BoardMapper.java @@ -2,6 +2,7 @@ package com.heai.modules.board.dao; import com.heai.modules.board.entity.ViewKanbanCODelNotifyData; import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData; +import com.heai.modules.board.entity.ViewKanbanSoLiuhuaPlanData; import com.heai.modules.production.entity.DailyPlanInData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -34,7 +35,16 @@ public interface BoardMapper { */ List productionBlankingBoard(@Param("startDate") String startDate, @Param("endDate") String endDate); - + /** + * @Description 生产硫化看板 + * @Title productionBlankingBoard + * @param + * @author rq + * @date 2021/8/25 15:37 + * @return List + * @throw + */ + List soLiuhuaBoard(@Param("startDate") String startDate, @Param("endDate") String endDate); /** * @Description 生产打料查询 diff --git a/src/main/java/com/heai/modules/board/entity/ViewKanbanSoLiuhuaPlanData.java b/src/main/java/com/heai/modules/board/entity/ViewKanbanSoLiuhuaPlanData.java new file mode 100644 index 0000000..01a4e0e --- /dev/null +++ b/src/main/java/com/heai/modules/board/entity/ViewKanbanSoLiuhuaPlanData.java @@ -0,0 +1,138 @@ +package com.heai.modules.board.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +public class ViewKanbanSoLiuhuaPlanData { + /** + * + */ + private String orderNo; + + /** + * + */ + private String site; + + /** + * + */ + private String partNo; + + /** + * + */ + private String partDescSpec; + + /** + * + */ + private Double qtyRequired; + + /** + * + */ + private Double qtyFinished; + + /** + * + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date planStartDate; + + /** + * + */ + private String erpStatus; + + /** + * + */ + private String finishedFlag; + + private int number; + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getPartDescSpec() { + return partDescSpec; + } + + public void setPartDescSpec(String partDescSpec) { + this.partDescSpec = partDescSpec; + } + + public Double getQtyRequired() { + return qtyRequired; + } + + public void setQtyRequired(Double qtyRequired) { + this.qtyRequired = qtyRequired; + } + + public Double getQtyFinished() { + return qtyFinished; + } + + public void setQtyFinished(Double qtyFinished) { + this.qtyFinished = qtyFinished; + } + + public Date getPlanStartDate() { + return planStartDate; + } + + public void setPlanStartDate(Date planStartDate) { + this.planStartDate = planStartDate; + } + + public String getErpStatus() { + return erpStatus; + } + + public void setErpStatus(String erpStatus) { + this.erpStatus = erpStatus; + } + + public String getFinishedFlag() { + return finishedFlag; + } + + public void setFinishedFlag(String finishedFlag) { + this.finishedFlag = finishedFlag; + } + + public int getNumber() { + return number; + } + + public void setNumber(int number) { + this.number = number; + } +} + 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 786382a..c3fa4a5 100644 --- a/src/main/java/com/heai/modules/board/service/BoardService.java +++ b/src/main/java/com/heai/modules/board/service/BoardService.java @@ -40,4 +40,15 @@ public interface BoardService { * @throw */ Map productionBlankingBoard(int pageIndex); + + /** + * @Description 硫化看板 + * @Title soLiuhuaBoard + * @param + * @author rq + * @date 2021/8/25 15:37 + * @return + * @throw + */ + Map soLiuhuaBoard(int pageIndex); } 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 8d2f9c3..0487476 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 @@ -6,6 +6,7 @@ import com.heai.common.utils.WeekUtil; import com.heai.modules.board.dao.BoardMapper; import com.heai.modules.board.entity.ViewKanbanCODelNotifyData; import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData; +import com.heai.modules.board.entity.ViewKanbanSoLiuhuaPlanData; import com.heai.modules.board.service.BoardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -114,4 +115,35 @@ public class BoardServiceImpl implements BoardService { return map; } + @Override + public Map soLiuhuaBoard(int pageIndex){ + int week= WeekUtil.getWeekOfYear(new Date()); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + Date date = new Date(); + int year = Integer.parseInt(format.format(date).substring(0,4)); + //获取下周的第一天和最后一天 + String day1= DateUtil.getStringDate(WeekUtil.getFirstDayOfWeek(year,week)); + String day2=DateUtil.getStringDate(DateUtil.getAddDate(WeekUtil.getLastDayOfWeek(year,week),7)); + List list =boardMapper.soLiuhuaBoard(null,day2); + double number=list.size(); + int maxPage=(int)Math.ceil(number/18); + 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; + } } diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index 3465cd0..a519f5e 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -32,6 +32,22 @@ Order By PlanStartDate + + +