From ae1f9fd1d60646aa4c312e53f54789a94d44a6ed Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Thu, 7 Mar 2024 09:19:45 +0800 Subject: [PATCH] =?UTF-8?q?24-03-06=20=E7=94=9F=E4=BA=A7=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../board/controller/BoardController.java | 7 +++ .../heai/modules/board/dao/BoardMapper.java | 7 +++ .../modules/board/service/BoardService.java | 12 +++++ .../board/service/impl/BoardServiceImpl.java | 50 +++++++++++++++++++ .../production/entity/PackagePrintData.java | 29 +++++++++++ .../resources/mapper/board/BoardMapper.xml | 40 +++++++++++++++ 6 files changed, 145 insertions(+) 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 e0e2c45..be6234a 100644 --- a/src/main/java/com/heai/modules/board/controller/BoardController.java +++ b/src/main/java/com/heai/modules/board/controller/BoardController.java @@ -12,6 +12,7 @@ import com.heai.modules.taskmanage.vo.TaskListVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -306,6 +307,12 @@ public class BoardController { List resultList4 = boardService.getStockPrintListCaiGou(ip); return R.ok().put("rows", resultList).put("rows2", resultList2).put("rows3", resultList3).put("rows4", resultList4); } + + @GetMapping("/getPackagePrintDataList") + public R getPackagePrintDataList(Integer previousSeqNo, BigDecimal number, String site, String orderNo){ + List list = boardService.getPackagePrintDataList(previousSeqNo, number, site, orderNo); + return R.ok().put("rows",list); + } /** * @Description TODO * @Title getStockPrintList 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 ae79ce0..3be32d6 100644 --- a/src/main/java/com/heai/modules/board/dao/BoardMapper.java +++ b/src/main/java/com/heai/modules/board/dao/BoardMapper.java @@ -7,8 +7,10 @@ import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Map; @Mapper public interface BoardMapper { @@ -158,6 +160,7 @@ public interface BoardMapper { * @throw */ List getPackagePrintData(String ip); + List getPackagePrintDataList(@Param("seqNo") Integer seqNo, @Param("number") BigDecimal number); /** * @Description TODO * @Title getStockPrintOutBox @@ -208,4 +211,8 @@ public interface BoardMapper { * @throw */ BIBoardAddressData searchBIBoardAddress(BIBoardAddressData inData); + + Map getCustomerInfo(@Param("site") String site,@Param("orderNo") String orderNo); + + String getWorkCenterProLineNo(@Param("site")String site, @Param("workCenterNo")String workCenterNo); } 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 f86e8ab..44232d8 100644 --- a/src/main/java/com/heai/modules/board/service/BoardService.java +++ b/src/main/java/com/heai/modules/board/service/BoardService.java @@ -6,7 +6,9 @@ import com.heai.modules.board.entity.ViewKanbanCODelNotifyData; import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData; import com.heai.modules.production.entity.*; import com.heai.modules.taskmanage.vo.TaskListVo; +import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -247,4 +249,14 @@ public interface BoardService { * @throw */ BIBoardAddressData searchBIBoardAddress(BIBoardAddressData inData); + + /** + * 打印标签 + * @param previousSeqNo + * @param number + * @param site + * @param orderNo + * @return + */ + List getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo); } 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 15e49d9..b3e6e80 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 @@ -16,8 +16,10 @@ 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; +import org.springframework.util.StringUtils; import javax.print.attribute.standard.PrinterInfo; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -562,4 +564,52 @@ public class BoardServiceImpl implements BoardService { return boardMapper.searchBIBoardAddress(inData); } + @Override + public List getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo) { + // 1、上一道工序 + if (StringUtils.isEmpty(site)){ + throw new RuntimeException("参数Site为空"); + } + if (StringUtils.isEmpty(orderNo)){ + throw new RuntimeException("参数orderNo为空"); + } + // 2、返回集合 + List list = boardMapper.getPackagePrintDataList(previousSeqNo,number); + if (list.isEmpty()){ + throw new RuntimeException("派工单未查询到标签信息"); + } + PackagePrintData packagePrintData = list.get(0); + String workCenterProLine = boardMapper.getWorkCenterProLineNo(packagePrintData.getSite(),packagePrintData.getWorkCenterNo()); + if (!"PACKING".equals(workCenterProLine)){ + throw new RuntimeException("该派工单工序不是包装工序"); + } + if (Objects.nonNull(number)){ + packagePrintData.setUnitQty(number.doubleValue()); + } + Map map = boardMapper.getCustomerInfo(site,orderNo); + System.out.println(map); + if ("TBC".equals(map.get("CustomerGroup"))){ + packagePrintData.setKeyInfoStr1(map.get("LogoFileName")); + packagePrintData.setKeyInfoStr1(map.get("CustomerDesc")); + }else { + packagePrintData.setKeyInfoStr1("AMLogo.jpg"); + packagePrintData.setKeyInfoStr1("A&M Polymer"); + } + switch (map.get("ABC")){ + case "A": + packagePrintData.setCode("CODE39"); + break; + case "B": + case "C": + packagePrintData.setCode("CODE128"); + break; + default: + packagePrintData.setCode("CODEXX"); + break; + } + // 参数赋值 + List resultList = new ArrayList<>(); + resultList.add(packagePrintData); + return resultList; + } } diff --git a/src/main/java/com/heai/modules/production/entity/PackagePrintData.java b/src/main/java/com/heai/modules/production/entity/PackagePrintData.java index 7feeb5e..aa559dd 100644 --- a/src/main/java/com/heai/modules/production/entity/PackagePrintData.java +++ b/src/main/java/com/heai/modules/production/entity/PackagePrintData.java @@ -31,6 +31,35 @@ public class PackagePrintData { private String keyInfoStr1; private String keyInfoStr2; + private String code; + + private String workCenterNo; + + private String site; + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } public Integer getId() { return id; diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index 80af6ea..66915fa 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -306,5 +306,45 @@ + + + + + +