From 7eb12b08faae49121d45ec65f69f173b025d59f4 Mon Sep 17 00:00:00 2001 From: zhangke Date: Mon, 8 Sep 2025 21:41:56 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E9=9B=B6=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=87=BA=E5=BA=93=E5=8D=95=E7=9A=84=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=92=8CSAP=E7=9A=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/wms/admin/service/SapService.java | 99 ++++++++-- .../wms/common/pojo/dto/Response3A051.java | 34 ++++ .../wms/common/pojo/dto/Response3A052.java | 13 ++ .../nflg/wms/common/pojo/dto/ZWM3A19DTO.java | 15 ++ .../wms/common/pojo/dto/ZWM3A19HEADDTO.java | 30 ++++ .../wms/common/pojo/dto/ZWM3A19ITEMDTO.java | 23 +++ .../nflg/wms/common/pojo/dto/ZWM3A20DTO.java | 40 +++++ .../wms/common/pojo/dto/ZWM3A20ITEMDTO.java | 25 +++ .../common/pojo/dto/ZWM3A20ITLIPSITEMDTO.java | 14 ++ .../common/pojo/dto/ZWM3A20ITSERNRDTO.java | 11 ++ .../pojo/dto/ZWM3A20ITSERNRPATCHDTO.java | 12 ++ .../pojo/dto/Zim001QueryResultItem2DTO.java | 4 + .../nflg/wms/common/pojo/vo/POReceiptVO.java | 2 +- .../entity/WmsComponentOutbound.java | 170 ++++++++++++++++++ .../entity/WmsComponentOutboundItem.java | 128 +++++++++++++ .../entity/WmsComponentPacking.java | 160 +++++++++++++++++ .../entity/WmsComponentPackingItem.java | 123 +++++++++++++ .../WmsComponentOutboundItemMapper.java | 16 ++ .../mapper/WmsComponentOutboundMapper.java | 16 ++ .../mapper/WmsComponentPackingItemMapper.java | 16 ++ .../mapper/WmsComponentPackingMapper.java | 16 ++ .../IWmsComponentOutboundItemService.java | 16 ++ .../service/IWmsComponentOutboundService.java | 16 ++ .../IWmsComponentPackingItemService.java | 16 ++ .../service/IWmsComponentPackingService.java | 16 ++ .../WmsComponentOutboundItemServiceImpl.java | 20 +++ .../impl/WmsComponentOutboundServiceImpl.java | 20 +++ .../WmsComponentPackingItemServiceImpl.java | 20 +++ .../impl/WmsComponentPackingServiceImpl.java | 20 +++ .../mapper/WmsComponentOutboundItemMapper.xml | 5 + .../mapper/WmsComponentOutboundMapper.xml | 5 + .../mapper/WmsComponentPackingItemMapper.xml | 5 + .../mapper/WmsComponentPackingMapper.xml | 5 + 33 files changed, 1111 insertions(+), 20 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Response3A051.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Response3A052.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19DTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19HEADDTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19ITEMDTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20DTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITEMDTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITLIPSITEMDTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITSERNRDTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITSERNRPATCHDTO.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutbound.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutboundItem.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPacking.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPackingItem.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentOutboundItemMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentOutboundMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentPackingItemMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentPackingMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentOutboundItemService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentOutboundService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentPackingItemService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentPackingService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentOutboundItemServiceImpl.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentOutboundServiceImpl.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentPackingItemServiceImpl.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentPackingServiceImpl.java create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundItemMapper.xml create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundMapper.xml create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingItemMapper.xml create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml 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 e36e68c7..2a8bad36 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 @@ -884,7 +884,7 @@ public class SapService { * * @param query 委外订单确认的查询参数对象，包含订单号和物料明细等信息 * @return 返回委外订单确认的结果信息，包括物料凭证号和凭证年度 - */ + */ public SubcontractedOrderConfirmDTO zwm3a04(SubcontractedOrderConfirmQO query) { VUtil.trueThrowBusinessError(Objects.isNull(query)).throwMessage("查询内容不可以为空"); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(query.getIItems())).throwMessage("物料明细不能为空"); @@ -1058,26 +1058,26 @@ public class SapService { return result; } -/** - * 厂内调库过账接口 - *

- * 该方法用于调用 SAP 的 RFC 函数 ZWM00_MB113，完成厂内调库的过账操作。 - *

- * - * @param query 查询参数对象，包含过账所需的输入信息和物料明细列表 - * @return 返回包含物料凭证号（MBLNR）和年度（MJAHR）的结果对象 - */ + /** + * 厂内调库过账接口 + *

+ * 该方法用于调用 SAP 的 RFC 函数 ZWM00_MB113，完成厂内调库的过账操作。 + *

+ * + * @param query 查询参数对象，包含过账所需的输入信息和物料明细列表 + * @return 返回包含物料凭证号（MBLNR）和年度（MJAHR）的结果对象 + */ // 厂内调库过账接口 -public ZWM00MB113DTO zwm00_mb113(ZWM00MB113QO query) { - // 校验查询参数及物料明细是否为空 - VUtil.trueThrowBusinessError(Objects.isNull(query)).throwMessage("查询内容不可以为空"); - VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(query.getT_list1())).throwMessage("物料明细不能为空"); + public ZWM00MB113DTO zwm00_mb113(ZWM00MB113QO query) { + // 校验查询参数及物料明细是否为空 + VUtil.trueThrowBusinessError(Objects.isNull(query)).throwMessage("查询内容不可以为空"); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(query.getT_list1())).throwMessage("物料明细不能为空"); - // 构造函数调用所需的输入参数 - Map parameters = new HashMap<>(); - parameters.put("I_RSNUM", query.getIRsnum()); - parameters.put("I_UMLGO", query.getIUmlgo()); - parameters.put("I_USNAM", UserUtil.getUserName()); + // 构造函数调用所需的输入参数 + Map parameters = new HashMap<>(); + parameters.put("I_RSNUM", query.getIRsnum()); + parameters.put("I_UMLGO", query.getIUmlgo()); + parameters.put("I_USNAM", UserUtil.getUserName()); // 将构造好的表数据放入输入参数中 Map>> tables = new HashMap<>(); @@ -1155,6 +1155,67 @@ public ZWM00MB113DTO zwm00_mb113(ZWM00MB113QO query) { } } + /** + * 获取物料的批次信息 + * + * @param iVbelv 交货单 + * @param iWerks 工厂 + * @return 获取零部件出库单的订单信息，每个元素为 {@link ZWM3A19DTO} 类型 + */ + public ZWM3A19DTO zwm3a19(String iVbelv, String iWerks) { + Map parameters = new HashMap<>(); + parameters.put("I_VBELV", iVbelv); + parameters.put("I_WERKS", iWerks); + ZWM3A19DTO result = new ZWM3A19DTO(); + JCoFunction function = exec("ZWM3A19", parameters, null); + JCoStructure structure = function.getExportParameterList().getStructure("E_RETURN"); + VUtil.trueThrowBusinessError(!StrUtil.equals(structure.getString("E_TYPE"), "S")) + .throwMessage("SAP错误:" + structure.getString("E_MSG")); + + JCoTable ot1 = function.getTableParameterList().getTable("HEAD"); + result.setHeadDTOList(JCoUtil.toBeanList(ot1, ZWM3A19HEADDTO.class)); + + JCoTable ot2 = function.getTableParameterList().getTable("ITEM"); + result.setItemDTOList(JCoUtil.toBeanList(ot2, ZWM3A19ITEMDTO.class)); + + log.debug("数据:{}", JSONUtil.toJsonStr(result)); + return result; + } + + + /** + *零部件出库单 过账信息 + * @param dto + * @return + */ + public Pair zwm3a20(ZWM3A20DTO dto) { + Map parameters = new HashMap<>(); + parameters.put("IV_DELIVERY", dto.getIvDelivery()); + parameters.put("I_TYPE", dto.getIType()); + + Map>> tables = new HashMap<>(); + + if (CollectionUtil.isNotEmpty(dto.getItem())) { + tables.put("ITEM", JCoUtil.toMapList(dto.getItem())); + } + if (CollectionUtil.isNotEmpty(dto.getItLipsItem())) { + tables.put("IT_LIPS_ITEM", JCoUtil.toMapList(dto.getItLipsItem())); + } + if (CollectionUtil.isNotEmpty(dto.getItSernr())) { + tables.put("IT_SERNR", JCoUtil.toMapList(dto.getItSernr())); + } + if (CollectionUtil.isNotEmpty(dto.getItSernrPatch())) { + tables.put("IT_SERNR_PATCH", JCoUtil.toMapList(dto.getItSernrPatch())); + } + + JCoFunction function = exec("ZWM3A20", parameters, tables); + + JCoStructure structure = function.getExportParameterList().getStructure("OUTPUT"); + VUtil.trueThrowBusinessError(!StrUtil.equals(structure.getString("TYPE"), "S")) + .throwMessage("SAP错误：" + structure.getString("MSG")); + return Pair.of(structure.getString("MAT_DOC"), structure.getString("DOC_YEAR")); + } + private JCoTable execReturnTable(String functionName, Map parameters) { return execReturnTable(functionName, parameters, null, "T_OUT"); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Response3A051.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Response3A051.java new file mode 100644 index 00000000..b7c09abc --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Response3A051.java @@ -0,0 +1,34 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; + +@Data +public class Response3A051{ + private String temng; + private String matnr; + private String lfbnr; + private String kzkri; + private String ebelp; + private String mblnr; + private String retpo; + private String ebeln; + private String mblpo; + private String menge; + private String lbprt; + private String mjahr; + private String wemng; + private String wshsl; + private String bsart; + private String atwrt; + private String matkl; + private String lifnr; + private String werks; + private String charg; + private String lgort; + private String meins; + private String wgbez; + private String lfpos; + private String webre; + private String lfbja; + private String ekgrp; +} \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Response3A052.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Response3A052.java new file mode 100644 index 00000000..6ff0024b --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Response3A052.java @@ -0,0 +1,13 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; + +@Data +public class Response3A052{ + private String sernr; + private String ebelp; + private String ebeln; + private String lfpos; + private String lfbnr; + private String lfbja; +} \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19DTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19DTO.java new file mode 100644 index 00000000..c253fb45 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19DTO.java @@ -0,0 +1,15 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@Data +@Accessors(chain = true) +public class ZWM3A19DTO { + + private List headDTOList; + + private List itemDTOList; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19HEADDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19HEADDTO.java new file mode 100644 index 00000000..1508d569 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19HEADDTO.java @@ -0,0 +1,30 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class ZWM3A19HEADDTO { + private String datum; + private String sernr; + private String telNumber; + private String uname; + private String wbstk; + private String lName; + private String matnr; + private String gStreen; + private String cnum; + private String zchep; + private String vbelv; + private String bname; + private String maktx; + private String xnum; + private String huodh; + private String pName; + private String vbeln; + private String lBezei; + private String zjshz; + private String name1; + private String gStrSuppl2; +} \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19ITEMDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19ITEMDTO.java new file mode 100644 index 00000000..d5fa1ba3 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19ITEMDTO.java @@ -0,0 +1,23 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class ZWM3A19ITEMDTO { + private String posnr; + private String index; + private String ztext; + private String pmenge; + private String atwrt; + private String ojtxb; + private String zatwrt; + private String potx2; + private String vbeln; + private String meins; + private String idnrk; + private String lgpbe; + private String menge; + private String zxiah; +} \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20DTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20DTO.java new file mode 100644 index 00000000..9beaa967 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20DTO.java @@ -0,0 +1,40 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@Data +@Accessors(chain = true) +public class ZWM3A20DTO { + /** + * 销售和分销凭证号 + */ + private String ivDelivery; + + /** + * A 过账B 冲销 + */ + private String iType; + + /** + * 交货明细 + */ + private List item; + + /** + * 批次拆分 + */ + private List itLipsItem; + + /** + * 序列号 + */ + private List itSernr; + + /** + * 交货明细 + */ + private List itSernrPatch; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITEMDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITEMDTO.java new file mode 100644 index 00000000..e0c4943e --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITEMDTO.java @@ -0,0 +1,25 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class ZWM3A20ITEMDTO { + private String posnr; + private String index; + private String ztext; + private String pmenge; + private String atwrt; + private String ojtxb; + private String zatwrt; + private String potx2; + private String charg; + private String lgort; + private String vbeln; + private String meins; + private String idnrk; + private String lgpbe; + private String menge; + private String zxiah; +} \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITLIPSITEMDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITLIPSITEMDTO.java new file mode 100644 index 00000000..30912fb8 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITLIPSITEMDTO.java @@ -0,0 +1,14 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class ZWM3A20ITLIPSITEMDTO { + private String charg; + private String lgort; + private String posnr; + private String lfimg; + private String matnr; +} \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITSERNRDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITSERNRDTO.java new file mode 100644 index 00000000..58bd2458 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITSERNRDTO.java @@ -0,0 +1,11 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class ZWM3A20ITSERNRDTO{ + private String sernr; + private String posnr; +} \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITSERNRPATCHDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITSERNRPATCHDTO.java new file mode 100644 index 00000000..d1503079 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A20ITSERNRPATCHDTO.java @@ -0,0 +1,12 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class ZWM3A20ITSERNRPATCHDTO{ + private String sernr; + private String charg; + private String posnr; +} \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Zim001QueryResultItem2DTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Zim001QueryResultItem2DTO.java index 7717f373..309d759f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Zim001QueryResultItem2DTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Zim001QueryResultItem2DTO.java @@ -36,4 +36,8 @@ public class Zim001QueryResultItem2DTO { * 序列号 */ private String SERNR; + + private String MBLNR; + + } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/POReceiptVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/POReceiptVO.java index 80f973ba..16245958 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/POReceiptVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/POReceiptVO.java @@ -64,7 +64,7 @@ public class POReceiptVO { /** * 是否已入库，true 是；false 否 */ - private boolean isCompleted; + private Boolean isCompleted; /** * 收货时间 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutbound.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutbound.java new file mode 100644 index 00000000..a07109f5 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutbound.java @@ -0,0 +1,170 @@ +package com.nflg.wms.repository.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wms_component_outbound") +public class WmsComponentOutbound implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 装箱单号 + */ + private String packingNo; + + /** + * 设备编码(物料编码) + */ + private String matnr; + + /** + * 客户名称 + */ + private String name1; + + /** + * 发货员 + */ + private String uname; + + /** + * 销售和分销凭证号（订单号） + */ + private String vbeln; + + /** + * 物料描述（短文本） + */ + private String maktx; + + /** + * 发货日期 + */ + private LocalDateTime datum; + + /** + * 箱号 + */ + private String xnum; + + /** + * 装车号 + */ + private String cnum; + + /** + * 司机 + */ + private String bname; + + /** + * 驾驶证号 + */ + private String zjshz; + + /** + * 车牌号 + */ + private String zchep; + + /** + * 司机电话 + */ + private String telNumbee; + + /** + * BOM展开号 + */ + private String sernr; + + /** + * 货单号 + */ + private String huodh; + + /** + * 起始凭证 + */ + private String vbelv; + + /** + * 办事处代理商 + */ + private String pName; + + /** + * 装运类型的描述 + */ + private String lBezei; + + /** + * 收货单位-T + */ + private String lName; + + /** + * 收货地址-T + */ + private String gStreen; + + /** + * 收货人电话- + */ + private String gStrSuppl2; + + /** + * A 没有处理 B部分处理 C 完全地处理 + */ + private String wbstk; + + /** + * 是否完成入库 + */ + private Boolean isCompleted; + + private Long createId; + + private String createName; + + private LocalDateTime createTime; + + private Long modifyId; + + private String modifyName; + + private LocalDateTime modifyTime; + + /** + * 出库单号 + */ + private String outboundNo; + + /** + * 装箱单ID + */ + private Long packingId; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutboundItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutboundItem.java new file mode 100644 index 00000000..f93cd68d --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentOutboundItem.java @@ -0,0 +1,128 @@ +package com.nflg.wms.repository.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wms_component_outbound_item") +public class WmsComponentOutboundItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 装箱项目ID + */ + private Long packingItemId; + + /** + * 循环，当前通过的编号 + */ + private Integer itemIndex; + + /** + * 销售和分销凭证号序号 + */ + private String vbeln; + + /** + * 交货单项目 + */ + private String posnr; + + /** + * 物料号 + */ + private String idnrk; + + /** + * 物料描述（短文本） + */ + private String ojtxb; + + /** + * 基本计量单位 + */ + private String meins; + + /** + * 装箱数量 + */ + private BigDecimal menge; + + /** + * 图号 + */ + private String atwrt; + + /** + * 备注 + */ + private String zatwrt; + + /** + * 箱号 + */ + private String zxiah; + + /** + * 包装方式 + */ + private String ztext; + + /** + * BOM 项目文本 （行 2） + */ + private String potx2; + + /** + * 采购订单数量 + */ + private String pmenge; + + /** + * 货位号 + */ + private String lgpbe; + + /** + * 库存地点 + */ + private String lgort; + + /** + * 仓储地点的描述 + */ + private String lgobe; + + /** + * 出库数量 + */ + private BigDecimal outQty; + + /** + * 出库单ID + */ + private Long outboundId; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPacking.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPacking.java new file mode 100644 index 00000000..2ad73b6d --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPacking.java @@ -0,0 +1,160 @@ +package com.nflg.wms.repository.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wms_component_packing") +public class WmsComponentPacking implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 装箱单号 + */ + private String no; + + /** + * 设备编码(物料编码) + */ + private String matnr; + + /** + * 客户名称 + */ + private String name1; + + /** + * 发货员 + */ + private String uname; + + /** + * 销售和分销凭证号（订单号） + */ + private String vbeln; + + /** + * 物料描述（短文本） + */ + private String maktx; + + /** + * 发货日期 + */ + private LocalDateTime datum; + + /** + * 箱号 + */ + private String xnum; + + /** + * 装车号 + */ + private String cnum; + + /** + * 司机 + */ + private String bname; + + /** + * 驾驶证号 + */ + private String zjshz; + + /** + * 车牌号 + */ + private String zchep; + + /** + * 司机电话 + */ + private String telNumbee; + + /** + * BOM展开号 + */ + private String sernr; + + /** + * 货单号 + */ + private String huodh; + + /** + * 起始凭证 + */ + private String vbelv; + + /** + * 办事处代理商 + */ + private String pName; + + /** + * 装运类型的描述 + */ + private String lBezei; + + /** + * 收货单位-T + */ + private String lName; + + /** + * 收货地址-T + */ + private String gStreen; + + /** + * 收货人电话- + */ + private String gStrSuppl2; + + /** + * A 没有处理 B部分处理 C 完全地处理 + */ + private String wbstk; + + /** + * 是否完成入库 + */ + private Boolean isCompleted; + + private Long createId; + + private String createName; + + private LocalDateTime createTime; + + private Long modifyId; + + private String modifyName; + + private LocalDateTime modifyTime; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPackingItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPackingItem.java new file mode 100644 index 00000000..b4349dea --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsComponentPackingItem.java @@ -0,0 +1,123 @@ +package com.nflg.wms.repository.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wms_component_packing_item") +public class WmsComponentPackingItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 循环，当前通过的编号 + */ + private Integer itemIndex; + + /** + * 销售和分销凭证号序号 + */ + private String vbeln; + + /** + * 交货单项目 + */ + private String posnr; + + /** + * 物料号 + */ + private String idnrk; + + /** + * 物料描述（短文本） + */ + private String ojtxb; + + /** + * 基本计量单位 + */ + private String meins; + + /** + * 数量 + */ + private BigDecimal menge; + + /** + * 图号 + */ + private String atwrt; + + /** + * 备注 + */ + private String zatwrt; + + /** + * 箱号 + */ + private String zxiah; + + /** + * 包装方式 + */ + private String ztext; + + /** + * BOM 项目文本 （行 2） + */ + private String potx2; + + /** + * 采购订单数量 + */ + private String pmenge; + + /** + * 货位号 + */ + private String lgpbe; + + /** + * 库存地点 + */ + private String lgort; + + /** + * 仓储地点的描述 + */ + private String lgobe; + + /** + * 出库数量 + */ + private BigDecimal outQty; + + /** + * 装箱单ID + */ + private Long packingId; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentOutboundItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentOutboundItemMapper.java new file mode 100644 index 00000000..15d7eab9 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentOutboundItemMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.WmsComponentOutboundItem; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface WmsComponentOutboundItemMapper extends BaseMapper { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentOutboundMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentOutboundMapper.java new file mode 100644 index 00000000..5be14474 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentOutboundMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.WmsComponentOutbound; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface WmsComponentOutboundMapper extends BaseMapper { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentPackingItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentPackingItemMapper.java new file mode 100644 index 00000000..b99df2f1 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentPackingItemMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.WmsComponentPackingItem; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface WmsComponentPackingItemMapper extends BaseMapper { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentPackingMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentPackingMapper.java new file mode 100644 index 00000000..96bd692a --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsComponentPackingMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.WmsComponentPacking; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface WmsComponentPackingMapper extends BaseMapper { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentOutboundItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentOutboundItemService.java new file mode 100644 index 00000000..fd4e474f --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentOutboundItemService.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.service; + +import com.nflg.wms.repository.entity.WmsComponentOutboundItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IWmsComponentOutboundItemService extends IService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentOutboundService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentOutboundService.java new file mode 100644 index 00000000..56c58888 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentOutboundService.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.service; + +import com.nflg.wms.repository.entity.WmsComponentOutbound; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IWmsComponentOutboundService extends IService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentPackingItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentPackingItemService.java new file mode 100644 index 00000000..a9bd53eb --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentPackingItemService.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.service; + +import com.nflg.wms.repository.entity.WmsComponentPackingItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IWmsComponentPackingItemService extends IService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentPackingService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentPackingService.java new file mode 100644 index 00000000..9db4ae52 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsComponentPackingService.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.service; + +import com.nflg.wms.repository.entity.WmsComponentPacking; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IWmsComponentPackingService extends IService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentOutboundItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentOutboundItemServiceImpl.java new file mode 100644 index 00000000..b988a406 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentOutboundItemServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.WmsComponentOutboundItem; +import com.nflg.wms.repository.mapper.WmsComponentOutboundItemMapper; +import com.nflg.wms.repository.service.IWmsComponentOutboundItemService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsComponentOutboundItemServiceImpl extends ServiceImpl implements IWmsComponentOutboundItemService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentOutboundServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentOutboundServiceImpl.java new file mode 100644 index 00000000..03628043 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentOutboundServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.WmsComponentOutbound; +import com.nflg.wms.repository.mapper.WmsComponentOutboundMapper; +import com.nflg.wms.repository.service.IWmsComponentOutboundService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsComponentOutboundServiceImpl extends ServiceImpl implements IWmsComponentOutboundService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentPackingItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentPackingItemServiceImpl.java new file mode 100644 index 00000000..d1ff84a4 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentPackingItemServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.WmsComponentPackingItem; +import com.nflg.wms.repository.mapper.WmsComponentPackingItemMapper; +import com.nflg.wms.repository.service.IWmsComponentPackingItemService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsComponentPackingItemServiceImpl extends ServiceImpl implements IWmsComponentPackingItemService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentPackingServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentPackingServiceImpl.java new file mode 100644 index 00000000..4ea57bc3 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsComponentPackingServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.WmsComponentPacking; +import com.nflg.wms.repository.mapper.WmsComponentPackingMapper; +import com.nflg.wms.repository.service.IWmsComponentPackingService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsComponentPackingServiceImpl extends ServiceImpl implements IWmsComponentPackingService { + +} diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundItemMapper.xml new file mode 100644 index 00000000..4eeb6e82 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundItemMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundMapper.xml new file mode 100644 index 00000000..f354d638 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingItemMapper.xml new file mode 100644 index 00000000..0feed007 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingItemMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml new file mode 100644 index 00000000..2b3417da --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml @@ -0,0 +1,5 @@ + + + + +