From 20f34537b36bac7fbbca8b1691f5e2a6d8974bd0 Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Tue, 12 Mar 2024 15:37:47 +0800 Subject: [PATCH] =?UTF-8?q?24-03-12=20=E5=87=BA=E5=BA=93=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../board/controller/BoardController.java | 5 +++++ .../modules/board/service/BoardService.java | 2 ++ .../board/service/impl/BoardServiceImpl.java | 19 ++++++++++++++----- .../modules/pad/vo/DelNotifyDetailVo.java | 4 ++++ .../resources/mapper/board/BoardMapper.xml | 2 +- .../mapper/pad/DelNotifyDetailMapper.xml | 4 +++- 6 files changed, 29 insertions(+), 7 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 d1993d0..5435b6a 100644 --- a/src/main/java/com/heai/modules/board/controller/BoardController.java +++ b/src/main/java/com/heai/modules/board/controller/BoardController.java @@ -446,6 +446,11 @@ public class BoardController { return R.ok().put("data",boardService.getPartValue(site,partNo)); } + @GetMapping("/checkIsPacking") + public R checkIsPacking(String site,String workCenterNo){ + return R.ok().put("data",boardService.isPackingWorkCenter(site,workCenterNo)); + } + /** * 保存扫描记录 * @param outboundLabelScan 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 6ac3be3..922f0e0 100644 --- a/src/main/java/com/heai/modules/board/service/BoardService.java +++ b/src/main/java/com/heai/modules/board/service/BoardService.java @@ -261,4 +261,6 @@ public interface BoardService { List getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo); BigDecimal getPartValue(String site,String partNo); + + boolean isPackingWorkCenter(String site,String workCenterNo); } 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 dbfe14f..db1e93e 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 @@ -579,15 +579,14 @@ public class BoardServiceImpl implements BoardService { throw new RuntimeException("派工单未查询到标签信息"); } PackagePrintData packagePrintData = list.get(0); - String workCenterProLine = boardMapper.getWorkCenterProLineNo(packagePrintData.getSite(),packagePrintData.getWorkCenterNo()); - if (!"PACKING".equals(workCenterProLine)){ - throw new RuntimeException("该派工单工序不是包装工序"); - } +// 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")); @@ -624,4 +623,14 @@ public class BoardServiceImpl implements BoardService { } return boardMapper.getPartValue(site,partNo); } + + + @Override + public boolean isPackingWorkCenter(String site, String workCenterNo) { + String workCenterProLine = boardMapper.getWorkCenterProLineNo(site,workCenterNo); + if (!"PACKING".equals(workCenterProLine)){ + throw new RuntimeException("该派工单工序不是包装工序"); + } + return true; + } } diff --git a/src/main/java/com/heai/modules/pad/vo/DelNotifyDetailVo.java b/src/main/java/com/heai/modules/pad/vo/DelNotifyDetailVo.java index 050432a..7ffa20d 100644 --- a/src/main/java/com/heai/modules/pad/vo/DelNotifyDetailVo.java +++ b/src/main/java/com/heai/modules/pad/vo/DelNotifyDetailVo.java @@ -4,6 +4,8 @@ import com.heai.modules.pad.entity.DelNotifyDetail; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + @EqualsAndHashCode(callSuper = true) @Data public class DelNotifyDetailVo extends DelNotifyDetail { @@ -18,4 +20,6 @@ public class DelNotifyDetailVo extends DelNotifyDetail { private String orderType; private String subOrderType; private String contractNo; + + private BigDecimal allNum; } diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index 2f99282..9407c85 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -333,7 +333,7 @@ On P.Site=V.Site and P.PartNo=V.PartNo and P.CodeNo=V.CodeNo and V.SubCodeSeqNo=1 and V.RecordType='P' and V.PropertiesItemNo='BILNOTE' ,Site as S Where T.Site=S.SiteID and T.Site=SO.Site and T.OrderNo=SO.OrderNo - and SO.Site=P.Site and SO.PartNo=P.PartNo and t.SeqNo = #{seqNo,jdbcType=INTEGER} + and SO.Site=P.Site and SO.PartNo=P.PartNo and t.AssJobSeqNo = #{seqNo,jdbcType=INTEGER} @@ -57,7 +58,8 @@ D.Ins_ApproveResultFlag, D.Ins_ApprovedBy, D.Ins_ApprovedDate, - D.Ins_Remark + D.Ins_Remark, + (select sum(o.scan_qty) from outbound_label_scan o where o.Site = D.Site and o.del_notify_no = D.DelNotifyNo and o.del_notify_item_no = D.DelNotifyItemNo) as allNum from dbo.CODelNotifyDetail as D, dbo.COHeader as Y,