From 590fe80e247d3740219a6cd0de2e6397433e3d99 Mon Sep 17 00:00:00 2001 From: zhangke Date: Sat, 2 Aug 2025 16:12:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E9=A2=86=E6=96=99=E5=92=8C=E9=80=80=E6=96=99=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加了中心领料和退料相关的数据传输对象(DTO)和查询对象(QO) - 新增了中心领料和退料的控制器、服务接口和实现类 - 创建了中心领料和退料的数据库表结构及对应的实体类 - 实现了中心领料和退料的基本业务逻辑,包括查询、详情获取等功能 --- .../controller/CeneterOutboundControlelr.java | 52 +++++++ .../controller/CenterReturnController.java | 132 ++++++++++++++++++ .../nflg/wms/admin/service/SapService.java | 16 +++ .../pojo/dto/C_MaterialOutboundDTO.java | 21 +++ .../dto/C_MaterialOutboundItemQueryDTO.java | 29 ++++ .../pojo/dto/C_MaterialOutboundQueryDTO.java | 17 +++ .../pojo/qo/C_MaterialOutboundItemQO.java | 35 +++++ .../common/pojo/qo/C_MaterialOutboundQO.java | 19 +++ .../pojo/qo/C_MaterialOutboundSearchQO.java | 13 ++ .../pojo/qo/C_MaterialReturnItemQO.java | 6 + .../pojo/qo/C_MaterialReturnSearchQO.java | 12 ++ .../pojo/vo/C_MaterialOutboundItemVO.java | 52 +++++++ .../common/pojo/vo/C_MaterialOutboundVO.java | 67 +++++++++ .../pojo/vo/C_MaterialReturnItemVO.java | 54 +++++++ .../common/pojo/vo/C_MaterialReturnVO.java | 64 +++++++++ .../nflg/wms/common/pojo/vo/ScanCodeVO.java | 36 +++++ .../repository/entity/WmsCenterOutbound.java | 88 ++++++++++++ .../entity/WmsCenterOutboundItem.java | 73 ++++++++++ .../entity/WmsCenterOutboundScan.java | 63 +++++++++ .../repository/entity/WmsCenterReturn.java | 83 +++++++++++ .../entity/WmsCenterReturnItem.java | 73 ++++++++++ .../entity/WmsCenterReturnScan.java | 63 +++++++++ .../entity/WmsOutboundRecommendation.java | 64 +++++++++ .../mapper/WmsCenterOutboundItemMapper.java | 16 +++ .../mapper/WmsCenterOutboundMapper.java | 16 +++ .../mapper/WmsCenterOutboundScanMapper.java | 16 +++ .../mapper/WmsCenterReturnItemMapper.java | 16 +++ .../mapper/WmsCenterReturnMapper.java | 16 +++ .../mapper/WmsCenterReturnScanMapper.java | 16 +++ .../WmsOutboundRecommendationMapper.java | 16 +++ .../IWmsCenterOutboundItemService.java | 16 +++ .../IWmsCenterOutboundScanService.java | 16 +++ .../service/IWmsCenterOutboundService.java | 16 +++ .../service/IWmsCenterReturnItemService.java | 16 +++ .../service/IWmsCenterReturnScanService.java | 16 +++ .../service/IWmsCenterReturnService.java | 16 +++ .../IWmsOutboundRecommendationService.java | 16 +++ .../WmsCenterOutboundItemServiceImpl.java | 20 +++ .../WmsCenterOutboundScanServiceImpl.java | 20 +++ .../impl/WmsCenterOutboundServiceImpl.java | 20 +++ .../impl/WmsCenterReturnItemServiceImpl.java | 20 +++ .../impl/WmsCenterReturnScanServiceImpl.java | 20 +++ .../impl/WmsCenterReturnServiceImpl.java | 20 +++ .../WmsOutboundRecommendationServiceImpl.java | 20 +++ .../mapper/WmsCenterOutboundItemMapper.xml | 5 + .../mapper/WmsCenterOutboundMapper.xml | 5 + .../mapper/WmsCenterOutboundScanMapper.xml | 5 + .../mapper/WmsCenterReturnItemMapper.xml | 5 + .../mapper/WmsCenterReturnMapper.xml | 5 + .../mapper/WmsCenterReturnScanMapper.xml | 5 + .../WmsOutboundRecommendationMapper.xml | 5 + .../wms/repository/CodeGeneratorTest.java | 2 +- 52 files changed, 1532 insertions(+), 1 deletion(-) create mode 100644 nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CeneterOutboundControlelr.java create mode 100644 nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CenterReturnController.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundDTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundItemQueryDTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundQueryDTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundItemQO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundQO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundSearchQO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialReturnSearchQO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundItemVO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundVO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnItemVO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnVO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ScanCodeVO.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutbound.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutboundItem.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutboundScan.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturn.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturnItem.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturnScan.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutboundRecommendation.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsCenterOutboundItemMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsCenterOutboundMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsCenterOutboundScanMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsCenterReturnItemMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsCenterReturnMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsCenterReturnScanMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsOutboundRecommendationMapper.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsCenterOutboundItemService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsCenterOutboundScanService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsCenterOutboundService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsCenterReturnItemService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsCenterReturnScanService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsCenterReturnService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsOutboundRecommendationService.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterOutboundItemServiceImpl.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterOutboundScanServiceImpl.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterOutboundServiceImpl.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterReturnItemServiceImpl.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterReturnScanServiceImpl.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterReturnServiceImpl.java create mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutboundRecommendationServiceImpl.java create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundItemMapper.xml create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundMapper.xml create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundScanMapper.xml create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnItemMapper.xml create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnMapper.xml create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnScanMapper.xml create mode 100644 nflg-wms-repository/src/main/resources/mapper/WmsOutboundRecommendationMapper.xml diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CeneterOutboundControlelr.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CeneterOutboundControlelr.java new file mode 100644 index 00000000..d9dced19 --- /dev/null +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CeneterOutboundControlelr.java @@ -0,0 +1,52 @@ +package com.nflg.wms.admin.controller; + +import com.nflg.wms.common.pojo.ApiResult; +import com.nflg.wms.common.pojo.PageData; +import com.nflg.wms.common.pojo.qo.C_MaterialOutboundItemQO; +import com.nflg.wms.common.pojo.qo.C_MaterialOutboundSearchQO; +import com.nflg.wms.common.pojo.qo.C_MaterialReturnSearchQO; +import com.nflg.wms.common.pojo.vo.C_MaterialOutboundVO; +import com.nflg.wms.common.pojo.vo.C_MaterialReturnItemVO; +import com.nflg.wms.common.pojo.vo.C_MaterialReturnVO; +import com.nflg.wms.common.pojo.vo.ScanCodeVO; +import com.nflg.wms.starter.annotation.ApiMark; +import jakarta.validation.Valid; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 中心领料单 + */ +@RestController +@RequestMapping("/center/outbound") +public class CeneterOutboundControlelr { + @PostMapping("search") + @ApiMark(moduleName = "中心领料单管理", apiName = "领料单列表") + public ApiResult> search(@Valid @RequestBody C_MaterialOutboundSearchQO request) { + // return ApiResult.success(wmsSrmOrderService.search(request)); + } + + //收货单详情 + @GetMapping("getOrderItem") + @ApiMark(moduleName = "中心领料单管理", apiName = "领料单详情") + public ApiResult getOrderItem(@RequestParam Long orderId) { + // return ApiResult.success(wmsSrmOrderItemService.getOrderItem(orderId)); + } + + // 根据预留单号查询出库信息 + + //确认出库 + + // 获取出库单列表信息 + + // 获取出库单详情信息 + + //获取物料的扫码信息 + @GetMapping("getScanCodes") + @ApiMark(moduleName = "中心领料单管理", apiName = "条码详情") + public List getScanCodes(@RequestParam String orderItemId) { + // return wmsSrmOrderItemService.getScanCodes(orderItemId); + } + // 获取物料出库的推荐批次(根据物料编号+仓库+工厂+数量 按照有效期和批次号进行升序排序) +} diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CenterReturnController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CenterReturnController.java new file mode 100644 index 00000000..45bbfc39 --- /dev/null +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/CenterReturnController.java @@ -0,0 +1,132 @@ +package com.nflg.wms.admin.controller; + +import cn.hutool.core.collection.CollectionUtil; +import com.nflg.wms.common.pojo.ApiResult; +import com.nflg.wms.common.pojo.PageData; +import com.nflg.wms.common.pojo.qo.C_MaterialReturnSearchQO; +import com.nflg.wms.common.pojo.vo.*; +import com.nflg.wms.repository.entity.WmsCenterReturnItem; +import com.nflg.wms.repository.entity.WmsCenterReturnScan; +import com.nflg.wms.repository.service.IWmsCenterReturnItemService; +import com.nflg.wms.repository.service.IWmsCenterReturnScanService; +import com.nflg.wms.repository.service.IWmsCenterReturnService; +import com.nflg.wms.starter.annotation.ApiMark; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 中心退料单 + */ +@RestController +@RequestMapping("/center/return") +public class CenterReturnController { + @Resource + private IWmsCenterReturnService wmsCenterReturnService; + + @Resource + private IWmsCenterReturnItemService wmsCenterReturnItemService; + + @Resource + private IWmsCenterReturnScanService wmsCenterReturnScanService; + @Autowired + private IWmsCenterReturnItemService iWmsCenterReturnItemService; + + + @PostMapping("search") + @ApiMark(moduleName = "中心物料退库管理", apiName = "退库单列表") + public ApiResult> search(@Valid @RequestBody C_MaterialReturnSearchQO request) { + // return ApiResult.success(wmsSrmOrderService.search(request)); + } + + /** + * 获取退库单详情 + * @param orderId 退库单ID,不能为空 + * @return 退库单详情列表 + */ + @GetMapping("getItems") + @ApiMark(moduleName = "中心物料退库管理", apiName = "退库单单详情") + public ApiResult> getOrderItem(@RequestParam @NotNull Long orderId) { + + // 查询退库单对应的明细项 + List items = wmsCenterReturnItemService.lambdaQuery() + .eq(WmsCenterReturnItem::getOrderId, orderId) + .list(); + + // 如果明细项为空,返回空列表 + if (CollectionUtil.isEmpty(items)) { + return ApiResult.success(Collections.emptyList()); + } + + // 将明细项转换为VO对象 + List vos = items.stream() + .map(this::convertToVO) + .collect(Collectors.toList()); + + return ApiResult.success(vos); + } + + + private C_MaterialReturnItemVO convertToVO(WmsCenterReturnItem item) { + C_MaterialReturnItemVO vo = new C_MaterialReturnItemVO(); + if (item != null) { + vo.setId(item.getId()); + vo.setOrderId(item.getOrderId()); + vo.setReservedNumberId(item.getReservedNumberId()); + vo.setMaterialNo(item.getMaterialNo()); + vo.setMaterialDesc(item.getMaterialDesc()); + vo.setUnit(item.getUnit()); + vo.setFactory(item.getFactory()); + vo.setReturnQty(item.getReturnQty()); + vo.setWarehouseNumber(item.getWarehouseNumber()); + } + return vo; + } + + // 根据预留单号查询退货信息 + + //用户确认退货 + + + /** + * 根据订单项ID获取扫码信息列表 + * + * @param orderItemId 订单项ID,不能为空 + * @return 返回扫码信息列表的API结果 + */ + @GetMapping("getScanCodes") + public ApiResult> getScanCodes(@RequestParam @NotNull Long orderItemId) { + // 查询指定订单项ID的扫码记录 + List wmsCenterReturnScans = wmsCenterReturnScanService.lambdaQuery() + .eq(WmsCenterReturnScan::getItemId, orderItemId) + .list(); + if (CollectionUtil.isEmpty(wmsCenterReturnScans)) { + return ApiResult.success(Collections.emptyList()); + } + + // 将扫码记录转换为VO对象列表 + List scanCodeVOS = wmsCenterReturnScans.stream() + .map(this::convertToScanCodeVO) + .collect(Collectors.toList()); + + return ApiResult.success(scanCodeVOS); + } + + + private ScanCodeVO convertToScanCodeVO(WmsCenterReturnScan wmsCenterReturnScan) { + ScanCodeVO scanCodeVO = new ScanCodeVO(); + scanCodeVO.setCodeId(wmsCenterReturnScan.getCodeId()); + scanCodeVO.setCodeNum(wmsCenterReturnScan.getCodeNum()); + scanCodeVO.setBatchNumber(wmsCenterReturnScan.getBatchNumber()); + scanCodeVO.setSerialNumber(wmsCenterReturnScan.getSerialNumber()); + return scanCodeVO; + } + +} 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 b06a3e79..ec4a714c 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 @@ -9,6 +9,7 @@ import com.nflg.wms.admin.pojo.dto.ZIM003DTO; import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.pojo.dto.*; +import com.nflg.wms.common.pojo.qo.C_MaterialOutboundQO; import com.nflg.wms.common.pojo.qo.C_MaterialReturnItemQO; import com.nflg.wms.common.pojo.qo.C_MaterialReturnQO; import com.nflg.wms.common.pojo.qo.ScanCodeQO; @@ -341,11 +342,26 @@ public class SapService { JCoTable tOut = function.getTableParameterList().getTable("T_OUT"); log.info("SAP返回: {}", tOut); + C_MaterialReturnDTO result = new C_MaterialReturnDTO() + .setEMblnr(tOut.getString("E_MBLNR")) + .setEMJahr(tOut.getString("E_MJAHR")) + .setRequestQO(request); return null; } //成本中心领料查询 + public C_MaterialOutboundQueryDTO zwm00_MB026(String resebRsNum) throws JCoException { + + return null; + } + + public C_MaterialOutboundDTO ZWM00_MB115(C_MaterialOutboundQO request) throws JCoException { + + return null; + } + + //成本中心领料 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/C_MaterialOutboundDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundDTO.java new file mode 100644 index 00000000..7cea55fc --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundDTO.java @@ -0,0 +1,21 @@ +package com.nflg.wms.common.pojo.dto; + +import com.nflg.wms.common.pojo.qo.C_MaterialOutboundQO; +import com.nflg.wms.common.pojo.qo.C_MaterialReturnQO; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@Data +@Accessors(chain = true) +public class C_MaterialOutboundDTO { + //物料凭证(202移动类型凭证) + private String eMblnr; + + //物料凭证年度 + private String eMJahr; + + //中心退库的物料详情信息 + private C_MaterialOutboundQO requestQO; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundItemQueryDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundItemQueryDTO.java new file mode 100644 index 00000000..534b4d45 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundItemQueryDTO.java @@ -0,0 +1,29 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +@Data +@Accessors(chain = true) +public class C_MaterialOutboundItemQueryDTO { + private String resbRsnum; + // 预留项目号 RESB-RSPOS + private String resbRspos; + //RESB-MATNR 物料号 + private String resbMatnr; + + //MAKTX 物料描述 + private String maktx; + + //wqyls 需求数量 + private BigDecimal wqyls; + + // RESB-LGORT 库存地点 + private String resbLgort; + // RESB-WERKS 工厂 + private String resbWerks; + //RESB-MEINS 单位 + private String resbMeins; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundQueryDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundQueryDTO.java new file mode 100644 index 00000000..afcf232d --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/C_MaterialOutboundQueryDTO.java @@ -0,0 +1,17 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@Data +@Accessors(chain = true) +public class C_MaterialOutboundQueryDTO { + private String resbRsnum; + // 预留项目号 RKPF-WEMPF + private String rkpfWempf; + + //领料明细 + private List items; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundItemQO.java new file mode 100644 index 00000000..897a7a9b --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundItemQO.java @@ -0,0 +1,35 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@Data +@Accessors(chain = true) +public class C_MaterialOutboundItemQO { + + //预留项目号 + private String resbRspos; + + // 物料号 + private String resbMatnr; + + //MAKTX 物料描述 + private String maktx; + + //库存地点 + private String resbLgort; + + // 工厂 + private String resbWerks; + + // 单位 + private String resbMeins; + + // 实际出库数量 + private String resbErfmg; + + //扫码信息 + private List scanCodes; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundQO.java new file mode 100644 index 00000000..a557b68f --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundQO.java @@ -0,0 +1,19 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@Data +@Accessors(chain = true) +public class C_MaterialOutboundQO { + //预留号 + private String resbRsNum; + + //PDA操作员 + private String pdaOperator; + + // 预留单退料详情信息 + private List items; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundSearchQO.java new file mode 100644 index 00000000..f8dcd25c --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialOutboundSearchQO.java @@ -0,0 +1,13 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; + +@Data +public class C_MaterialOutboundSearchQO extends SearchBaseQO { + + //领料单号 + private String orderNumber; + + //中心预留号 + private String reservedNumber; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialReturnItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialReturnItemQO.java index eb878ce2..ab0ad993 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialReturnItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialReturnItemQO.java @@ -17,6 +17,9 @@ public class C_MaterialReturnItemQO { // 物料号 private String resbMatnr; + //MAKTX 物料描述 + private String maktx; + //库存地点 private String resbLgort; @@ -26,6 +29,9 @@ public class C_MaterialReturnItemQO { // 单位 private String resbMeins; + // 退库数量 + private String erfmg; + //扫码信息 private List scanCodes; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialReturnSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialReturnSearchQO.java new file mode 100644 index 00000000..d73efce9 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/C_MaterialReturnSearchQO.java @@ -0,0 +1,12 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; + +@Data +public class C_MaterialReturnSearchQO extends SearchBaseQO { + //退料单号 + private String orderNumber; + + //中心预留号 + private String reservedNumber; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundItemVO.java new file mode 100644 index 00000000..4072b723 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundItemVO.java @@ -0,0 +1,52 @@ +package com.nflg.wms.common.pojo.vo; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +@Data +@Accessors(chain = true) +public class C_MaterialOutboundItemVO { + + private Long id; + + /** + * 出库单的ID + */ + private Long orderId; + + /** + * 预留单行号 + */ + private String reservedNumberId; + + /** + * 物料编号 + */ + private String materialNo; + + /** + * 物料描述 + */ + private String materialDesc; + + /** + * 单位 + */ + private String unit; + + /** + * 工厂 + */ + private String factory; + + /** + * 领料数量 + */ + private BigDecimal qty; + + /** + * 默认仓库 + */ + private String warehouseNumber; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundVO.java new file mode 100644 index 00000000..e0ba4d12 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundVO.java @@ -0,0 +1,67 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +@Data +@Accessors(chain = true) +public class C_MaterialOutboundVO { + private Long id; + + /** + * 出库单号-O+yyMMdd+4为流水号 + */ + private String orderNumber; + + /** + * 预留单号 + */ + private String reservedNumber; + + /** + * 物品凭证 + */ + private String materialDoc; + + /** + * 物料年度凭证 + */ + private String materialDocYear; + + /** + * 创建人编号 + */ + private Long createUserId; + + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * sap导入的状态 + */ + private Boolean sapStatus; + + /** + * sap导入异常信息 + */ + private String sapMsg; + + /** + * 流水号 + */ + private Integer serialNumber; + + /** + * 工位 + */ + private String workstation; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnItemVO.java new file mode 100644 index 00000000..cf244549 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnItemVO.java @@ -0,0 +1,54 @@ +package com.nflg.wms.common.pojo.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +@Data +@Accessors(chain = true) +public class C_MaterialReturnItemVO { + private Long id; + + /** + * 退库单的ID + */ + private Long orderId; + + /** + * 预留单行号 + */ + private String reservedNumberId; + + /** + * 物料编号 + */ + private String materialNo; + + /** + * 物料描述 + */ + private String materialDesc; + + /** + * 单位 + */ + private String unit; + + /** + * 工厂 + */ + private String factory; + + /** + * 退货数量 + */ + private BigDecimal returnQty; + + /** + * 默认仓库 + */ + private String warehouseNumber; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnVO.java new file mode 100644 index 00000000..a5b7c362 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnVO.java @@ -0,0 +1,64 @@ +package com.nflg.wms.common.pojo.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +@Data +@Accessors(chain = true) +public class C_MaterialReturnVO { + private Long id; + + /** + * 退库单号-TK+yyMMdd+4为流水号 + */ + private String orderNumber; + + /** + * 预留单号 + */ + private String reservedNumber; + + /** + * 物品凭证 + */ + private String materialDoc; + + /** + * 物料年度凭证 + */ + private String materialDocYear; + + /** + * 创建人编号 + */ + private Long createUserId; + + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * sap导入的状态 + */ + private Boolean sapStatus; + + /** + * sap导入异常信息 + */ + private String sapMsg; + + /** + * 流水号 + */ + private Integer serialNumber; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ScanCodeVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ScanCodeVO.java new file mode 100644 index 00000000..039683c2 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ScanCodeVO.java @@ -0,0 +1,36 @@ +package com.nflg.wms.common.pojo.vo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class ScanCodeVO { + + /** + * 二维码编号 + */ + private String codeId; + + /** + * 数量 + */ + @NotNull + private BigDecimal codeNum; + + /** + * 批次号 + */ + private String batchNumber; + + /** + * 序列号 + */ + private String serialNumber; + + /** + * 二维码内容 + */ + private String codeContent; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutbound.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutbound.java new file mode 100644 index 00000000..a5fb4099 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutbound.java @@ -0,0 +1,88 @@ +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_center_outbound") +public class WmsCenterOutbound implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 出库单号-O+yyMMdd+4为流水号 + */ + private String orderNumber; + + /** + * 预留单号 + */ + private String reservedNumber; + + /** + * 物品凭证 + */ + private String materialDoc; + + /** + * 物料年度凭证 + */ + private String materialDocYear; + + /** + * 创建人编号 + */ + private Long createUserId; + + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * sap导入的状态 + */ + private Boolean sapStatus; + + /** + * sap导入异常信息 + */ + private String sapMsg; + + /** + * 流水号 + */ + private Integer serialNumber; + + /** + * 工位 + */ + private String workstation; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutboundItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutboundItem.java new file mode 100644 index 00000000..11d8ce3e --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutboundItem.java @@ -0,0 +1,73 @@ +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_center_outbound_item") +public class WmsCenterOutboundItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 出库单的ID + */ + private Long orderId; + + /** + * 预留单行号 + */ + private String reservedNumberId; + + /** + * 物料编号 + */ + private String materialNo; + + /** + * 物料描述 + */ + private String materialDesc; + + /** + * 单位 + */ + private String unit; + + /** + * 工厂 + */ + private String factory; + + /** + * 领料数量 + */ + private BigDecimal qty; + + /** + * 默认仓库 + */ + private String warehouseNumber; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutboundScan.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutboundScan.java new file mode 100644 index 00000000..bc0f6765 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterOutboundScan.java @@ -0,0 +1,63 @@ +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_center_outbound_scan") +public class WmsCenterOutboundScan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 出库单的详情ID + */ + private Long itemId; + + /** + * 二维码编号 + */ + private String codeId; + + /** + * 数量 + */ + private BigDecimal codeNum; + + /** + * 批次号 + */ + private String batchNumber; + + /** + * 序列号,多个序列号使用;号隔开 + */ + private String serialNumber; + + /** + * 二维码内容 + */ + private String codeContent; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturn.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturn.java new file mode 100644 index 00000000..b7e6b83c --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturn.java @@ -0,0 +1,83 @@ +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_center_return") +public class WmsCenterReturn implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 退库单号-TK+yyMMdd+4为流水号 + */ + private String orderNumber; + + /** + * 预留单号 + */ + private String reservedNumber; + + /** + * 物品凭证 + */ + private String materialDoc; + + /** + * 物料年度凭证 + */ + private String materialDocYear; + + /** + * 创建人编号 + */ + private Long createUserId; + + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * sap导入的状态 + */ + private Boolean sapStatus; + + /** + * sap导入异常信息 + */ + private String sapMsg; + + /** + * 流水号 + */ + private Integer serialNumber; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturnItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturnItem.java new file mode 100644 index 00000000..61d7a934 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturnItem.java @@ -0,0 +1,73 @@ +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_center_return_item") +public class WmsCenterReturnItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 退库单的ID + */ + private Long orderId; + + /** + * 预留单行号 + */ + private String reservedNumberId; + + /** + * 物料编号 + */ + private String materialNo; + + /** + * 物料描述 + */ + private String materialDesc; + + /** + * 单位 + */ + private String unit; + + /** + * 工厂 + */ + private String factory; + + /** + * 退货数量 + */ + private BigDecimal returnQty; + + /** + * 默认仓库 + */ + private String warehouseNumber; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturnScan.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturnScan.java new file mode 100644 index 00000000..0eeecb71 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsCenterReturnScan.java @@ -0,0 +1,63 @@ +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_center_return_scan") +public class WmsCenterReturnScan implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 退货单的详情ID + */ + private Long itemId; + + /** + * 二维码编号 + */ + private String codeId; + + /** + * 数量 + */ + private BigDecimal codeNum; + + /** + * 批次号 + */ + private String batchNumber; + + /** + * 序列号,多个序列号使用;号隔开 + */ + private String serialNumber; + + /** + * 二维码内容 + */ + private String codeContent; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutboundRecommendation.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutboundRecommendation.java new file mode 100644 index 00000000..c0367ce5 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutboundRecommendation.java @@ -0,0 +1,64 @@ +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; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wms_outbound_recommendation") +public class WmsOutboundRecommendation implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 推荐物料的数据行ID + */ + private Long sourceId; + + /** + * 推荐的批次号 + */ + private String recommendationBatchCode; + + /** + * 推荐的数量 + */ + private BigDecimal recommendationBatchNum; + + /** + * 是否命中推荐的批次号 + */ + private Boolean isMatch; + + /** + * 0 来自于中心领料出库 + */ + private Short sourceFrom; + + /** + * 推荐日期 + */ + private LocalDateTime createTime; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsCenterOutboundItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsCenterOutboundItemMapper.java new file mode 100644 index 00000000..7db41835 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsCenterOutboundItemMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.WmsCenterOutboundItem; + +/** + *

+ * Mapper 接口 + *

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

+ * Mapper 接口 + *

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

+ * Mapper 接口 + *

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

+ * Mapper 接口 + *

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

+ * Mapper 接口 + *

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

+ * Mapper 接口 + *

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

+ * Mapper 接口 + *

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

+ * 服务类 + *

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

+ * 服务类 + *

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

+ * 服务类 + *

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

+ * 服务类 + *

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

+ * 服务类 + *

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

+ * 服务类 + *

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

+ * 服务类 + *

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

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsCenterOutboundItemServiceImpl extends ServiceImpl implements IWmsCenterOutboundItemService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterOutboundScanServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterOutboundScanServiceImpl.java new file mode 100644 index 00000000..3199e215 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterOutboundScanServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.WmsCenterOutboundScan; +import com.nflg.wms.repository.mapper.WmsCenterOutboundScanMapper; +import com.nflg.wms.repository.service.IWmsCenterOutboundScanService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsCenterOutboundScanServiceImpl extends ServiceImpl implements IWmsCenterOutboundScanService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterOutboundServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterOutboundServiceImpl.java new file mode 100644 index 00000000..6ed60a49 --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterOutboundServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.WmsCenterOutbound; +import com.nflg.wms.repository.mapper.WmsCenterOutboundMapper; +import com.nflg.wms.repository.service.IWmsCenterOutboundService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsCenterOutboundServiceImpl extends ServiceImpl implements IWmsCenterOutboundService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterReturnItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterReturnItemServiceImpl.java new file mode 100644 index 00000000..9ccde59b --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterReturnItemServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.WmsCenterReturnItem; +import com.nflg.wms.repository.mapper.WmsCenterReturnItemMapper; +import com.nflg.wms.repository.service.IWmsCenterReturnItemService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

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

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsCenterReturnScanServiceImpl extends ServiceImpl implements IWmsCenterReturnScanService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterReturnServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterReturnServiceImpl.java new file mode 100644 index 00000000..221074fa --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsCenterReturnServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.wms.repository.service.impl; + +import com.nflg.wms.repository.entity.WmsCenterReturn; +import com.nflg.wms.repository.mapper.WmsCenterReturnMapper; +import com.nflg.wms.repository.service.IWmsCenterReturnService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

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

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class WmsOutboundRecommendationServiceImpl extends ServiceImpl implements IWmsOutboundRecommendationService { + +} diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundItemMapper.xml new file mode 100644 index 00000000..4e65d1a8 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundItemMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundMapper.xml new file mode 100644 index 00000000..cc0bacd5 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundScanMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundScanMapper.xml new file mode 100644 index 00000000..8290f4bd --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsCenterOutboundScanMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnItemMapper.xml new file mode 100644 index 00000000..c0b89ae2 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnItemMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnMapper.xml new file mode 100644 index 00000000..c92303f2 --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnScanMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnScanMapper.xml new file mode 100644 index 00000000..255d0a7a --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsCenterReturnScanMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsOutboundRecommendationMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsOutboundRecommendationMapper.xml new file mode 100644 index 00000000..c122464f --- /dev/null +++ b/nflg-wms-repository/src/main/resources/mapper/WmsOutboundRecommendationMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java b/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java index 3ef32f02..582f1171 100644 --- a/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java +++ b/nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java @@ -33,7 +33,7 @@ public class CodeGeneratorTest { ) .strategyConfig(builder -> { builder - .addInclude("wms_normal_print_order") //只生成指定表 + .addInclude("wms_outbound_recommendation") //只生成指定表 .entityBuilder().idType(IdType.ASSIGN_ID) .enableLombok() .enableChainModel()