From 7a8f07ef76b7d5064b41c8c31326b33c4d47b50c Mon Sep 17 00:00:00 2001 From: zhangke Date: Thu, 11 Sep 2025 11:43:56 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=9B=B6=E9=83=A8=E4=BB=B6=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComponentOutboundController.java | 2 +- .../ComponentPackingController.java | 26 +++++++++++++++++++ .../ComponentPackingControllerService.java | 12 ++++----- .../nflg/wms/admin/service/SapService.java | 1 + .../pojo/qo/ComponentPackingInputQO.java | 10 +++---- .../pojo/qo/ComponentPackingItemInputQO.java | 2 +- .../common/pojo/vo/ComponentOutboundVO.java | 22 ++++++++++++---- .../common/pojo/vo/ComponentPackingVO.java | 2 +- .../mapper/WmsComponentOutboundMapper.xml | 2 +- 9 files changed, 59 insertions(+), 20 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java index 8c508dfa..15508e50 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java @@ -145,7 +145,7 @@ public class ComponentOutboundController { .setItSernrPatch(new ArrayList<>()) .setItem(new ArrayList<>()) .setItSernr(new ArrayList<>()) - .setItSernrPatch(new ArrayList<>()) + .setItLipsItem(new ArrayList<>()) .setIType("A") .setIvDelivery(packing.getVbelv()); for (ComponentOutboundItemInputQO item : request.getItems()) { diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java index 1083e8f8..2022378e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java @@ -8,6 +8,7 @@ import com.nflg.wms.admin.service.SapService; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.ZWM3A19DTO; +import com.nflg.wms.common.pojo.dto.ZWM3A19ITEMDTO; import com.nflg.wms.common.pojo.dto.ZWM3A21QueryDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.*; @@ -96,6 +97,31 @@ public class ComponentPackingController { VUtil.trueThrowBusinessError(StrUtil.isBlank(result.getHeadDTO().getWbstk()) || result.getHeadDTO().getWbstk().equalsIgnoreCase("C")) .throwMessage("此交货单已完成了过账"); + result.getHeadDTO().setGStreen("setGStreen"); + result.getHeadDTO().setGStrSuppl2("setGStrSuppl2"); + result.getHeadDTO().setTelNumber("setTelNumber"); + result.getHeadDTO().setCnum("setCnum"); + result.getHeadDTO().setHuodh("setHuodh"); + result.getHeadDTO().setBname("setBname"); + result.getHeadDTO().setMaktx("setMaktx"); + result.getHeadDTO().setMatnr("setMatnr"); + result.getHeadDTO().setSernr("setSernr"); + result.getHeadDTO().setUname("setUname"); + result.getHeadDTO().setXnum("setXnum"); + result.getHeadDTO().setZchep("setZchep"); + result.getHeadDTO().setZjshz("setZjshz"); + result.getHeadDTO().setZjshz("setZjshz"); + for (ZWM3A19ITEMDTO itemDTO : result.getItemDTOList()) + { + itemDTO.setAtwrt("setAtwrt"); + itemDTO.setLgort("setLgort"); + itemDTO.setLgobe("setLgobe"); + itemDTO.setLgpbe("setLgpbe"); + itemDTO.setPotx2("setPotx2"); + itemDTO.setZatwrt("setZatwrt"); + itemDTO.setZtext("setZtext"); + itemDTO.setZxiah("setZxiah"); + } return ApiResult.success(result); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentPackingControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentPackingControllerService.java index d743d9c5..9085ded1 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentPackingControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentPackingControllerService.java @@ -54,11 +54,11 @@ public class ComponentPackingControllerService { wmsComponentPacking.setSernr(request.getSernr()); wmsComponentPacking.setHuodh(request.getHuodh()); wmsComponentPacking.setVbelv(request.getVbelv()); - wmsComponentPacking.setPName(request.getPName()); - wmsComponentPacking.setLBezei(request.getLBezei()); - wmsComponentPacking.setLName(request.getLName()); - wmsComponentPacking.setGStreen(request.getGStreen()); - wmsComponentPacking.setGStrSuppl2(request.getGStrSuppl2()); + wmsComponentPacking.setPName(request.getPname()); + wmsComponentPacking.setLBezei(request.getLbezei()); + wmsComponentPacking.setLName(request.getLname()); + wmsComponentPacking.setGStreen(request.getGstreen()); + wmsComponentPacking.setGStrSuppl2(request.getGstrSuppl2()); wmsComponentPacking.setWbstk(request.getWbstk()); wmsComponentPacking.setIsCompleted((short) 0); wmsComponentPacking.setCreateName(UserUtil.getUserName()); @@ -68,7 +68,7 @@ public class ComponentPackingControllerService { List wmsComponentPackingItems = request.getItems().stream() .map(item -> new WmsComponentPackingItem() .setId(IdUtil.getSnowflakeNextId()) - .setItemIndex(item.getItemIndex()) + .setItemIndex(item.getIndex()) .setVbeln(item.getVbeln()) .setPosnr(item.getPosnr()) .setIdnrk(item.getIdnrk()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java index 97fa7db8..40e441f7 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java @@ -1196,6 +1196,7 @@ public class SapService { * @return */ public Pair zwm3a20(ZWM3A20DTO dto) { + // return Pair.of("Test", "TestYear"); Map parameters = new HashMap<>(); parameters.put("IV_DELIVERY", dto.getIvDelivery()); parameters.put("I_TYPE", dto.getIType()); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingInputQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingInputQO.java index 700f4bee..95b5802e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingInputQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingInputQO.java @@ -89,27 +89,27 @@ public class ComponentPackingInputQO { /** * 办事处代理商 */ - private String pName; + private String pname; /** * 装运类型的描述 */ - private String lBezei; + private String lbezei; /** * 收货单位-T */ - private String lName; + private String lname; /** * 收货地址-T */ - private String gStreen; + private String gstreen; /** * 收货人电话- */ - private String gStrSuppl2; + private String gstrSuppl2; /** * A 没有处理 B部分处理 C 完全地处理 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingItemInputQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingItemInputQO.java index a0c998f4..c9f42487 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingItemInputQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingItemInputQO.java @@ -11,7 +11,7 @@ public class ComponentPackingItemInputQO { /** * 循环，当前通过的编号 */ - private Integer itemIndex; + private Integer index; /** * 销售和分销凭证号序号 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentOutboundVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentOutboundVO.java index 2a1dcb5a..2756e055 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentOutboundVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentOutboundVO.java @@ -1,7 +1,12 @@ package com.nflg.wms.common.pojo.vo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.time.LocalDateTime; +@Data +@Accessors(chain = true) public class ComponentOutboundVO { /** @@ -119,11 +124,6 @@ public class ComponentOutboundVO { */ private String wbstk; - /** - * 是否完成入库 - */ - private Boolean isCompleted; - /** * 出库单号 */ @@ -138,4 +138,16 @@ public class ComponentOutboundVO { * 所属工厂 */ private String factoryNo; + + private Long createId; + + private String createName; + + private LocalDateTime createTime; + + private Long modifyId; + + private String modifyName; + + private LocalDateTime modifyTime; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingVO.java index 1061f064..3c1606ea 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingVO.java @@ -46,7 +46,7 @@ public class ComponentPackingVO { /** * 发货日期 */ - private LocalDate datum; + private LocalDateTime datum; /** * 箱号 diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundMapper.xml index 7ab281ba..c7dadbae 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundMapper.xml @@ -5,7 +5,7 @@