0412更新

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

@@ -135,6 +135,58 @@ 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("/SORoutingBoardForXiuBian")
+    public Object SORoutingBoardForXiuBian(@RequestBody ViewKanbanSoLiuhuaPlanData inData){
+        Map<String, Object> map =boardService.SORoutingBoardForXiuBian(inData.getNumber());
+        map.put("code",200);
+        map.put("msg", "success");
+        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("/SORoutingBoardForJianYan")
+    public Object SORoutingBoardForJianYan(@RequestBody ViewKanbanSoLiuhuaPlanData inData){
+        Map<String, Object> map =boardService.SORoutingBoardForJianYan(inData.getNumber());
+        map.put("code",200);
+        map.put("msg", "success");
+        return map;
+        // return R.ok().put("rows", list).put("total",list.size());
+    }
+
+    /**
+     * @Description 外购件看板
+     * @Title PODetailForW
+     * @param
+     * @author rq
+     * @date 2021/8/13 14:08
+     * @return double
+     * @throw
+     */
+    @PostMapping("/PODetailForW")
+    public Object PODetailForW(@RequestBody ViewKanbanSoLiuhuaPlanData inData){
+        Map<String, Object> map =boardService.PODetailForW(inData.getNumber());
+        map.put("code",200);
+        map.put("msg", "success");
+        return map;
+        // return R.ok().put("rows", list).put("total",list.size());
+    }
 
     /**
      * @Description TODO

src/main/java/com/heai/modules/board/dao/BoardMapper.java

@@ -1,9 +1,6 @@
 package com.heai.modules.board.dao;
 
-import com.heai.modules.board.entity.TransFerBoardData;
-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.entity.*;
 import com.heai.modules.production.entity.DailyPlanInData;
 import com.heai.modules.production.entity.SORoutingData;
 import com.heai.modules.production.entity.StockPrintData;
@@ -93,4 +90,8 @@ public interface BoardMapper {
      * @throw
      */
     List<StockPrintData> getStockPrintList();
+
+
+    List<POBoardData> PODetailForW();
+
 }

src/main/java/com/heai/modules/board/entity/POBoardData.java

@@ -0,0 +1,94 @@
+package com.heai.modules.board.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.ibatis.type.Alias;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+@Alias("POBoardData")
+public class POBoardData {
+    private String site;
+    private String orderNo;
+    private String partNo;
+    private String partDesc;
+    private String qty;
+    private String receiveQty;
+    private String arriveQty;
+    private String supplierDesc;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date wantReceiveDate;
+
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getPartNo() {
+        return partNo;
+    }
+
+    public void setPartNo(String partNo) {
+        this.partNo = partNo;
+    }
+
+    public String getPartDesc() {
+        return partDesc;
+    }
+
+    public void setPartDesc(String partDesc) {
+        this.partDesc = partDesc;
+    }
+
+    public String getQty() {
+        return qty;
+    }
+
+    public void setQty(String qty) {
+        this.qty = qty;
+    }
+
+    public String getReceiveQty() {
+        return receiveQty;
+    }
+
+    public void setReceiveQty(String receiveQty) {
+        this.receiveQty = receiveQty;
+    }
+
+    public String getArriveQty() {
+        return arriveQty;
+    }
+
+    public void setArriveQty(String arriveQty) {
+        this.arriveQty = arriveQty;
+    }
+
+    public String getSupplierDesc() {
+        return supplierDesc;
+    }
+
+    public void setSupplierDesc(String supplierDesc) {
+        this.supplierDesc = supplierDesc;
+    }
+
+    public Date getWantReceiveDate() {
+        return wantReceiveDate;
+    }
+
+    public void setWantReceiveDate(Date wantReceiveDate) {
+        this.wantReceiveDate = wantReceiveDate;
+    }
+}

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

@@ -107,4 +107,16 @@ public interface BoardService {
      * @throw
      */
     Map<String, Object> SORoutingBoardForJianYan(int pageIndex);
+
+
+    /**
+     * @Description
+     * @Title 外购件看板
+     * @param
+     * @author rq
+     * @date 2021/8/25 15:37
+     * @return List<ViewKanbanCODelNotifyData>
+     * @throw
+     */
+    Map<String, Object> PODetailForW (int pageIndex);
 }

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

@@ -4,10 +4,7 @@ package com.heai.modules.board.service.impl;
 import com.heai.common.utils.DateUtil;
 import com.heai.common.utils.WeekUtil;
 import com.heai.modules.board.dao.BoardMapper;
-import com.heai.modules.board.entity.TransFerBoardData;
-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.entity.*;
 import com.heai.modules.board.service.BoardService;
 import com.heai.modules.production.entity.SORoutingData;
 import com.heai.modules.production.entity.StockPrintData;
@@ -248,6 +245,31 @@ public class BoardServiceImpl implements BoardService {
         return map;
     }
 
+    @Override
+    public Map<String, Object> PODetailForW(int pageIndex){
+        List<POBoardData> list =boardMapper.PODetailForW();
+        double number=list.size();
+        int maxPage=(int)Math.ceil(number/18);
+        if(pageIndex>maxPage){
+            pageIndex=1;
+        }
+        List<POBoardData> 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;
+    }
+
     @Override
     public List<StockPrintData> getStockPrintList(){
         List<StockPrintData> result= boardMapper.getStockPrintList();

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

@@ -103,5 +103,14 @@
         select b.TransNo,b.Site,b.WareHouseId,b.BatchNo,b.LocationId,b.PartNo,b.OrderNo,b.TransDate,b.Qty,b.PrintFlag,b.site+'|'+ b.PartNo+'|'+b.WareHouseId+'|'+b.BatchNo+b.LocationId as seqNo
         from print_info a left join StockPrint b on a.site=b.site and a.orderref1=b.TransNo where a.status='N' and a.orderref2='库存标签'
     </select>
+
+     <select id="PODetailForW" resultType="POBoardData">
+        SELECT pd.Site, pd.orderNo, pd.PartNo,dbo.Get_Part_DescSpec(pd.Site,pd.PartNo) partDesc,pd.Qty,pd.ArriveQty,pd.ReceiveQty,
+        dbo.Get_SupplierDesc(pd.Site,ph.SupplierID) supplierDesc,pd.WantReceiveDate
+        FROM PODetail pd left join POHeader ph on pd.site=ph.site and pd.orderNo=ph.orderNo
+        left join SupplierforPart sp on ph.site=sp.Site and ph.SupplierID =sp.SupplierID and  pd.PartNo=sp.PartNo
+        where pd.Status='已接收' and pd.InspectType_DB ='2' and sp.site is not null and pd.ArriveQty>pd.ReceiveQty
+        ORDER BY pd.WantReceiveDate desc
+    </select>
 </mapper>