0412更新

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<String, Object> 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());
+    }
 }

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<ViewKanbanSoHunlianPlanData> productionBlankingBoard(@Param("startDate") String startDate, @Param("endDate") String endDate);
 
-
+    /**
+     * @Description 生产硫化看板
+     * @Title productionBlankingBoard
+     * @param
+     * @author rq
+     * @date 2021/8/25 15:37
+     * @return List<ViewKanbanCODelNotifyData>
+     * @throw
+     */
+    List<ViewKanbanSoLiuhuaPlanData> soLiuhuaBoard(@Param("startDate") String startDate, @Param("endDate") String endDate);
 
     /**
      * @Description 生产打料查询

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;
+    }
+}
+

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

@@ -40,4 +40,15 @@ public interface BoardService {
      * @throw
      */
     Map<String, Object> productionBlankingBoard(int pageIndex);
+
+    /**
+     * @Description 硫化看板
+     * @Title soLiuhuaBoard
+     * @param
+     * @author rq
+     * @date 2021/8/25 15:37
+     * @return
+     * @throw
+     */
+    Map<String, Object> soLiuhuaBoard(int pageIndex);
 }

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<String, Object> 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<ViewKanbanSoLiuhuaPlanData> list =boardMapper.soLiuhuaBoard(null,day2);
+        double number=list.size();
+        int maxPage=(int)Math.ceil(number/18);
+        if(pageIndex>maxPage){
+            pageIndex=1;
+        }
+        List<ViewKanbanSoLiuhuaPlanData> result =new ArrayList<>();
+        if(pageIndex<maxPage){
+            for(int i=0;i<18;i++){
+                result.add(list.get((pageIndex-1)*18+i));
+            }
+        }else {
+            for(int i=0;(pageIndex-1)*18+i<number;i++){
+                result.add(list.get((pageIndex-1)*18+i));
+            }
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("maxPage", maxPage);
+        map.put("rows", result);
+        map.put("total",result.size());
+        return map;
+    }
 }

src/main/resources/mapper/board/BoardMapper.xml

@@ -32,6 +32,22 @@
         </where>
         Order By PlanStartDate
     </select>
+
+        <select id="soLiuhuaBoard" resultType="com.heai.modules.board.entity.ViewKanbanSoLiuhuaPlanData">
+        select OrderNo,site,PartNo,PartDescSpec,QtyRequired,QtyFinished,PlanStartDate,erpStatus,FinishedFlag FROM view_KANBAN_SO_Liuhua_Plan
+        <where>
+             <if test="startDate != null ">
+                 AND PlanStartDate >=   #{startDate}
+            </if>
+             <if test="endDate != null ">
+                 AND #{endDate} >=   PlanStartDate
+            </if>
+            AND Site IN ('1','2')
+
+        </where>
+        Order By PlanStartDate
+    </select>
+
     <select id="productionBlankingSearch" resultType="com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData" parameterType="com.heai.modules.production.entity.DailyPlanInData">
         select OrderNo,site,PartNo,PartDescSpec,ComponentPartNo,CompPartDescSpec,SJPH1,SJPH_QtyReq1,SJPH2,SJPH_QtyReq2,QtyRequired,QtyFinished,PlanStartDate,CompOrderNo,
         FinishedFlag,erpStatus FROM view_KANBAN_SO_Hunlian_Plan