From 3aa245c93388cedcf126631d6c9794f22b2c2d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Wed, 29 Oct 2025 15:36:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E9=87=8D=E9=87=8F=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/heai/modules/board/controller/BoardController.java | 4 ++-- src/main/java/com/heai/modules/board/dao/BoardMapper.java | 2 ++ .../java/com/heai/modules/board/service/BoardService.java | 2 +- .../heai/modules/board/service/impl/BoardServiceImpl.java | 6 +++++- .../heai/modules/production/entity/PrintLabelRecord.java | 1 + src/main/resources/mapper/board/BoardMapper.xml | 3 +++ 6 files changed, 14 insertions(+), 4 deletions(-) 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 d69bc6b..95d0473 100644 --- a/src/main/java/com/heai/modules/board/controller/BoardController.java +++ b/src/main/java/com/heai/modules/board/controller/BoardController.java @@ -311,8 +311,8 @@ public class BoardController { } @GetMapping("/getPackagePrintDataList") - public R getPackagePrintDataList(Integer previousSeqNo, BigDecimal number, String site, String orderNo,String seqNo){ - List list = boardService.getPackagePrintDataList(previousSeqNo, number, site, orderNo,seqNo); + public R getPackagePrintDataList(Integer previousSeqNo, BigDecimal number, String site, String orderNo,String seqNo,BigDecimal weight){ + List list = boardService.getPackagePrintDataList(previousSeqNo, number, site, orderNo,seqNo,weight); return R.ok().put("rows",list); } @PostMapping("/packagePrintDataList") 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 2999d82..21903f2 100644 --- a/src/main/java/com/heai/modules/board/dao/BoardMapper.java +++ b/src/main/java/com/heai/modules/board/dao/BoardMapper.java @@ -229,4 +229,6 @@ public interface BoardMapper { String getWorkCenterProLineNo(@Param("site")String site, @Param("workCenterNo")String workCenterNo); BigDecimal getPartValue(@Param("site")String site,@Param("partNo")String partNo); + + PrintLabelRecord getPrintLabelRecordById(Long id); } 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 eb9499f..737cc40 100644 --- a/src/main/java/com/heai/modules/board/service/BoardService.java +++ b/src/main/java/com/heai/modules/board/service/BoardService.java @@ -263,7 +263,7 @@ public interface BoardService { * @param orderNo * @return */ - List getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo,String seqNo); + List getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo,String seqNo,BigDecimal weight); List packagePrintDataList(PrintLabelRecord printLabelRecord); List getTCPPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo, Date nowTime,String seqNo) throws CloneNotSupportedException; 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 3b4dee5..54818ba 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 @@ -12,6 +12,7 @@ import com.heai.modules.board.entity.*; import com.heai.modules.board.service.BoardService; import com.heai.modules.pad.entity.AttachmentListData; import com.heai.modules.production.dao.FunctionMapper; +import com.heai.modules.production.dao.PrintLabelRecordMapper; import com.heai.modules.production.dao.SoScheduledListMapper; import com.heai.modules.production.dao.TcpMapper; import com.heai.modules.production.entity.*; @@ -671,7 +672,7 @@ public class BoardServiceImpl implements BoardService { } @Override - public List getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo,String seqNo) { + public List getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo,String seqNo,BigDecimal weight) { // 1、上一道工序 if (StringUtils.isEmpty(site)){ throw new RuntimeException("参数Site为空"); @@ -716,6 +717,7 @@ public class BoardServiceImpl implements BoardService { record.setPrintQty(BigDecimal.valueOf(packagePrintData.getUnitQty())); record.setCreateTime(new Date()); record.setScanSeqNo(Long.valueOf(seqNo)); + record.setWeight(weight); // 添加初始化状态 record.setStatus("未入库"); printLabelRecordService.save(record); @@ -740,6 +742,7 @@ public class BoardServiceImpl implements BoardService { } // 2、返回集合 List list = boardMapper.getPackagePrintDataList(printLabelRecord.getSeqNo().intValue(),printLabelRecord.getQty()); + PrintLabelRecord labelData = boardMapper.getPrintLabelRecordById(printLabelRecord.getId()); if (list.isEmpty()){ throw new RuntimeException("派工单未查询到标签信息"); } @@ -768,6 +771,7 @@ public class BoardServiceImpl implements BoardService { break; } packagePrintData.setPrintId(printLabelRecord.getItemNo()); + packagePrintData.setTcpValue(labelData.getWeight().toString()); List resultList = new ArrayList<>(); packagePrintData.setUnitQty(printLabelRecord.getPrintQty().doubleValue()); resultList.add(packagePrintData); diff --git a/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java b/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java index 5ae7d26..7550421 100644 --- a/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java +++ b/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java @@ -59,4 +59,5 @@ public class PrintLabelRecord { private String partDesc; @TableField(exist = false) private Long printId; + private BigDecimal weight; } diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index 3ee2ab5..9730f59 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -493,5 +493,8 @@ +