From 8482db4506b4d24be0f6b91453f80990df41823f Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 27 Sep 2022 18:19:10 +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 | 52 ++++++++++ .../heai/modules/board/dao/BoardMapper.java | 9 +- .../modules/board/entity/POBoardData.java | 94 +++++++++++++++++++ .../modules/board/service/BoardService.java | 12 +++ .../board/service/impl/BoardServiceImpl.java | 30 +++++- .../resources/mapper/board/BoardMapper.xml | 9 ++ 6 files changed, 198 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/heai/modules/board/entity/POBoardData.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 2301db2..36bf13d 100644 --- a/src/main/java/com/heai/modules/board/controller/BoardController.java +++ b/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 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 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 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 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 49a1928..a13c9c4 100644 --- a/src/main/java/com/heai/modules/board/dao/BoardMapper.java +++ b/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 getStockPrintList(); + + + List PODetailForW(); + } diff --git a/src/main/java/com/heai/modules/board/entity/POBoardData.java b/src/main/java/com/heai/modules/board/entity/POBoardData.java new file mode 100644 index 0000000..baf41ff --- /dev/null +++ b/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; + } +} 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 289c51c..5fb23c4 100644 --- a/src/main/java/com/heai/modules/board/service/BoardService.java +++ b/src/main/java/com/heai/modules/board/service/BoardService.java @@ -107,4 +107,16 @@ public interface BoardService { * @throw */ Map SORoutingBoardForJianYan(int pageIndex); + + + /** + * @Description + * @Title 外购件看板 + * @param + * @author rq + * @date 2021/8/25 15:37 + * @return List + * @throw + */ + Map PODetailForW (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 d554743..90d6135 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 @@ -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 PODetailForW(int pageIndex){ + List list =boardMapper.PODetailForW(); + 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; + } + @Override public List getStockPrintList(){ List result= boardMapper.getStockPrintList(); diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index 115c95c..a060f72 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/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='库存标签' + +