From 3fec004f8a53c32f11a862250eecb0976a833ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 26 Dec 2023 08:14:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=90=88=E5=8C=85=20=E6=8B=86=E5=8C=85=20?= =?UTF-8?q?=E7=BF=BB=E5=8C=85=20=E6=96=B0=E5=8A=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 16 +++ .../PackagemergeDetailController.java | 113 +++++++++++++++ .../PackagemergeMainController.java | 136 ++++++++++++++++++ .../vo/PackagemergeDetailBaseVO.java | 97 +++++++++++++ .../vo/PackagemergeDetailCreateReqVO.java | 12 ++ .../vo/PackagemergeDetailExcelVO.java | 105 ++++++++++++++ .../vo/PackagemergeDetailExportReqVO.java | 100 +++++++++++++ .../vo/PackagemergeDetailPageReqVO.java | 102 +++++++++++++ .../vo/PackagemergeDetailRespVO.java | 19 +++ .../vo/PackagemergeDetailUpdateReqVO.java | 18 +++ .../vo/PackagemergeMainBaseVO.java | 85 +++++++++++ .../vo/PackagemergeMainCreateReqVO.java | 14 ++ .../vo/PackagemergeMainExcelVO.java | 80 +++++++++++ .../vo/PackagemergeMainExportReqVO.java | 75 ++++++++++ .../vo/PackagemergeMainPageReqVO.java | 77 ++++++++++ .../vo/PackagemergeMainRespVO.java | 13 ++ .../vo/PackagemergeMainUpdateReqVO.java | 18 +++ .../PackageoverDetailController.java | 113 +++++++++++++++ .../PackageoverMainController.java | 136 ++++++++++++++++++ .../vo/PackageoverDetailBaseVO.java | 97 +++++++++++++ .../vo/PackageoverDetailCreateReqVO.java | 12 ++ .../vo/PackageoverDetailExcelVO.java | 105 ++++++++++++++ .../vo/PackageoverDetailExportReqVO.java | 100 +++++++++++++ .../vo/PackageoverDetailPageReqVO.java | 102 +++++++++++++ .../vo/PackageoverDetailRespVO.java | 19 +++ .../vo/PackageoverDetailUpdateReqVO.java | 18 +++ .../vo/PackageoverMainBaseVO.java | 86 +++++++++++ .../vo/PackageoverMainCreateReqVO.java | 14 ++ .../vo/PackageoverMainExcelVO.java | 80 +++++++++++ .../vo/PackageoverMainExportReqVO.java | 75 ++++++++++ .../vo/PackageoverMainPageReqVO.java | 77 ++++++++++ .../vo/PackageoverMainRespVO.java | 13 ++ .../vo/PackageoverMainUpdateReqVO.java | 18 +++ .../PackagesplitDetailController.java | 114 +++++++++++++++ .../PackagesplitMainController.java | 136 ++++++++++++++++++ .../vo/PackagesplitDetailBaseVO.java | 97 +++++++++++++ .../vo/PackagesplitDetailCreateReqVO.java | 14 ++ .../vo/PackagesplitDetailExcelVO.java | 105 ++++++++++++++ .../vo/PackagesplitDetailExportReqVO.java | 100 +++++++++++++ .../vo/PackagesplitDetailPageReqVO.java | 102 +++++++++++++ .../vo/PackagesplitDetailRespVO.java | 19 +++ .../vo/PackagesplitDetailUpdateReqVO.java | 18 +++ .../vo/PackagesplitMainBaseVO.java | 88 ++++++++++++ .../vo/PackagesplitMainCreateReqVO.java | 14 ++ .../vo/PackagesplitMainExcelVO.java | 80 +++++++++++ .../vo/PackagesplitMainExportReqVO.java | 75 ++++++++++ .../vo/PackagesplitMainPageReqVO.java | 77 ++++++++++ .../vo/PackagesplitMainRespVO.java | 13 ++ .../vo/PackagesplitMainUpdateReqVO.java | 18 +++ .../PackagemergeDetailConvert.java | 34 +++++ .../PackagemergeMainConvert.java | 34 +++++ .../PackageoverDetailConvert.java | 34 +++++ .../PackageoverMainConvert.java | 34 +++++ .../PackagesplitDetailConvert.java | 34 +++++ .../PackagesplitMainConvert.java | 34 +++++ .../PackagemergeDetailDO.java | 136 ++++++++++++++++++ .../packagemergemain/PackagemergeMainDO.java | 102 +++++++++++++ .../packageovermain/PackageoverDetailDO.java | 136 ++++++++++++++++++ .../packageovermain/PackageoverMainDO.java | 102 +++++++++++++ .../PackagesplitDetailDO.java | 136 ++++++++++++++++++ .../packagesplitmain/PackagesplitMainDO.java | 102 +++++++++++++ .../PackagemergeDetailMapper.java | 84 +++++++++++ .../PackagemergeMainMapper.java | 72 ++++++++++ .../PackageoverDetailMapper.java | 84 +++++++++++ .../PackageoverMainMapper.java | 71 +++++++++ .../PackagesplitDetailMapper.java | 84 +++++++++++ .../PackagesplitMainMapper.java | 71 +++++++++ .../PackagemergeDetailService.java | 71 +++++++++ .../PackagemergeDetailServiceImpl.java | 82 +++++++++++ .../PackagemergeMainService.java | 73 ++++++++++ .../PackagemergeMainServiceImpl.java | 87 +++++++++++ .../PackageoverDetailService.java | 71 +++++++++ .../PackageoverDetailServiceImpl.java | 83 +++++++++++ .../PackageoverMainService.java | 73 ++++++++++ .../PackageoverMainServiceImpl.java | 88 ++++++++++++ .../PackagesplitDetailService.java | 70 +++++++++ .../PackagesplitDetailServiceImpl.java | 83 +++++++++++ .../PackagesplitMainService.java | 73 ++++++++++ .../PackagesplitMainServiceImpl.java | 89 ++++++++++++ .../PackagemergeDetailMapper.xml | 12 ++ .../PackagemergeMainMapper.xml | 12 ++ .../PackageoverDetailMapper.xml | 12 ++ .../packageovermain/PackageoverMainMapper.xml | 12 ++ .../PackagesplitDetailMapper.xml | 12 ++ .../PackagesplitMainMapper.xml | 12 ++ 85 files changed, 5614 insertions(+) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeDetailController.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeMainController.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailBaseVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailCreateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExcelVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExportReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailPageReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailRespVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailUpdateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainBaseVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainCreateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExcelVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExportReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainPageReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainRespVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainUpdateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverDetailController.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverMainController.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailBaseVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailCreateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExcelVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExportReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailPageReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailRespVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailUpdateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainBaseVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainCreateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExcelVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExportReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainPageReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainRespVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainUpdateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitDetailController.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitMainController.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailBaseVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailCreateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExcelVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExportReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailPageReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailRespVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailUpdateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainBaseVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainCreateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExcelVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExportReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainPageReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainRespVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainUpdateReqVO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeDetailConvert.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeMainConvert.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverDetailConvert.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverMainConvert.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitDetailConvert.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitMainConvert.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeDetailDO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeMainDO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverMainDO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitDetailDO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitMainDO.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeDetailMapper.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeMainMapper.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverDetailMapper.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverMainMapper.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitDetailMapper.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitMainMapper.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailService.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailServiceImpl.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainService.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainServiceImpl.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailService.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailServiceImpl.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainService.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainServiceImpl.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitDetailService.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitDetailServiceImpl.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitMainService.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitMainServiceImpl.java create mode 100644 win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagemergemain/PackagemergeDetailMapper.xml create mode 100644 win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagemergemain/PackagemergeMainMapper.xml create mode 100644 win-module-wms/win-module-wms-biz/src/main/resources/mapper/packageovermain/PackageoverDetailMapper.xml create mode 100644 win-module-wms/win-module-wms-biz/src/main/resources/mapper/packageovermain/PackageoverMainMapper.xml create mode 100644 win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagesplitmain/PackagesplitDetailMapper.xml create mode 100644 win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagesplitmain/PackagesplitMainMapper.xml diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index 804613a6..8dae7273 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -1083,6 +1083,21 @@ public interface ErrorCodeConstants { ErrorCode CONTAINER_INIT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_168_002, "器具初始化记录主不存在"); ErrorCode CONTAINER_INIT_RECORD_MAIN_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_168_003, "器具初始化子列表不存在"); + // 合包记录主 + ErrorCode PACKAGEMERGE_MAIN_NOT_EXISTS = new ErrorCode(1_000_169_001, "合包记录主不存在"); + // 合包记录子 + ErrorCode PACKAGEMERGE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_169_002, "合包记录子不存在"); + + // 翻包记录主 + ErrorCode PACKAGEOVER_MAIN_NOT_EXISTS = new ErrorCode(1_000_170_001, "翻包记录主不存在"); + // 翻包记录子 + ErrorCode PACKAGEOVER_DETAIL_NOT_EXISTS = new ErrorCode(1_000_170_002, "翻包记录子不存在"); + + // 拆包记录主 + ErrorCode PACKAGESPLIT_MAIN_NOT_EXISTS = new ErrorCode(1_000_171_001, "拆包记录主不存在"); + // 拆包记录子 + ErrorCode PACKAGESPLIT_DETAIL_NOT_EXISTS = new ErrorCode(1_000_171_002, "拆包记录子不存在"); + //UOM ErrorCode ErrorCode BATCH_EXCEPTION = new ErrorCode(1_000_400_000, "批次问题:【{}】"); ErrorCode UOM_EXCEPTION = new ErrorCode(1_000_401_000, "单位问题:【{}】"); @@ -1107,5 +1122,6 @@ public interface ErrorCodeConstants { ErrorCode ENTERPRISE_EXISTS = new ErrorCode(1_000_303_001, "企业已存在"); ErrorCode BACKFLUSH_REQUEST_DETAILB_NOT_EXISTS = new ErrorCode(1_000_304_001, "制品收货申请二子表不存在"); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeDetailController.java new file mode 100644 index 00000000..5e14aa55 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeDetailController.java @@ -0,0 +1,113 @@ +package com.win.module.wms.controller.packagemergemain; + +import io.swagger.v3.oas.annotations.Parameters; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.*; +import javax.servlet.http.*; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.*; +import java.io.IOException; + +import com.win.framework.common.pojo.PageResult; +import com.win.framework.common.pojo.CommonResult; +import static com.win.framework.common.pojo.CommonResult.success; + +import com.win.framework.excel.core.util.ExcelUtils; + +import com.win.framework.operatelog.core.annotations.OperateLog; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.win.module.wms.controller.packagemergemain.vo.*; +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeDetailDO; +import com.win.module.wms.convert.packagemergemain.PackagemergeDetailConvert; +import com.win.module.wms.service.packagemergemain.PackagemergeDetailService; +import org.springframework.web.multipart.MultipartFile; + +@Tag(name = "管理后台 - 合包记录子") +@RestController +@RequestMapping("/wms/packagemerge-detail") +@Validated +public class PackagemergeDetailController { + + @Resource + private PackagemergeDetailService packagemergeDetailService; + + @PostMapping("/create") + @Operation(summary = "创建合包记录子") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:create')") + public CommonResult createPackagemergeDetail(@Valid @RequestBody PackagemergeDetailCreateReqVO createReqVO) { + return success(packagemergeDetailService.createPackagemergeDetail(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新合包记录子") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:update')") + public CommonResult updatePackagemergeDetail(@Valid @RequestBody PackagemergeDetailUpdateReqVO updateReqVO) { + int result = packagemergeDetailService.updatePackagemergeDetail(updateReqVO); + return success(result > 0); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除合包记录子") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:delete')") + public CommonResult deletePackagemergeDetail(@RequestParam("id") Long id) { + int result = packagemergeDetailService.deletePackagemergeDetail(id); + return success(result > 0); + } + + @GetMapping("/get") + @Operation(summary = "获得合包记录子") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:query')") + public CommonResult getPackagemergeDetail(@RequestParam("id") Long id) { + PackagemergeDetailDO packagemergeDetail = packagemergeDetailService.getPackagemergeDetail(id); + return success(PackagemergeDetailConvert.INSTANCE.convert(packagemergeDetail)); + } + + @GetMapping("/list") + @Operation(summary = "获得合包记录子列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:query')") + public CommonResult> getPackagemergeDetailList(@RequestParam("ids") Collection ids) { + List list = packagemergeDetailService.getPackagemergeDetailList(ids); + return success(PackagemergeDetailConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得合包记录子分页") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:query')") + public CommonResult> getPackagemergeDetailPage(@Valid PackagemergeDetailPageReqVO pageVO) { + PageResult pageResult = packagemergeDetailService.getPackagemergeDetailPage(pageVO); + return success(PackagemergeDetailConvert.INSTANCE.convertPage(pageResult)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出合包记录子 Excel") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-detail:export')") + @OperateLog(type = EXPORT) + public void exportPackagemergeDetailExcel(@Valid PackagemergeDetailExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = packagemergeDetailService.getPackagemergeDetailList(exportReqVO); + // 导出 Excel + List datas = PackagemergeDetailConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "合包记录子.xls", "数据", PackagemergeDetailExcelVO.class, datas); + } + + @GetMapping("/get-import-template") + @Operation(summary = "获得导入合包记录子模板") + public void importTemplate(HttpServletResponse response) throws IOException { + List list = Arrays.asList(); + // 输出 + ExcelUtils.write(response, "合包记录子基本信息导入模板.xls", "合包记录子基本信息列表", PackagemergeDetailExcelVO.class, list); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeMainController.java new file mode 100644 index 00000000..5b8b4881 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/PackagemergeMainController.java @@ -0,0 +1,136 @@ +package com.win.module.wms.controller.packagemergemain; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainRespVO; +import com.win.module.wms.convert.issueRecord.IssueRecordMainConvert; +import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; +import io.swagger.v3.oas.annotations.Parameters; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.*; +import java.io.IOException; + +import com.win.framework.common.pojo.PageResult; +import com.win.framework.common.pojo.CommonResult; +import static com.win.framework.common.pojo.CommonResult.success; + +import com.win.framework.excel.core.util.ExcelUtils; + +import com.win.framework.operatelog.core.annotations.OperateLog; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.win.module.wms.controller.packagemergemain.vo.*; +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO; +import com.win.module.wms.convert.packagemergemain.PackagemergeMainConvert; +import com.win.module.wms.service.packagemergemain.PackagemergeMainService; +import org.springframework.web.multipart.MultipartFile; + +@Tag(name = "管理后台 - 合包记录主") +@RestController +@RequestMapping("/wms/packagemerge-main") +@Validated +public class PackagemergeMainController { + + @Resource + private AdminUserApi userApi; + @Resource + private PackagemergeMainService packagemergeMainService; + + @PostMapping("/create") + @Operation(summary = "创建合包记录主") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-main:create')") + public CommonResult createPackagemergeMain(@Valid @RequestBody PackagemergeMainCreateReqVO createReqVO) { + return success(packagemergeMainService.createPackagemergeMain(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新合包记录主") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-main:update')") + public CommonResult updatePackagemergeMain(@Valid @RequestBody PackagemergeMainUpdateReqVO updateReqVO) { + int result = packagemergeMainService.updatePackagemergeMain(updateReqVO); + return success(result > 0); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除合包记录主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:packagemerge-main:delete')") + public CommonResult deletePackagemergeMain(@RequestParam("id") Long id) { + int result = packagemergeMainService.deletePackagemergeMain(id); + return success(result > 0); + } + + @GetMapping("/get") + @Operation(summary = "获得合包记录主") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-main:query')") + public CommonResult getPackagemergeMain(@RequestParam("id") Long id) { + PackagemergeMainDO packagemergeMain = packagemergeMainService.getPackagemergeMain(id); + return success(PackagemergeMainConvert.INSTANCE.convert(packagemergeMain)); + } + + @GetMapping("/list") + @Operation(summary = "获得合包记录主列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-main:query')") + public CommonResult> getPackagemergeMainList(@RequestParam("ids") Collection ids) { + List list = packagemergeMainService.getPackagemergeMainList(ids); + return success(PackagemergeMainConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得合包记录主分页") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-main:query')") + public CommonResult> getPackagemergeMainPage(@Valid PackagemergeMainPageReqVO pageVO) { + PageResult pageResult = packagemergeMainService.getPackagemergeMainPage(pageVO); + return success(PackagemergeMainConvert.INSTANCE.convertPage(pageResult)); + } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得合包记录主分页") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-main:query')") + public CommonResult> getPackagemergeRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = packagemergeMainService.getPackagemergeMainSenior(conditions); + PageResult result = PackagemergeMainConvert.INSTANCE.convertPage(pageResult); + for(PackagemergeMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出合包记录主 Excel") + @PreAuthorize("@ss.hasPermission('wms:packagemerge-main:export')") + @OperateLog(type = EXPORT) + public void exportPackagemergeMainExcel(@Valid PackagemergeMainExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = packagemergeMainService.getPackagemergeMainList(exportReqVO); + // 导出 Excel + List datas = PackagemergeMainConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "合包记录主.xls", "数据", PackagemergeMainExcelVO.class, datas); + } + + @GetMapping("/get-import-template") + @Operation(summary = "获得导入合包记录主模板") + public void importTemplate(HttpServletResponse response) throws IOException { + List list = Arrays.asList(); + // 输出 + ExcelUtils.write(response, "合包记录主基本信息导入模板.xls", "合包记录主基本信息列表", PackagemergeMainExcelVO.class, list); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailBaseVO.java new file mode 100644 index 00000000..2e927a8e --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailBaseVO.java @@ -0,0 +1,97 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import javax.validation.constraints.*; + +/** + * 合包记录子 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class PackagemergeDetailBaseVO { + + @Schema(description = "库位代码") + private String locationCode; + + @Schema(description = "库位组代码") + private String locationGroupCode; + + @Schema(description = "库区代码") + private String areaCode; + + @Schema(description = "从包装号") + private String fromPackingNumber; + + @Schema(description = "到包装号") + private String toPackingNumber; + + @Schema(description = "从批次") + private String fromBatch; + + @Schema(description = "到批次") + private String toBatch; + + @Schema(description = "从库存状态", example = "1") + private String fromInventoryStatus; + + @Schema(description = "到库存状态", example = "2") + private String toInventoryStatus; + + @Schema(description = "从器具号") + private String fromContainerNumber; + + @Schema(description = "到器具号") + private String toContainerNumber; + + @Schema(description = "从货主代码") + private String fromOwnerCode; + + @Schema(description = "到货主代码") + private String toOwnerCode; + + @Schema(description = "主表ID", example = "18261") + private Long masterId; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "物品代码") + private String itemCode; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "地点ID", example = "29185") + private String siteId; + + @Schema(description = "物品名称", example = "芋艿") + private String itemName; + + @Schema(description = "物品描述1") + private String itemDesc1; + + @Schema(description = "物品描述2") + private String itemDesc2; + + @Schema(description = "项目代码") + private String projectCode; + + @Schema(description = "到数量") + private BigDecimal toQty; + + @Schema(description = "从数量") + private BigDecimal fromQty; + + @Schema(description = "计量单位") + private String uom; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailCreateReqVO.java new file mode 100644 index 00000000..84c25371 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailCreateReqVO.java @@ -0,0 +1,12 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema(description = "管理后台 - 合包记录子创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagemergeDetailCreateReqVO extends PackagemergeDetailBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExcelVO.java new file mode 100644 index 00000000..58e7ea5f --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExcelVO.java @@ -0,0 +1,105 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 合包记录子 Excel VO + * + * @author 超级管理员 + */ +@Data +public class PackagemergeDetailExcelVO { + + @ExcelProperty("id") + private Long id; + + @ExcelProperty("库位代码") + private String locationCode; + + @ExcelProperty("库位组代码") + private String locationGroupCode; + + @ExcelProperty("库区代码") + private String areaCode; + + @ExcelProperty("从包装号") + private String fromPackingNumber; + + @ExcelProperty("到包装号") + private String toPackingNumber; + + @ExcelProperty("从批次") + private String fromBatch; + + @ExcelProperty("到批次") + private String toBatch; + + @ExcelProperty("从库存状态") + private String fromInventoryStatus; + + @ExcelProperty("到库存状态") + private String toInventoryStatus; + + @ExcelProperty("从器具号") + private String fromContainerNumber; + + @ExcelProperty("到器具号") + private String toContainerNumber; + + @ExcelProperty("从货主代码") + private String fromOwnerCode; + + @ExcelProperty("到货主代码") + private String toOwnerCode; + + @ExcelProperty("主表ID") + private Long masterId; + + @ExcelProperty("单据号") + private String number; + + @ExcelProperty("物品代码") + private String itemCode; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("地点ID") + private String siteId; + + @ExcelProperty("物品名称") + private String itemName; + + @ExcelProperty("物品描述1") + private String itemDesc1; + + @ExcelProperty("物品描述2") + private String itemDesc2; + + @ExcelProperty("项目代码") + private String projectCode; + + @ExcelProperty("到数量") + private BigDecimal toQty; + + @ExcelProperty("从数量") + private BigDecimal fromQty; + + @ExcelProperty("计量单位") + private String uom; + + @ExcelProperty("接口类型") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExportReqVO.java new file mode 100644 index 00000000..d58811d9 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExportReqVO.java @@ -0,0 +1,100 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import lombok.*; + +import java.math.BigDecimal; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 合包记录子 Excel 导出 Request VO，参数和 PackagemergeDetailPageReqVO 是一致的") +@Data +public class PackagemergeDetailExportReqVO { + + @Schema(description = "库位代码") + private String locationCode; + + @Schema(description = "库位组代码") + private String locationGroupCode; + + @Schema(description = "库区代码") + private String areaCode; + + @Schema(description = "从包装号") + private String fromPackingNumber; + + @Schema(description = "到包装号") + private String toPackingNumber; + + @Schema(description = "从批次") + private String fromBatch; + + @Schema(description = "到批次") + private String toBatch; + + @Schema(description = "从库存状态", example = "1") + private String fromInventoryStatus; + + @Schema(description = "到库存状态", example = "2") + private String toInventoryStatus; + + @Schema(description = "从器具号") + private String fromContainerNumber; + + @Schema(description = "到器具号") + private String toContainerNumber; + + @Schema(description = "从货主代码") + private String fromOwnerCode; + + @Schema(description = "到货主代码") + private String toOwnerCode; + + @Schema(description = "主表ID", example = "18261") + private Long masterId; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "物品代码") + private String itemCode; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "地点ID", example = "29185") + private String siteId; + + @Schema(description = "物品名称", example = "芋艿") + private String itemName; + + @Schema(description = "物品描述1") + private String itemDesc1; + + @Schema(description = "物品描述2") + private String itemDesc2; + + @Schema(description = "项目代码") + private String projectCode; + + @Schema(description = "到数量") + private BigDecimal toQty; + + @Schema(description = "从数量") + private BigDecimal fromQty; + + @Schema(description = "计量单位") + private String uom; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailPageReqVO.java new file mode 100644 index 00000000..f74d45b5 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailPageReqVO.java @@ -0,0 +1,102 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import lombok.*; + +import java.math.BigDecimal; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 合包记录子分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagemergeDetailPageReqVO extends PageParam { + + @Schema(description = "库位代码") + private String locationCode; + + @Schema(description = "库位组代码") + private String locationGroupCode; + + @Schema(description = "库区代码") + private String areaCode; + + @Schema(description = "从包装号") + private String fromPackingNumber; + + @Schema(description = "到包装号") + private String toPackingNumber; + + @Schema(description = "从批次") + private String fromBatch; + + @Schema(description = "到批次") + private String toBatch; + + @Schema(description = "从库存状态", example = "1") + private String fromInventoryStatus; + + @Schema(description = "到库存状态", example = "2") + private String toInventoryStatus; + + @Schema(description = "从器具号") + private String fromContainerNumber; + + @Schema(description = "到器具号") + private String toContainerNumber; + + @Schema(description = "从货主代码") + private String fromOwnerCode; + + @Schema(description = "到货主代码") + private String toOwnerCode; + + @Schema(description = "主表ID", example = "18261") + private Long masterId; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "物品代码") + private String itemCode; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "地点ID", example = "29185") + private String siteId; + + @Schema(description = "物品名称", example = "芋艿") + private String itemName; + + @Schema(description = "物品描述1") + private String itemDesc1; + + @Schema(description = "物品描述2") + private String itemDesc2; + + @Schema(description = "项目代码") + private String projectCode; + + @Schema(description = "到数量") + private BigDecimal toQty; + + @Schema(description = "从数量") + private BigDecimal fromQty; + + @Schema(description = "计量单位") + private String uom; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailRespVO.java new file mode 100644 index 00000000..775249c7 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailRespVO.java @@ -0,0 +1,19 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 合包记录子 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagemergeDetailRespVO extends PackagemergeDetailBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14985") + private Long id; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailUpdateReqVO.java new file mode 100644 index 00000000..4df0f9bd --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 合包记录子更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagemergeDetailUpdateReqVO extends PackagemergeDetailBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14985") + @NotNull(message = "id不能为空") + private Long id; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainBaseVO.java new file mode 100644 index 00000000..27584141 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainBaseVO.java @@ -0,0 +1,85 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import javax.validation.constraints.*; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +/** + * 合包记录主 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class PackagemergeMainBaseVO { + + @Schema(description = "仓库代码") + private String warehouseCode; + + @Schema(description = "明细") + private String details; + + @Schema(description = "出库事务类型", example = "2") + private String outTransactionType; + + @Schema(description = "入库事务类型", example = "2") + private String inTransactionType; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime executeTime; + + @Schema(description = "生效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime activeDate; + + @Schema(description = "是否可用") + private String available; + + @Schema(description = "申请时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime requestTime; + + @Schema(description = "截止时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime dueTime; + + @Schema(description = "部门") + private String departmentCode; + + @Schema(description = "用户组") + private String userGroupCode; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "业务类型", example = "1") + private String businessType; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建者") + private String creator; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新者") + private String updater; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainCreateReqVO.java new file mode 100644 index 00000000..d0da4b12 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainCreateReqVO.java @@ -0,0 +1,14 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 合包记录主创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagemergeMainCreateReqVO extends PackagemergeMainBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExcelVO.java new file mode 100644 index 00000000..923123db --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExcelVO.java @@ -0,0 +1,80 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 合包记录主 Excel VO + * + * @author 超级管理员 + */ +@Data +public class PackagemergeMainExcelVO { + + @ExcelProperty("id") + private Long id; + + @ExcelProperty("仓库代码") + private String warehouseCode; + + @ExcelProperty("明细") + private String details; + + @ExcelProperty("出库事务类型") + private String outTransactionType; + + @ExcelProperty("入库事务类型") + private String inTransactionType; + + @ExcelProperty("执行时间") + private LocalDateTime executeTime; + + @ExcelProperty("生效日期") + private LocalDateTime activeDate; + + @ExcelProperty("是否可用") + private String available; + + @ExcelProperty("申请时间") + private LocalDateTime requestTime; + + @ExcelProperty("截止时间") + private LocalDateTime dueTime; + + @ExcelProperty("部门") + private String departmentCode; + + @ExcelProperty("用户组") + private String userGroupCode; + + @ExcelProperty("接口类型") + private String interfaceType; + + @ExcelProperty("单据号") + private String number; + + @ExcelProperty("业务类型") + private String businessType; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("扩展属性") + private String extraProperties; + + @ExcelProperty("地点ID") + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExportReqVO.java new file mode 100644 index 00000000..3ea31017 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainExportReqVO.java @@ -0,0 +1,75 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 合包记录主 Excel 导出 Request VO，参数和 PackagemergeMainPageReqVO 是一致的") +@Data +public class PackagemergeMainExportReqVO { + + @Schema(description = "仓库代码") + private String warehouseCode; + + @Schema(description = "明细") + private String details; + + @Schema(description = "出库事务类型", example = "2") + private String outTransactionType; + + @Schema(description = "入库事务类型", example = "2") + private String inTransactionType; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] executeTime; + + @Schema(description = "生效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] activeDate; + + @Schema(description = "是否可用") + private String available; + + @Schema(description = "申请时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] requestTime; + + @Schema(description = "截止时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] dueTime; + + @Schema(description = "部门") + private String departmentCode; + + @Schema(description = "用户组") + private String userGroupCode; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "业务类型", example = "1") + private String businessType; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "扩展属性") + private String extraProperties; + + @Schema(description = "地点ID", example = "5629") + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainPageReqVO.java new file mode 100644 index 00000000..c72ac3b2 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainPageReqVO.java @@ -0,0 +1,77 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 合包记录主分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagemergeMainPageReqVO extends PageParam { + + @Schema(description = "仓库代码") + private String warehouseCode; + + @Schema(description = "明细") + private String details; + + @Schema(description = "出库事务类型", example = "2") + private String outTransactionType; + + @Schema(description = "入库事务类型", example = "2") + private String inTransactionType; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] executeTime; + + @Schema(description = "生效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] activeDate; + + @Schema(description = "是否可用") + private String available; + + @Schema(description = "申请时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] requestTime; + + @Schema(description = "截止时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] dueTime; + + @Schema(description = "部门") + private String departmentCode; + + @Schema(description = "用户组") + private String userGroupCode; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "业务类型", example = "1") + private String businessType; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "扩展属性") + private String extraProperties; + + @Schema(description = "地点ID", example = "5629") + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainRespVO.java new file mode 100644 index 00000000..158258ad --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainRespVO.java @@ -0,0 +1,13 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 合包记录主 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagemergeMainRespVO extends PackagemergeMainBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainUpdateReqVO.java new file mode 100644 index 00000000..699816fd --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeMainUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.win.module.wms.controller.packagemergemain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 合包记录主更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagemergeMainUpdateReqVO extends PackagemergeMainBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30783") + @NotNull(message = "id不能为空") + private Long id; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverDetailController.java new file mode 100644 index 00000000..a0a6b98b --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverDetailController.java @@ -0,0 +1,113 @@ +package com.win.module.wms.controller.packageovermain; + +import io.swagger.v3.oas.annotations.Parameters; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.*; +import javax.servlet.http.*; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.*; +import java.io.IOException; + +import com.win.framework.common.pojo.PageResult; +import com.win.framework.common.pojo.CommonResult; +import static com.win.framework.common.pojo.CommonResult.success; + +import com.win.framework.excel.core.util.ExcelUtils; + +import com.win.framework.operatelog.core.annotations.OperateLog; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.win.module.wms.controller.packageovermain.vo.*; +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverDetailDO; +import com.win.module.wms.convert.packageovermain.PackageoverDetailConvert; +import com.win.module.wms.service.packageovermain.PackageoverDetailService; +import org.springframework.web.multipart.MultipartFile; + +@Tag(name = "管理后台 - 翻包记录子") +@RestController +@RequestMapping("/wms/packageover-detail") +@Validated +public class PackageoverDetailController { + + @Resource + private PackageoverDetailService packageoverDetailService; + + @PostMapping("/create") + @Operation(summary = "创建翻包记录子") + @PreAuthorize("@ss.hasPermission('wms:packageover-detail:create')") + public CommonResult createPackageoverDetail(@Valid @RequestBody PackageoverDetailCreateReqVO createReqVO) { + return success(packageoverDetailService.createPackageoverDetail(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新翻包记录子") + @PreAuthorize("@ss.hasPermission('wms:packageover-detail:update')") + public CommonResult updatePackageoverDetail(@Valid @RequestBody PackageoverDetailUpdateReqVO updateReqVO) { + int result = packageoverDetailService.updatePackageoverDetail(updateReqVO); + return success(result > 0); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除翻包记录子") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:packageover-detail:delete')") + public CommonResult deletePackageoverDetail(@RequestParam("id") Long id) { + int result = packageoverDetailService.deletePackageoverDetail(id); + return success(result > 0); + } + + @GetMapping("/get") + @Operation(summary = "获得翻包记录子") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:packageover-detail:query')") + public CommonResult getPackageoverDetail(@RequestParam("id") Long id) { + PackageoverDetailDO packageoverDetail = packageoverDetailService.getPackageoverDetail(id); + return success(PackageoverDetailConvert.INSTANCE.convert(packageoverDetail)); + } + + @GetMapping("/list") + @Operation(summary = "获得翻包记录子列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('wms:packageover-detail:query')") + public CommonResult> getPackageoverDetailList(@RequestParam("ids") Collection ids) { + List list = packageoverDetailService.getPackageoverDetailList(ids); + return success(PackageoverDetailConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得翻包记录子分页") + @PreAuthorize("@ss.hasPermission('wms:packageover-detail:query')") + public CommonResult> getPackageoverDetailPage(@Valid PackageoverDetailPageReqVO pageVO) { + PageResult pageResult = packageoverDetailService.getPackageoverDetailPage(pageVO); + return success(PackageoverDetailConvert.INSTANCE.convertPage(pageResult)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出翻包记录子 Excel") + @PreAuthorize("@ss.hasPermission('wms:packageover-detail:export')") + @OperateLog(type = EXPORT) + public void exportPackageoverDetailExcel(@Valid PackageoverDetailExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = packageoverDetailService.getPackageoverDetailList(exportReqVO); + // 导出 Excel + List datas = PackageoverDetailConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "翻包记录子.xls", "数据", PackageoverDetailExcelVO.class, datas); + } + + @GetMapping("/get-import-template") + @Operation(summary = "获得导入翻包记录子模板") + public void importTemplate(HttpServletResponse response) throws IOException { + List list = Arrays.asList(); + // 输出 + ExcelUtils.write(response, "翻包记录子基本信息导入模板.xls", "翻包记录子基本信息列表", PackageoverDetailExcelVO.class, list); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverMainController.java new file mode 100644 index 00000000..49c4f293 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/PackageoverMainController.java @@ -0,0 +1,136 @@ +package com.win.module.wms.controller.packageovermain; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.packagemergemain.vo.PackagemergeMainRespVO; +import com.win.module.wms.convert.packagemergemain.PackagemergeMainConvert; +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO; +import io.swagger.v3.oas.annotations.Parameters; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.*; +import java.io.IOException; + +import com.win.framework.common.pojo.PageResult; +import com.win.framework.common.pojo.CommonResult; +import static com.win.framework.common.pojo.CommonResult.success; + +import com.win.framework.excel.core.util.ExcelUtils; + +import com.win.framework.operatelog.core.annotations.OperateLog; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.win.module.wms.controller.packageovermain.vo.*; +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO; +import com.win.module.wms.convert.packageovermain.PackageoverMainConvert; +import com.win.module.wms.service.packageovermain.PackageoverMainService; +import org.springframework.web.multipart.MultipartFile; + +@Tag(name = "管理后台 - 翻包记录主") +@RestController +@RequestMapping("/wms/packageover-main") +@Validated +public class PackageoverMainController { + + @Resource + private AdminUserApi userApi; + @Resource + private PackageoverMainService packageoverMainService; + + @PostMapping("/create") + @Operation(summary = "创建翻包记录主") + @PreAuthorize("@ss.hasPermission('wms:packageover-main:create')") + public CommonResult createPackageoverMain(@Valid @RequestBody PackageoverMainCreateReqVO createReqVO) { + return success(packageoverMainService.createPackageoverMain(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新翻包记录主") + @PreAuthorize("@ss.hasPermission('wms:packageover-main:update')") + public CommonResult updatePackageoverMain(@Valid @RequestBody PackageoverMainUpdateReqVO updateReqVO) { + int result = packageoverMainService.updatePackageoverMain(updateReqVO); + return success(result > 0); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除翻包记录主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:packageover-main:delete')") + public CommonResult deletePackageoverMain(@RequestParam("id") Long id) { + int result = packageoverMainService.deletePackageoverMain(id); + return success(result > 0); + } + + @GetMapping("/get") + @Operation(summary = "获得翻包记录主") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:packageover-main:query')") + public CommonResult getPackageoverMain(@RequestParam("id") Long id) { + PackageoverMainDO packageoverMain = packageoverMainService.getPackageoverMain(id); + return success(PackageoverMainConvert.INSTANCE.convert(packageoverMain)); + } + + @GetMapping("/list") + @Operation(summary = "获得翻包记录主列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('wms:packageover-main:query')") + public CommonResult> getPackageoverMainList(@RequestParam("ids") Collection ids) { + List list = packageoverMainService.getPackageoverMainList(ids); + return success(PackageoverMainConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得翻包记录主分页") + @PreAuthorize("@ss.hasPermission('wms:packageover-main:query')") + public CommonResult> getPackageoverMainPage(@Valid PackageoverMainPageReqVO pageVO) { + PageResult pageResult = packageoverMainService.getPackageoverMainPage(pageVO); + return success(PackageoverMainConvert.INSTANCE.convertPage(pageResult)); + } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得翻包记录主分页") + @PreAuthorize("@ss.hasPermission('wms:packageover-main:query')") + public CommonResult> getPackageoverMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = packageoverMainService.getPackageoverMainSenior(conditions); + PageResult result = PackageoverMainConvert.INSTANCE.convertPage(pageResult); + for(PackageoverMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出翻包记录主 Excel") + @PreAuthorize("@ss.hasPermission('wms:packageover-main:export')") + @OperateLog(type = EXPORT) + public void exportPackageoverMainExcel(@Valid PackageoverMainExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = packageoverMainService.getPackageoverMainList(exportReqVO); + // 导出 Excel + List datas = PackageoverMainConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "翻包记录主.xls", "数据", PackageoverMainExcelVO.class, datas); + } + + @GetMapping("/get-import-template") + @Operation(summary = "获得导入翻包记录主模板") + public void importTemplate(HttpServletResponse response) throws IOException { + List list = Arrays.asList(); + // 输出 + ExcelUtils.write(response, "翻包记录主基本信息导入模板.xls", "翻包记录主基本信息列表", PackageoverMainExcelVO.class, list); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailBaseVO.java new file mode 100644 index 00000000..1abfa195 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailBaseVO.java @@ -0,0 +1,97 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import javax.validation.constraints.*; + +/** + * 翻包记录子 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class PackageoverDetailBaseVO { + + @Schema(description = "库位代码") + private String locationCode; + + @Schema(description = "库位组代码") + private String locationGroupCode; + + @Schema(description = "库区代码") + private String areaCode; + + @Schema(description = "从包装号") + private String fromPackingNumber; + + @Schema(description = "到包装号") + private String toPackingNumber; + + @Schema(description = "从批次") + private String fromBatch; + + @Schema(description = "到批次") + private String toBatch; + + @Schema(description = "从库存状态", example = "2") + private String fromInventoryStatus; + + @Schema(description = "到库存状态", example = "1") + private String toInventoryStatus; + + @Schema(description = "从器具号") + private String fromContainerNumber; + + @Schema(description = "到器具号") + private String toContainerNumber; + + @Schema(description = "从货主代码") + private String fromOwnerCode; + + @Schema(description = "到货主代码") + private String toOwnerCode; + + @Schema(description = "主表ID", example = "19413") + private Long masterId; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "物品代码") + private String itemCode; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "地点ID", example = "14071") + private String siteId; + + @Schema(description = "物品名称", example = "王五") + private String itemName; + + @Schema(description = "物品描述1") + private String itemDesc1; + + @Schema(description = "物品描述2") + private String itemDesc2; + + @Schema(description = "项目代码") + private String projectCode; + + @Schema(description = "到数量") + private BigDecimal toQty; + + @Schema(description = "从数量") + private BigDecimal fromQty; + + @Schema(description = "计量单位") + private String uom; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailCreateReqVO.java new file mode 100644 index 00000000..bda36292 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailCreateReqVO.java @@ -0,0 +1,12 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema(description = "管理后台 - 翻包记录子创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackageoverDetailCreateReqVO extends PackageoverDetailBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExcelVO.java new file mode 100644 index 00000000..8f80cab9 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExcelVO.java @@ -0,0 +1,105 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 翻包记录子 Excel VO + * + * @author 超级管理员 + */ +@Data +public class PackageoverDetailExcelVO { + + @ExcelProperty("id") + private Long id; + + @ExcelProperty("库位代码") + private String locationCode; + + @ExcelProperty("库位组代码") + private String locationGroupCode; + + @ExcelProperty("库区代码") + private String areaCode; + + @ExcelProperty("从包装号") + private String fromPackingNumber; + + @ExcelProperty("到包装号") + private String toPackingNumber; + + @ExcelProperty("从批次") + private String fromBatch; + + @ExcelProperty("到批次") + private String toBatch; + + @ExcelProperty("从库存状态") + private String fromInventoryStatus; + + @ExcelProperty("到库存状态") + private String toInventoryStatus; + + @ExcelProperty("从器具号") + private String fromContainerNumber; + + @ExcelProperty("到器具号") + private String toContainerNumber; + + @ExcelProperty("从货主代码") + private String fromOwnerCode; + + @ExcelProperty("到货主代码") + private String toOwnerCode; + + @ExcelProperty("主表ID") + private Long masterId; + + @ExcelProperty("单据号") + private String number; + + @ExcelProperty("物品代码") + private String itemCode; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("地点ID") + private String siteId; + + @ExcelProperty("物品名称") + private String itemName; + + @ExcelProperty("物品描述1") + private String itemDesc1; + + @ExcelProperty("物品描述2") + private String itemDesc2; + + @ExcelProperty("项目代码") + private String projectCode; + + @ExcelProperty("到数量") + private BigDecimal toQty; + + @ExcelProperty("从数量") + private BigDecimal fromQty; + + @ExcelProperty("计量单位") + private String uom; + + @ExcelProperty("接口类型") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExportReqVO.java new file mode 100644 index 00000000..d841f1bd --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExportReqVO.java @@ -0,0 +1,100 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import lombok.*; + +import java.math.BigDecimal; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 翻包记录子 Excel 导出 Request VO，参数和 PackageoverDetailPageReqVO 是一致的") +@Data +public class PackageoverDetailExportReqVO { + + @Schema(description = "库位代码") + private String locationCode; + + @Schema(description = "库位组代码") + private String locationGroupCode; + + @Schema(description = "库区代码") + private String areaCode; + + @Schema(description = "从包装号") + private String fromPackingNumber; + + @Schema(description = "到包装号") + private String toPackingNumber; + + @Schema(description = "从批次") + private String fromBatch; + + @Schema(description = "到批次") + private String toBatch; + + @Schema(description = "从库存状态", example = "2") + private String fromInventoryStatus; + + @Schema(description = "到库存状态", example = "1") + private String toInventoryStatus; + + @Schema(description = "从器具号") + private String fromContainerNumber; + + @Schema(description = "到器具号") + private String toContainerNumber; + + @Schema(description = "从货主代码") + private String fromOwnerCode; + + @Schema(description = "到货主代码") + private String toOwnerCode; + + @Schema(description = "主表ID", example = "19413") + private Long masterId; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "物品代码") + private String itemCode; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "地点ID", example = "14071") + private String siteId; + + @Schema(description = "物品名称", example = "王五") + private String itemName; + + @Schema(description = "物品描述1") + private String itemDesc1; + + @Schema(description = "物品描述2") + private String itemDesc2; + + @Schema(description = "项目代码") + private String projectCode; + + @Schema(description = "到数量") + private BigDecimal toQty; + + @Schema(description = "从数量") + private BigDecimal fromQty; + + @Schema(description = "计量单位") + private String uom; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailPageReqVO.java new file mode 100644 index 00000000..db4e926f --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailPageReqVO.java @@ -0,0 +1,102 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import lombok.*; + +import java.math.BigDecimal; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 翻包记录子分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackageoverDetailPageReqVO extends PageParam { + + @Schema(description = "库位代码") + private String locationCode; + + @Schema(description = "库位组代码") + private String locationGroupCode; + + @Schema(description = "库区代码") + private String areaCode; + + @Schema(description = "从包装号") + private String fromPackingNumber; + + @Schema(description = "到包装号") + private String toPackingNumber; + + @Schema(description = "从批次") + private String fromBatch; + + @Schema(description = "到批次") + private String toBatch; + + @Schema(description = "从库存状态", example = "2") + private String fromInventoryStatus; + + @Schema(description = "到库存状态", example = "1") + private String toInventoryStatus; + + @Schema(description = "从器具号") + private String fromContainerNumber; + + @Schema(description = "到器具号") + private String toContainerNumber; + + @Schema(description = "从货主代码") + private String fromOwnerCode; + + @Schema(description = "到货主代码") + private String toOwnerCode; + + @Schema(description = "主表ID", example = "19413") + private Long masterId; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "物品代码") + private String itemCode; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "地点ID", example = "14071") + private String siteId; + + @Schema(description = "物品名称", example = "王五") + private String itemName; + + @Schema(description = "物品描述1") + private String itemDesc1; + + @Schema(description = "物品描述2") + private String itemDesc2; + + @Schema(description = "项目代码") + private String projectCode; + + @Schema(description = "到数量") + private BigDecimal toQty; + + @Schema(description = "从数量") + private BigDecimal fromQty; + + @Schema(description = "计量单位") + private String uom; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailRespVO.java new file mode 100644 index 00000000..fb7922b6 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailRespVO.java @@ -0,0 +1,19 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 翻包记录子 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackageoverDetailRespVO extends PackageoverDetailBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27780") + private Long id; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailUpdateReqVO.java new file mode 100644 index 00000000..19a9b78d --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 翻包记录子更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackageoverDetailUpdateReqVO extends PackageoverDetailBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27780") + @NotNull(message = "id不能为空") + private Long id; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainBaseVO.java new file mode 100644 index 00000000..f78c245f --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainBaseVO.java @@ -0,0 +1,86 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import javax.validation.constraints.*; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +/** + * 翻包记录主 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class PackageoverMainBaseVO { + + @Schema(description = "仓库代码") + private String warehouseCode; + + @Schema(description = "明细") + private String details; + + @Schema(description = "出库事务类型", example = "2") + private String outTransactionType; + + @Schema(description = "入库事务类型", example = "1") + private String inTransactionType; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime executeTime; + + @Schema(description = "生效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime activeDate; + + @Schema(description = "是否可用") + private String available; + + @Schema(description = "申请时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime requestTime; + + @Schema(description = "截止时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime dueTime; + + @Schema(description = "部门") + private String departmentCode; + + @Schema(description = "用户组") + private String userGroupCode; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "业务类型", example = "1") + private String businessType; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "创建者") + private String creator; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新者") + private String updater; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainCreateReqVO.java new file mode 100644 index 00000000..44323b81 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainCreateReqVO.java @@ -0,0 +1,14 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 翻包记录主创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackageoverMainCreateReqVO extends PackageoverMainBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExcelVO.java new file mode 100644 index 00000000..32efc3cc --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExcelVO.java @@ -0,0 +1,80 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 翻包记录主 Excel VO + * + * @author 超级管理员 + */ +@Data +public class PackageoverMainExcelVO { + + @ExcelProperty("id") + private Long id; + + @ExcelProperty("仓库代码") + private String warehouseCode; + + @ExcelProperty("明细") + private String details; + + @ExcelProperty("出库事务类型") + private String outTransactionType; + + @ExcelProperty("入库事务类型") + private String inTransactionType; + + @ExcelProperty("执行时间") + private LocalDateTime executeTime; + + @ExcelProperty("生效日期") + private LocalDateTime activeDate; + + @ExcelProperty("是否可用") + private String available; + + @ExcelProperty("申请时间") + private LocalDateTime requestTime; + + @ExcelProperty("截止时间") + private LocalDateTime dueTime; + + @ExcelProperty("部门") + private String departmentCode; + + @ExcelProperty("用户组") + private String userGroupCode; + + @ExcelProperty("接口类型") + private String interfaceType; + + @ExcelProperty("单据号") + private String number; + + @ExcelProperty("业务类型") + private String businessType; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("扩展属性") + private String extraProperties; + + @ExcelProperty("地点ID") + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExportReqVO.java new file mode 100644 index 00000000..fd53552b --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainExportReqVO.java @@ -0,0 +1,75 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 翻包记录主 Excel 导出 Request VO，参数和 PackageoverMainPageReqVO 是一致的") +@Data +public class PackageoverMainExportReqVO { + + @Schema(description = "仓库代码") + private String warehouseCode; + + @Schema(description = "明细") + private String details; + + @Schema(description = "出库事务类型", example = "2") + private String outTransactionType; + + @Schema(description = "入库事务类型", example = "1") + private String inTransactionType; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] executeTime; + + @Schema(description = "生效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] activeDate; + + @Schema(description = "是否可用") + private String available; + + @Schema(description = "申请时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] requestTime; + + @Schema(description = "截止时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] dueTime; + + @Schema(description = "部门") + private String departmentCode; + + @Schema(description = "用户组") + private String userGroupCode; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "业务类型", example = "1") + private String businessType; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "扩展属性") + private String extraProperties; + + @Schema(description = "地点ID", example = "32228") + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainPageReqVO.java new file mode 100644 index 00000000..8a3d2ca2 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainPageReqVO.java @@ -0,0 +1,77 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 翻包记录主分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackageoverMainPageReqVO extends PageParam { + + @Schema(description = "仓库代码") + private String warehouseCode; + + @Schema(description = "明细") + private String details; + + @Schema(description = "出库事务类型", example = "2") + private String outTransactionType; + + @Schema(description = "入库事务类型", example = "1") + private String inTransactionType; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] executeTime; + + @Schema(description = "生效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] activeDate; + + @Schema(description = "是否可用") + private String available; + + @Schema(description = "申请时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] requestTime; + + @Schema(description = "截止时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] dueTime; + + @Schema(description = "部门") + private String departmentCode; + + @Schema(description = "用户组") + private String userGroupCode; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "业务类型", example = "1") + private String businessType; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "扩展属性") + private String extraProperties; + + @Schema(description = "地点ID", example = "32228") + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainRespVO.java new file mode 100644 index 00000000..06f8dc36 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainRespVO.java @@ -0,0 +1,13 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 翻包记录主 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackageoverMainRespVO extends PackageoverMainBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainUpdateReqVO.java new file mode 100644 index 00000000..96f008a7 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverMainUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.win.module.wms.controller.packageovermain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 翻包记录主更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackageoverMainUpdateReqVO extends PackageoverMainBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2501") + @NotNull(message = "id不能为空") + private Long id; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitDetailController.java new file mode 100644 index 00000000..871cfd80 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitDetailController.java @@ -0,0 +1,114 @@ +package com.win.module.wms.controller.packagesplitmain; + +import io.swagger.v3.oas.annotations.Parameters; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.*; +import java.io.IOException; + +import com.win.framework.common.pojo.PageResult; +import com.win.framework.common.pojo.CommonResult; +import static com.win.framework.common.pojo.CommonResult.success; + +import com.win.framework.excel.core.util.ExcelUtils; + +import com.win.framework.operatelog.core.annotations.OperateLog; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.win.module.wms.controller.packagesplitmain.vo.*; +import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitDetailDO; +import com.win.module.wms.convert.packagesplitmain.PackagesplitDetailConvert; +import com.win.module.wms.service.packagesplitmain.PackagesplitDetailService; +import org.springframework.web.multipart.MultipartFile; + +@Tag(name = "管理后台 - 拆包记录子") +@RestController +@RequestMapping("/wms/packagesplit-detail") +@Validated +public class PackagesplitDetailController { + + @Resource + private PackagesplitDetailService packagesplitDetailService; + + @PostMapping("/create") + @Operation(summary = "创建拆包记录子") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:create')") + public CommonResult createPackagesplitDetail(@Valid @RequestBody PackagesplitDetailCreateReqVO createReqVO) { + return success(packagesplitDetailService.createPackagesplitDetail(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新拆包记录子") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:update')") + public CommonResult updatePackagesplitDetail(@Valid @RequestBody PackagesplitDetailUpdateReqVO updateReqVO) { + int result = packagesplitDetailService.updatePackagesplitDetail(updateReqVO); + return success(result > 0); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除拆包记录子") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:delete')") + public CommonResult deletePackagesplitDetail(@RequestParam("id") Long id) { + int result = packagesplitDetailService.deletePackagesplitDetail(id); + return success(result > 0); + } + + @GetMapping("/get") + @Operation(summary = "获得拆包记录子") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:query')") + public CommonResult getPackagesplitDetail(@RequestParam("id") Long id) { + PackagesplitDetailDO packagesplitDetail = packagesplitDetailService.getPackagesplitDetail(id); + return success(PackagesplitDetailConvert.INSTANCE.convert(packagesplitDetail)); + } + + @GetMapping("/list") + @Operation(summary = "获得拆包记录子列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:query')") + public CommonResult> getPackagesplitDetailList(@RequestParam("ids") Collection ids) { + List list = packagesplitDetailService.getPackagesplitDetailList(ids); + return success(PackagesplitDetailConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得拆包记录子分页") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:query')") + public CommonResult> getPackagesplitDetailPage(@Valid PackagesplitDetailPageReqVO pageVO) { + PageResult pageResult = packagesplitDetailService.getPackagesplitDetailPage(pageVO); + return success(PackagesplitDetailConvert.INSTANCE.convertPage(pageResult)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出拆包记录子 Excel") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-detail:export')") + @OperateLog(type = EXPORT) + public void exportPackagesplitDetailExcel(@Valid PackagesplitDetailExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = packagesplitDetailService.getPackagesplitDetailList(exportReqVO); + // 导出 Excel + List datas = PackagesplitDetailConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "拆包记录子.xls", "数据", PackagesplitDetailExcelVO.class, datas); + } + + @GetMapping("/get-import-template") + @Operation(summary = "获得导入拆包记录子模板") + public void importTemplate(HttpServletResponse response) throws IOException { + List list = Arrays.asList(); + // 输出 + ExcelUtils.write(response, "拆包记录子基本信息导入模板.xls", "拆包记录子基本信息列表", PackagesplitDetailExcelVO.class, list); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitMainController.java new file mode 100644 index 00000000..425c4819 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/PackagesplitMainController.java @@ -0,0 +1,136 @@ +package com.win.module.wms.controller.packagesplitmain; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.packageovermain.vo.PackageoverMainRespVO; +import com.win.module.wms.convert.packageovermain.PackageoverMainConvert; +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO; +import io.swagger.v3.oas.annotations.Parameters; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.*; +import java.io.IOException; + +import com.win.framework.common.pojo.PageResult; +import com.win.framework.common.pojo.CommonResult; +import static com.win.framework.common.pojo.CommonResult.success; + +import com.win.framework.excel.core.util.ExcelUtils; + +import com.win.framework.operatelog.core.annotations.OperateLog; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.win.module.wms.controller.packagesplitmain.vo.*; +import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitMainDO; +import com.win.module.wms.convert.packagesplitmain.PackagesplitMainConvert; +import com.win.module.wms.service.packagesplitmain.PackagesplitMainService; +import org.springframework.web.multipart.MultipartFile; + +@Tag(name = "管理后台 - 拆包记录主") +@RestController +@RequestMapping("/wms/packagesplit-main") +@Validated +public class PackagesplitMainController { + + @Resource + private AdminUserApi userApi; + @Resource + private PackagesplitMainService packagesplitMainService; + + @PostMapping("/create") + @Operation(summary = "创建拆包记录主") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-main:create')") + public CommonResult createPackagesplitMain(@Valid @RequestBody PackagesplitMainCreateReqVO createReqVO) { + return success(packagesplitMainService.createPackagesplitMain(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新拆包记录主") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-main:update')") + public CommonResult updatePackagesplitMain(@Valid @RequestBody PackagesplitMainUpdateReqVO updateReqVO) { + int result = packagesplitMainService.updatePackagesplitMain(updateReqVO); + return success(result > 0); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除拆包记录主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:packagesplit-main:delete')") + public CommonResult deletePackagesplitMain(@RequestParam("id") Long id) { + int result = packagesplitMainService.deletePackagesplitMain(id); + return success(result > 0); + } + + @GetMapping("/get") + @Operation(summary = "获得拆包记录主") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-main:query')") + public CommonResult getPackagesplitMain(@RequestParam("id") Long id) { + PackagesplitMainDO packagesplitMain = packagesplitMainService.getPackagesplitMain(id); + return success(PackagesplitMainConvert.INSTANCE.convert(packagesplitMain)); + } + + @GetMapping("/list") + @Operation(summary = "获得拆包记录主列表") + @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-main:query')") + public CommonResult> getPackagesplitMainList(@RequestParam("ids") Collection ids) { + List list = packagesplitMainService.getPackagesplitMainList(ids); + return success(PackagesplitMainConvert.INSTANCE.convertList(list)); + } + + @GetMapping("/page") + @Operation(summary = "获得拆包记录主分页") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-main:query')") + public CommonResult> getPackagesplitMainPage(@Valid PackagesplitMainPageReqVO pageVO) { + PageResult pageResult = packagesplitMainService.getPackagesplitMainPage(pageVO); + return success(PackagesplitMainConvert.INSTANCE.convertPage(pageResult)); + } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拆包记录主分页") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-main:query')") + public CommonResult> getPackagesplitMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = packagesplitMainService.getPackagesplitMainSenior(conditions); + PageResult result = PackagesplitMainConvert.INSTANCE.convertPage(pageResult); + for(PackagesplitMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出拆包记录主 Excel") + @PreAuthorize("@ss.hasPermission('wms:packagesplit-main:export')") + @OperateLog(type = EXPORT) + public void exportPackagesplitMainExcel(@Valid PackagesplitMainExportReqVO exportReqVO, + HttpServletResponse response) throws IOException { + List list = packagesplitMainService.getPackagesplitMainList(exportReqVO); + // 导出 Excel + List datas = PackagesplitMainConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "拆包记录主.xls", "数据", PackagesplitMainExcelVO.class, datas); + } + + @GetMapping("/get-import-template") + @Operation(summary = "获得导入拆包记录主模板") + public void importTemplate(HttpServletResponse response) throws IOException { + List list = Arrays.asList(); + // 输出 + ExcelUtils.write(response, "拆包记录主基本信息导入模板.xls", "拆包记录主基本信息列表", PackagesplitMainExcelVO.class, list); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailBaseVO.java new file mode 100644 index 00000000..a20a673c --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailBaseVO.java @@ -0,0 +1,97 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import javax.validation.constraints.*; + +/** + * 拆包记录子 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class PackagesplitDetailBaseVO { + + @Schema(description = "库位代码") + private String locationCode; + + @Schema(description = "库位组代码") + private String locationGroupCode; + + @Schema(description = "库区代码") + private String areaCode; + + @Schema(description = "从包装号") + private String fromPackingNumber; + + @Schema(description = "到包装号") + private String toPackingNumber; + + @Schema(description = "从批次") + private String fromBatch; + + @Schema(description = "到批次") + private String toBatch; + + @Schema(description = "从库存状态", example = "2") + private String fromInventoryStatus; + + @Schema(description = "到库存状态", example = "1") + private String toInventoryStatus; + + @Schema(description = "从器具号") + private String fromContainerNumber; + + @Schema(description = "到器具号") + private String toContainerNumber; + + @Schema(description = "从货主代码") + private String fromOwnerCode; + + @Schema(description = "到货主代码") + private String toOwnerCode; + + @Schema(description = "主表ID", example = "24141") + private Long masterId; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "物品代码") + private String itemCode; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "地点ID", example = "11960") + private String siteId; + + @Schema(description = "物品名称", example = "芋艿") + private String itemName; + + @Schema(description = "物品描述1") + private String itemDesc1; + + @Schema(description = "物品描述2") + private String itemDesc2; + + @Schema(description = "项目代码") + private String projectCode; + + @Schema(description = "到数量") + private BigDecimal toQty; + + @Schema(description = "从数量") + private BigDecimal fromQty; + + @Schema(description = "计量单位") + private String uom; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailCreateReqVO.java new file mode 100644 index 00000000..10ae2315 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailCreateReqVO.java @@ -0,0 +1,14 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 拆包记录子创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagesplitDetailCreateReqVO extends PackagesplitDetailBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExcelVO.java new file mode 100644 index 00000000..de784de9 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExcelVO.java @@ -0,0 +1,105 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 拆包记录子 Excel VO + * + * @author 超级管理员 + */ +@Data +public class PackagesplitDetailExcelVO { + + @ExcelProperty("id") + private Long id; + + @ExcelProperty("库位代码") + private String locationCode; + + @ExcelProperty("库位组代码") + private String locationGroupCode; + + @ExcelProperty("库区代码") + private String areaCode; + + @ExcelProperty("从包装号") + private String fromPackingNumber; + + @ExcelProperty("到包装号") + private String toPackingNumber; + + @ExcelProperty("从批次") + private String fromBatch; + + @ExcelProperty("到批次") + private String toBatch; + + @ExcelProperty("从库存状态") + private String fromInventoryStatus; + + @ExcelProperty("到库存状态") + private String toInventoryStatus; + + @ExcelProperty("从器具号") + private String fromContainerNumber; + + @ExcelProperty("到器具号") + private String toContainerNumber; + + @ExcelProperty("从货主代码") + private String fromOwnerCode; + + @ExcelProperty("到货主代码") + private String toOwnerCode; + + @ExcelProperty("主表ID") + private Long masterId; + + @ExcelProperty("单据号") + private String number; + + @ExcelProperty("物品代码") + private String itemCode; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("地点ID") + private String siteId; + + @ExcelProperty("物品名称") + private String itemName; + + @ExcelProperty("物品描述1") + private String itemDesc1; + + @ExcelProperty("物品描述2") + private String itemDesc2; + + @ExcelProperty("项目代码") + private String projectCode; + + @ExcelProperty("到数量") + private BigDecimal toQty; + + @ExcelProperty("从数量") + private BigDecimal fromQty; + + @ExcelProperty("计量单位") + private String uom; + + @ExcelProperty("接口类型") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExportReqVO.java new file mode 100644 index 00000000..cb2e941a --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExportReqVO.java @@ -0,0 +1,100 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import lombok.*; + +import java.math.BigDecimal; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 拆包记录子 Excel 导出 Request VO，参数和 PackagesplitDetailPageReqVO 是一致的") +@Data +public class PackagesplitDetailExportReqVO { + + @Schema(description = "库位代码") + private String locationCode; + + @Schema(description = "库位组代码") + private String locationGroupCode; + + @Schema(description = "库区代码") + private String areaCode; + + @Schema(description = "从包装号") + private String fromPackingNumber; + + @Schema(description = "到包装号") + private String toPackingNumber; + + @Schema(description = "从批次") + private String fromBatch; + + @Schema(description = "到批次") + private String toBatch; + + @Schema(description = "从库存状态", example = "2") + private String fromInventoryStatus; + + @Schema(description = "到库存状态", example = "1") + private String toInventoryStatus; + + @Schema(description = "从器具号") + private String fromContainerNumber; + + @Schema(description = "到器具号") + private String toContainerNumber; + + @Schema(description = "从货主代码") + private String fromOwnerCode; + + @Schema(description = "到货主代码") + private String toOwnerCode; + + @Schema(description = "主表ID", example = "24141") + private Long masterId; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "物品代码") + private String itemCode; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "地点ID", example = "11960") + private String siteId; + + @Schema(description = "物品名称", example = "芋艿") + private String itemName; + + @Schema(description = "物品描述1") + private String itemDesc1; + + @Schema(description = "物品描述2") + private String itemDesc2; + + @Schema(description = "项目代码") + private String projectCode; + + @Schema(description = "到数量") + private BigDecimal toQty; + + @Schema(description = "从数量") + private BigDecimal fromQty; + + @Schema(description = "计量单位") + private String uom; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailPageReqVO.java new file mode 100644 index 00000000..64ade97c --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailPageReqVO.java @@ -0,0 +1,102 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import lombok.*; + +import java.math.BigDecimal; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 拆包记录子分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagesplitDetailPageReqVO extends PageParam { + + @Schema(description = "库位代码") + private String locationCode; + + @Schema(description = "库位组代码") + private String locationGroupCode; + + @Schema(description = "库区代码") + private String areaCode; + + @Schema(description = "从包装号") + private String fromPackingNumber; + + @Schema(description = "到包装号") + private String toPackingNumber; + + @Schema(description = "从批次") + private String fromBatch; + + @Schema(description = "到批次") + private String toBatch; + + @Schema(description = "从库存状态", example = "2") + private String fromInventoryStatus; + + @Schema(description = "到库存状态", example = "1") + private String toInventoryStatus; + + @Schema(description = "从器具号") + private String fromContainerNumber; + + @Schema(description = "到器具号") + private String toContainerNumber; + + @Schema(description = "从货主代码") + private String fromOwnerCode; + + @Schema(description = "到货主代码") + private String toOwnerCode; + + @Schema(description = "主表ID", example = "24141") + private Long masterId; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "物品代码") + private String itemCode; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "地点ID", example = "11960") + private String siteId; + + @Schema(description = "物品名称", example = "芋艿") + private String itemName; + + @Schema(description = "物品描述1") + private String itemDesc1; + + @Schema(description = "物品描述2") + private String itemDesc2; + + @Schema(description = "项目代码") + private String projectCode; + + @Schema(description = "到数量") + private BigDecimal toQty; + + @Schema(description = "从数量") + private BigDecimal fromQty; + + @Schema(description = "计量单位") + private String uom; + + @Schema(description = "接口类型", example = "1") + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailRespVO.java new file mode 100644 index 00000000..7a8e2741 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailRespVO.java @@ -0,0 +1,19 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 拆包记录子 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagesplitDetailRespVO extends PackagesplitDetailBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "23508") + private Long id; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailUpdateReqVO.java new file mode 100644 index 00000000..f706c02f --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 拆包记录子更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagesplitDetailUpdateReqVO extends PackagesplitDetailBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "23508") + @NotNull(message = "id不能为空") + private Long id; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainBaseVO.java new file mode 100644 index 00000000..57fd62ae --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainBaseVO.java @@ -0,0 +1,88 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import javax.validation.constraints.*; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +/** + * 拆包记录主 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class PackagesplitMainBaseVO { + + @Schema(description = "仓库代码") + private String warehouseCode; + + @Schema(description = "明细") + private String details; + + @Schema(description = "出库事务类型", example = "1") + private String outTransactionType; + + @Schema(description = "入库事务类型", example = "1") + private String inTransactionType; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime executeTime; + + @Schema(description = "生效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime activeDate; + + @Schema(description = "是否可用") + private String available; + + @Schema(description = "申请时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime requestTime; + + @Schema(description = "截止时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime dueTime; + + @Schema(description = "部门") + private String departmentCode; + + @Schema(description = "用户组") + private String userGroupCode; + + @Schema(description = "接口类型", example = "2") + private String interfaceType; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "业务类型", example = "2") + private String businessType; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "地点ID", example = "19009") + private String siteId; + + @Schema(description = "创建者") + private String creator; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "更新者") + private String updater; + + @Schema(description = "更新时间") + private LocalDateTime updateTime; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainCreateReqVO.java new file mode 100644 index 00000000..e9f02377 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainCreateReqVO.java @@ -0,0 +1,14 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 拆包记录主创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagesplitMainCreateReqVO extends PackagesplitMainBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExcelVO.java new file mode 100644 index 00000000..d3a434a4 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExcelVO.java @@ -0,0 +1,80 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; + +import com.alibaba.excel.annotation.ExcelProperty; + +/** + * 拆包记录主 Excel VO + * + * @author 超级管理员 + */ +@Data +public class PackagesplitMainExcelVO { + + @ExcelProperty("id") + private Long id; + + @ExcelProperty("仓库代码") + private String warehouseCode; + + @ExcelProperty("明细") + private String details; + + @ExcelProperty("出库事务类型") + private String outTransactionType; + + @ExcelProperty("入库事务类型") + private String inTransactionType; + + @ExcelProperty("执行时间") + private LocalDateTime executeTime; + + @ExcelProperty("生效日期") + private LocalDateTime activeDate; + + @ExcelProperty("是否可用") + private String available; + + @ExcelProperty("申请时间") + private LocalDateTime requestTime; + + @ExcelProperty("截止时间") + private LocalDateTime dueTime; + + @ExcelProperty("部门") + private String departmentCode; + + @ExcelProperty("用户组") + private String userGroupCode; + + @ExcelProperty("接口类型") + private String interfaceType; + + @ExcelProperty("单据号") + private String number; + + @ExcelProperty("业务类型") + private String businessType; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("扩展属性") + private String extraProperties; + + @ExcelProperty("地点ID") + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExportReqVO.java new file mode 100644 index 00000000..56cf7046 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainExportReqVO.java @@ -0,0 +1,75 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import java.time.LocalDateTime; +import org.springframework.format.annotation.DateTimeFormat; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 拆包记录主 Excel 导出 Request VO，参数和 PackagesplitMainPageReqVO 是一致的") +@Data +public class PackagesplitMainExportReqVO { + + @Schema(description = "仓库代码") + private String warehouseCode; + + @Schema(description = "明细") + private String details; + + @Schema(description = "出库事务类型", example = "1") + private String outTransactionType; + + @Schema(description = "入库事务类型", example = "1") + private String inTransactionType; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] executeTime; + + @Schema(description = "生效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] activeDate; + + @Schema(description = "是否可用") + private String available; + + @Schema(description = "申请时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] requestTime; + + @Schema(description = "截止时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] dueTime; + + @Schema(description = "部门") + private String departmentCode; + + @Schema(description = "用户组") + private String userGroupCode; + + @Schema(description = "接口类型", example = "2") + private String interfaceType; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "业务类型", example = "2") + private String businessType; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "扩展属性") + private String extraProperties; + + @Schema(description = "地点ID", example = "19009") + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainPageReqVO.java new file mode 100644 index 00000000..9a772dae --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainPageReqVO.java @@ -0,0 +1,77 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.win.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 拆包记录主分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagesplitMainPageReqVO extends PageParam { + + @Schema(description = "仓库代码") + private String warehouseCode; + + @Schema(description = "明细") + private String details; + + @Schema(description = "出库事务类型", example = "1") + private String outTransactionType; + + @Schema(description = "入库事务类型", example = "1") + private String inTransactionType; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] executeTime; + + @Schema(description = "生效日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] activeDate; + + @Schema(description = "是否可用") + private String available; + + @Schema(description = "申请时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] requestTime; + + @Schema(description = "截止时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] dueTime; + + @Schema(description = "部门") + private String departmentCode; + + @Schema(description = "用户组") + private String userGroupCode; + + @Schema(description = "接口类型", example = "2") + private String interfaceType; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "业务类型", example = "2") + private String businessType; + + @Schema(description = "备注", example = "你说的对") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "扩展属性") + private String extraProperties; + + @Schema(description = "地点ID", example = "19009") + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainRespVO.java new file mode 100644 index 00000000..547c623a --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainRespVO.java @@ -0,0 +1,13 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 拆包记录主 Response VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagesplitMainRespVO extends PackagesplitMainBaseVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainUpdateReqVO.java new file mode 100644 index 00000000..1bd4a7f4 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitMainUpdateReqVO.java @@ -0,0 +1,18 @@ +package com.win.module.wms.controller.packagesplitmain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 拆包记录主更新 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PackagesplitMainUpdateReqVO extends PackagesplitMainBaseVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "15400") + @NotNull(message = "id不能为空") + private Long id; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeDetailConvert.java new file mode 100644 index 00000000..a317b900 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeDetailConvert.java @@ -0,0 +1,34 @@ +package com.win.module.wms.convert.packagemergemain; + +import java.util.*; + +import com.win.framework.common.pojo.PageResult; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import com.win.module.wms.controller.packagemergemain.vo.*; +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeDetailDO; + +/** + * 合包记录子 Convert + * + * @author 超级管理员 + */ +@Mapper +public interface PackagemergeDetailConvert { + + PackagemergeDetailConvert INSTANCE = Mappers.getMapper(PackagemergeDetailConvert.class); + + PackagemergeDetailDO convert(PackagemergeDetailCreateReqVO bean); + + PackagemergeDetailDO convert(PackagemergeDetailUpdateReqVO bean); + + PackagemergeDetailRespVO convert(PackagemergeDetailDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeMainConvert.java new file mode 100644 index 00000000..754bc353 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagemergemain/PackagemergeMainConvert.java @@ -0,0 +1,34 @@ +package com.win.module.wms.convert.packagemergemain; + +import java.util.*; + +import com.win.framework.common.pojo.PageResult; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import com.win.module.wms.controller.packagemergemain.vo.*; +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO; + +/** + * 合包记录主 Convert + * + * @author 超级管理员 + */ +@Mapper +public interface PackagemergeMainConvert { + + PackagemergeMainConvert INSTANCE = Mappers.getMapper(PackagemergeMainConvert.class); + + PackagemergeMainDO convert(PackagemergeMainCreateReqVO bean); + + PackagemergeMainDO convert(PackagemergeMainUpdateReqVO bean); + + PackagemergeMainRespVO convert(PackagemergeMainDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverDetailConvert.java new file mode 100644 index 00000000..7019ac1d --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverDetailConvert.java @@ -0,0 +1,34 @@ +package com.win.module.wms.convert.packageovermain; + +import java.util.*; + +import com.win.framework.common.pojo.PageResult; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import com.win.module.wms.controller.packageovermain.vo.*; +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverDetailDO; + +/** + * 翻包记录子 Convert + * + * @author 超级管理员 + */ +@Mapper +public interface PackageoverDetailConvert { + + PackageoverDetailConvert INSTANCE = Mappers.getMapper(PackageoverDetailConvert.class); + + PackageoverDetailDO convert(PackageoverDetailCreateReqVO bean); + + PackageoverDetailDO convert(PackageoverDetailUpdateReqVO bean); + + PackageoverDetailRespVO convert(PackageoverDetailDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverMainConvert.java new file mode 100644 index 00000000..8ea23bb7 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageovermain/PackageoverMainConvert.java @@ -0,0 +1,34 @@ +package com.win.module.wms.convert.packageovermain; + +import java.util.*; + +import com.win.framework.common.pojo.PageResult; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import com.win.module.wms.controller.packageovermain.vo.*; +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO; + +/** + * 翻包记录主 Convert + * + * @author 超级管理员 + */ +@Mapper +public interface PackageoverMainConvert { + + PackageoverMainConvert INSTANCE = Mappers.getMapper(PackageoverMainConvert.class); + + PackageoverMainDO convert(PackageoverMainCreateReqVO bean); + + PackageoverMainDO convert(PackageoverMainUpdateReqVO bean); + + PackageoverMainRespVO convert(PackageoverMainDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitDetailConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitDetailConvert.java new file mode 100644 index 00000000..92455f2d --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitDetailConvert.java @@ -0,0 +1,34 @@ +package com.win.module.wms.convert.packagesplitmain; + +import java.util.*; + +import com.win.framework.common.pojo.PageResult; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import com.win.module.wms.controller.packagesplitmain.vo.*; +import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitDetailDO; + +/** + * 拆包记录子 Convert + * + * @author 超级管理员 + */ +@Mapper +public interface PackagesplitDetailConvert { + + PackagesplitDetailConvert INSTANCE = Mappers.getMapper(PackagesplitDetailConvert.class); + + PackagesplitDetailDO convert(PackagesplitDetailCreateReqVO bean); + + PackagesplitDetailDO convert(PackagesplitDetailUpdateReqVO bean); + + PackagesplitDetailRespVO convert(PackagesplitDetailDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitMainConvert.java new file mode 100644 index 00000000..24079669 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packagesplitmain/PackagesplitMainConvert.java @@ -0,0 +1,34 @@ +package com.win.module.wms.convert.packagesplitmain; + +import java.util.*; + +import com.win.framework.common.pojo.PageResult; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import com.win.module.wms.controller.packagesplitmain.vo.*; +import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitMainDO; + +/** + * 拆包记录主 Convert + * + * @author 超级管理员 + */ +@Mapper +public interface PackagesplitMainConvert { + + PackagesplitMainConvert INSTANCE = Mappers.getMapper(PackagesplitMainConvert.class); + + PackagesplitMainDO convert(PackagesplitMainCreateReqVO bean); + + PackagesplitMainDO convert(PackagesplitMainUpdateReqVO bean); + + PackagesplitMainRespVO convert(PackagesplitMainDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeDetailDO.java new file mode 100644 index 00000000..7b4a736f --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeDetailDO.java @@ -0,0 +1,136 @@ +package com.win.module.wms.dal.dataobject.packagemergemain; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.win.framework.mybatis.core.dataobject.BaseDO; + +/** + * 合包记录子 DO + * + * @author 超级管理员 + */ +@TableName("record_packagemerge_detail") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PackagemergeDetailDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 库位代码 + */ + private String locationCode; + /** + * 库位组代码 + */ + private String locationGroupCode; + /** + * 库区代码 + */ + private String areaCode; + /** + * 从包装号 + */ + private String fromPackingNumber; + /** + * 到包装号 + */ + private String toPackingNumber; + /** + * 从批次 + */ + private String fromBatch; + /** + * 到批次 + */ + private String toBatch; + /** + * 从库存状态 + */ + private String fromInventoryStatus; + /** + * 到库存状态 + */ + private String toInventoryStatus; + /** + * 从器具号 + */ + private String fromContainerNumber; + /** + * 到器具号 + */ + private String toContainerNumber; + /** + * 从货主代码 + */ + private String fromOwnerCode; + /** + * 到货主代码 + */ + private String toOwnerCode; + /** + * 主表ID + */ + private Long masterId; + /** + * 单据号 + */ + private String number; + /** + * 物品代码 + */ + private String itemCode; + /** + * 备注 + */ + private String remark; + /** + * 地点ID + */ + private String siteId; + /** + * 物品名称 + */ + private String itemName; + /** + * 物品描述1 + */ + private String itemDesc1; + /** + * 物品描述2 + */ + private String itemDesc2; + /** + * 项目代码 + */ + private String projectCode; + /** + * 到数量 + */ + private BigDecimal toQty; + /** + * 从数量 + */ + private BigDecimal fromQty; + /** + * 计量单位 + */ + private String uom; + /** + * 接口类型 + */ + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeMainDO.java new file mode 100644 index 00000000..c013e0ab --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeMainDO.java @@ -0,0 +1,102 @@ +package com.win.module.wms.dal.dataobject.packagemergemain; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.win.framework.mybatis.core.dataobject.BaseDO; + +/** + * 合包记录主 DO + * + * @author 超级管理员 + */ +@TableName("record_packagemerge_main") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PackagemergeMainDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 仓库代码 + */ + private String warehouseCode; + /** + * 明细 + */ + private String details; + /** + * 出库事务类型 + */ + private String outTransactionType; + /** + * 入库事务类型 + */ + private String inTransactionType; + /** + * 执行时间 + */ + private LocalDateTime executeTime; + /** + * 生效日期 + */ + private LocalDateTime activeDate; + /** + * 是否可用 + */ + private String available; + /** + * 申请时间 + */ + private LocalDateTime requestTime; + /** + * 截止时间 + */ + private LocalDateTime dueTime; + /** + * 部门 + */ + private String departmentCode; + /** + * 用户组 + */ + private String userGroupCode; + /** + * 接口类型 + */ + private String interfaceType; + /** + * 单据号 + */ + private String number; + /** + * 业务类型 + */ + private String businessType; + /** + * 备注 + */ + private String remark; + /** + * 扩展属性 + */ + private String extraProperties; + /** + * 地点ID + */ + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java new file mode 100644 index 00000000..750d9b74 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java @@ -0,0 +1,136 @@ +package com.win.module.wms.dal.dataobject.packageovermain; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.win.framework.mybatis.core.dataobject.BaseDO; + +/** + * 翻包记录子 DO + * + * @author 超级管理员 + */ +@TableName("record_packageover_detail") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PackageoverDetailDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 库位代码 + */ + private String locationCode; + /** + * 库位组代码 + */ + private String locationGroupCode; + /** + * 库区代码 + */ + private String areaCode; + /** + * 从包装号 + */ + private String fromPackingNumber; + /** + * 到包装号 + */ + private String toPackingNumber; + /** + * 从批次 + */ + private String fromBatch; + /** + * 到批次 + */ + private String toBatch; + /** + * 从库存状态 + */ + private String fromInventoryStatus; + /** + * 到库存状态 + */ + private String toInventoryStatus; + /** + * 从器具号 + */ + private String fromContainerNumber; + /** + * 到器具号 + */ + private String toContainerNumber; + /** + * 从货主代码 + */ + private String fromOwnerCode; + /** + * 到货主代码 + */ + private String toOwnerCode; + /** + * 主表ID + */ + private Long masterId; + /** + * 单据号 + */ + private String number; + /** + * 物品代码 + */ + private String itemCode; + /** + * 备注 + */ + private String remark; + /** + * 地点ID + */ + private String siteId; + /** + * 物品名称 + */ + private String itemName; + /** + * 物品描述1 + */ + private String itemDesc1; + /** + * 物品描述2 + */ + private String itemDesc2; + /** + * 项目代码 + */ + private String projectCode; + /** + * 到数量 + */ + private BigDecimal toQty; + /** + * 从数量 + */ + private BigDecimal fromQty; + /** + * 计量单位 + */ + private String uom; + /** + * 接口类型 + */ + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverMainDO.java new file mode 100644 index 00000000..8458070d --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverMainDO.java @@ -0,0 +1,102 @@ +package com.win.module.wms.dal.dataobject.packageovermain; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.win.framework.mybatis.core.dataobject.BaseDO; + +/** + * 翻包记录主 DO + * + * @author 超级管理员 + */ +@TableName("record_packageover_main") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PackageoverMainDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 仓库代码 + */ + private String warehouseCode; + /** + * 明细 + */ + private String details; + /** + * 出库事务类型 + */ + private String outTransactionType; + /** + * 入库事务类型 + */ + private String inTransactionType; + /** + * 执行时间 + */ + private LocalDateTime executeTime; + /** + * 生效日期 + */ + private LocalDateTime activeDate; + /** + * 是否可用 + */ + private String available; + /** + * 申请时间 + */ + private LocalDateTime requestTime; + /** + * 截止时间 + */ + private LocalDateTime dueTime; + /** + * 部门 + */ + private String departmentCode; + /** + * 用户组 + */ + private String userGroupCode; + /** + * 接口类型 + */ + private String interfaceType; + /** + * 单据号 + */ + private String number; + /** + * 业务类型 + */ + private String businessType; + /** + * 备注 + */ + private String remark; + /** + * 扩展属性 + */ + private String extraProperties; + /** + * 地点ID + */ + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitDetailDO.java new file mode 100644 index 00000000..98180b3d --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitDetailDO.java @@ -0,0 +1,136 @@ +package com.win.module.wms.dal.dataobject.packagesplitmain; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.win.framework.mybatis.core.dataobject.BaseDO; + +/** + * 拆包记录子 DO + * + * @author 超级管理员 + */ +@TableName("record_packagesplit_detail") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PackagesplitDetailDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 库位代码 + */ + private String locationCode; + /** + * 库位组代码 + */ + private String locationGroupCode; + /** + * 库区代码 + */ + private String areaCode; + /** + * 从包装号 + */ + private String fromPackingNumber; + /** + * 到包装号 + */ + private String toPackingNumber; + /** + * 从批次 + */ + private String fromBatch; + /** + * 到批次 + */ + private String toBatch; + /** + * 从库存状态 + */ + private String fromInventoryStatus; + /** + * 到库存状态 + */ + private String toInventoryStatus; + /** + * 从器具号 + */ + private String fromContainerNumber; + /** + * 到器具号 + */ + private String toContainerNumber; + /** + * 从货主代码 + */ + private String fromOwnerCode; + /** + * 到货主代码 + */ + private String toOwnerCode; + /** + * 主表ID + */ + private Long masterId; + /** + * 单据号 + */ + private String number; + /** + * 物品代码 + */ + private String itemCode; + /** + * 备注 + */ + private String remark; + /** + * 地点ID + */ + private String siteId; + /** + * 物品名称 + */ + private String itemName; + /** + * 物品描述1 + */ + private String itemDesc1; + /** + * 物品描述2 + */ + private String itemDesc2; + /** + * 项目代码 + */ + private String projectCode; + /** + * 到数量 + */ + private BigDecimal toQty; + /** + * 从数量 + */ + private BigDecimal fromQty; + /** + * 计量单位 + */ + private String uom; + /** + * 接口类型 + */ + private String interfaceType; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitMainDO.java new file mode 100644 index 00000000..def768e4 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitMainDO.java @@ -0,0 +1,102 @@ +package com.win.module.wms.dal.dataobject.packagesplitmain; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.win.framework.mybatis.core.dataobject.BaseDO; + +/** + * 拆包记录主 DO + * + * @author 超级管理员 + */ +@TableName("record_packagesplit_main") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PackagesplitMainDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 仓库代码 + */ + private String warehouseCode; + /** + * 明细 + */ + private String details; + /** + * 出库事务类型 + */ + private String outTransactionType; + /** + * 入库事务类型 + */ + private String inTransactionType; + /** + * 执行时间 + */ + private LocalDateTime executeTime; + /** + * 生效日期 + */ + private LocalDateTime activeDate; + /** + * 是否可用 + */ + private String available; + /** + * 申请时间 + */ + private LocalDateTime requestTime; + /** + * 截止时间 + */ + private LocalDateTime dueTime; + /** + * 部门 + */ + private String departmentCode; + /** + * 用户组 + */ + private String userGroupCode; + /** + * 接口类型 + */ + private String interfaceType; + /** + * 单据号 + */ + private String number; + /** + * 业务类型 + */ + private String businessType; + /** + * 备注 + */ + private String remark; + /** + * 扩展属性 + */ + private String extraProperties; + /** + * 地点ID + */ + private String siteId; + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeDetailMapper.java new file mode 100644 index 00000000..c7a4bcd5 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeDetailMapper.java @@ -0,0 +1,84 @@ +package com.win.module.wms.dal.mysql.packagemergemain; + +import java.util.*; + +import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeDetailDO; +import org.apache.ibatis.annotations.Mapper; +import com.win.module.wms.controller.packagemergemain.vo.*; + +/** + * 合包记录子 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface PackagemergeDetailMapper extends BaseMapperX { + + default PageResult selectPage(PackagemergeDetailPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(PackagemergeDetailDO::getLocationCode, reqVO.getLocationCode()) + .eqIfPresent(PackagemergeDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode()) + .eqIfPresent(PackagemergeDetailDO::getAreaCode, reqVO.getAreaCode()) + .eqIfPresent(PackagemergeDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) + .eqIfPresent(PackagemergeDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) + .eqIfPresent(PackagemergeDetailDO::getFromBatch, reqVO.getFromBatch()) + .eqIfPresent(PackagemergeDetailDO::getToBatch, reqVO.getToBatch()) + .eqIfPresent(PackagemergeDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus()) + .eqIfPresent(PackagemergeDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus()) + .eqIfPresent(PackagemergeDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber()) + .eqIfPresent(PackagemergeDetailDO::getToContainerNumber, reqVO.getToContainerNumber()) + .eqIfPresent(PackagemergeDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) + .eqIfPresent(PackagemergeDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) + .eqIfPresent(PackagemergeDetailDO::getMasterId, reqVO.getMasterId()) + .eqIfPresent(PackagemergeDetailDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackagemergeDetailDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(PackagemergeDetailDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackagemergeDetailDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackagemergeDetailDO::getSiteId, reqVO.getSiteId()) + .likeIfPresent(PackagemergeDetailDO::getItemName, reqVO.getItemName()) + .eqIfPresent(PackagemergeDetailDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(PackagemergeDetailDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(PackagemergeDetailDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(PackagemergeDetailDO::getToQty, reqVO.getToQty()) + .eqIfPresent(PackagemergeDetailDO::getFromQty, reqVO.getFromQty()) + .eqIfPresent(PackagemergeDetailDO::getUom, reqVO.getUom()) + .eqIfPresent(PackagemergeDetailDO::getInterfaceType, reqVO.getInterfaceType()) + .orderByDesc(PackagemergeDetailDO::getId)); + } + + default List selectList(PackagemergeDetailExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(PackagemergeDetailDO::getLocationCode, reqVO.getLocationCode()) + .eqIfPresent(PackagemergeDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode()) + .eqIfPresent(PackagemergeDetailDO::getAreaCode, reqVO.getAreaCode()) + .eqIfPresent(PackagemergeDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) + .eqIfPresent(PackagemergeDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) + .eqIfPresent(PackagemergeDetailDO::getFromBatch, reqVO.getFromBatch()) + .eqIfPresent(PackagemergeDetailDO::getToBatch, reqVO.getToBatch()) + .eqIfPresent(PackagemergeDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus()) + .eqIfPresent(PackagemergeDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus()) + .eqIfPresent(PackagemergeDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber()) + .eqIfPresent(PackagemergeDetailDO::getToContainerNumber, reqVO.getToContainerNumber()) + .eqIfPresent(PackagemergeDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) + .eqIfPresent(PackagemergeDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) + .eqIfPresent(PackagemergeDetailDO::getMasterId, reqVO.getMasterId()) + .eqIfPresent(PackagemergeDetailDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackagemergeDetailDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(PackagemergeDetailDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackagemergeDetailDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackagemergeDetailDO::getSiteId, reqVO.getSiteId()) + .likeIfPresent(PackagemergeDetailDO::getItemName, reqVO.getItemName()) + .eqIfPresent(PackagemergeDetailDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(PackagemergeDetailDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(PackagemergeDetailDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(PackagemergeDetailDO::getToQty, reqVO.getToQty()) + .eqIfPresent(PackagemergeDetailDO::getFromQty, reqVO.getFromQty()) + .eqIfPresent(PackagemergeDetailDO::getUom, reqVO.getUom()) + .eqIfPresent(PackagemergeDetailDO::getInterfaceType, reqVO.getInterfaceType()) + .orderByDesc(PackagemergeDetailDO::getId)); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeMainMapper.java new file mode 100644 index 00000000..f556dcc5 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagemergemain/PackagemergeMainMapper.java @@ -0,0 +1,72 @@ +package com.win.module.wms.dal.mysql.packagemergemain; + +import java.util.*; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; +import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO; +import org.apache.ibatis.annotations.Mapper; +import com.win.module.wms.controller.packagemergemain.vo.*; + +/** + * 合包记录主 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface PackagemergeMainMapper extends BaseMapperX { + + default PageResult selectPage(PackagemergeMainPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(PackagemergeMainDO::getWarehouseCode, reqVO.getWarehouseCode()) + .eqIfPresent(PackagemergeMainDO::getDetails, reqVO.getDetails()) + .eqIfPresent(PackagemergeMainDO::getOutTransactionType, reqVO.getOutTransactionType()) + .eqIfPresent(PackagemergeMainDO::getInTransactionType, reqVO.getInTransactionType()) + .betweenIfPresent(PackagemergeMainDO::getExecuteTime, reqVO.getExecuteTime()) + .betweenIfPresent(PackagemergeMainDO::getActiveDate, reqVO.getActiveDate()) + .eqIfPresent(PackagemergeMainDO::getAvailable, reqVO.getAvailable()) + .betweenIfPresent(PackagemergeMainDO::getRequestTime, reqVO.getRequestTime()) + .betweenIfPresent(PackagemergeMainDO::getDueTime, reqVO.getDueTime()) + .eqIfPresent(PackagemergeMainDO::getDepartmentCode, reqVO.getDepartmentCode()) + .eqIfPresent(PackagemergeMainDO::getUserGroupCode, reqVO.getUserGroupCode()) + .eqIfPresent(PackagemergeMainDO::getInterfaceType, reqVO.getInterfaceType()) + .eqIfPresent(PackagemergeMainDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackagemergeMainDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(PackagemergeMainDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackagemergeMainDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackagemergeMainDO::getExtraProperties, reqVO.getExtraProperties()) + .eqIfPresent(PackagemergeMainDO::getSiteId, reqVO.getSiteId()) + .orderByDesc(PackagemergeMainDO::getId)); + } + + default List selectList(PackagemergeMainExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(PackagemergeMainDO::getWarehouseCode, reqVO.getWarehouseCode()) + .eqIfPresent(PackagemergeMainDO::getDetails, reqVO.getDetails()) + .eqIfPresent(PackagemergeMainDO::getOutTransactionType, reqVO.getOutTransactionType()) + .eqIfPresent(PackagemergeMainDO::getInTransactionType, reqVO.getInTransactionType()) + .betweenIfPresent(PackagemergeMainDO::getExecuteTime, reqVO.getExecuteTime()) + .betweenIfPresent(PackagemergeMainDO::getActiveDate, reqVO.getActiveDate()) + .eqIfPresent(PackagemergeMainDO::getAvailable, reqVO.getAvailable()) + .betweenIfPresent(PackagemergeMainDO::getRequestTime, reqVO.getRequestTime()) + .betweenIfPresent(PackagemergeMainDO::getDueTime, reqVO.getDueTime()) + .eqIfPresent(PackagemergeMainDO::getDepartmentCode, reqVO.getDepartmentCode()) + .eqIfPresent(PackagemergeMainDO::getUserGroupCode, reqVO.getUserGroupCode()) + .eqIfPresent(PackagemergeMainDO::getInterfaceType, reqVO.getInterfaceType()) + .eqIfPresent(PackagemergeMainDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackagemergeMainDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(PackagemergeMainDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackagemergeMainDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackagemergeMainDO::getExtraProperties, reqVO.getExtraProperties()) + .eqIfPresent(PackagemergeMainDO::getSiteId, reqVO.getSiteId()) + .orderByDesc(PackagemergeMainDO::getId)); + } + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverDetailMapper.java new file mode 100644 index 00000000..aec25a10 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverDetailMapper.java @@ -0,0 +1,84 @@ +package com.win.module.wms.dal.mysql.packageovermain; + +import java.util.*; + +import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverDetailDO; +import org.apache.ibatis.annotations.Mapper; +import com.win.module.wms.controller.packageovermain.vo.*; + +/** + * 翻包记录子 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface PackageoverDetailMapper extends BaseMapperX { + + default PageResult selectPage(PackageoverDetailPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(PackageoverDetailDO::getLocationCode, reqVO.getLocationCode()) + .eqIfPresent(PackageoverDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode()) + .eqIfPresent(PackageoverDetailDO::getAreaCode, reqVO.getAreaCode()) + .eqIfPresent(PackageoverDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) + .eqIfPresent(PackageoverDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) + .eqIfPresent(PackageoverDetailDO::getFromBatch, reqVO.getFromBatch()) + .eqIfPresent(PackageoverDetailDO::getToBatch, reqVO.getToBatch()) + .eqIfPresent(PackageoverDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus()) + .eqIfPresent(PackageoverDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus()) + .eqIfPresent(PackageoverDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber()) + .eqIfPresent(PackageoverDetailDO::getToContainerNumber, reqVO.getToContainerNumber()) + .eqIfPresent(PackageoverDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) + .eqIfPresent(PackageoverDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) + .eqIfPresent(PackageoverDetailDO::getMasterId, reqVO.getMasterId()) + .eqIfPresent(PackageoverDetailDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackageoverDetailDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(PackageoverDetailDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackageoverDetailDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackageoverDetailDO::getSiteId, reqVO.getSiteId()) + .likeIfPresent(PackageoverDetailDO::getItemName, reqVO.getItemName()) + .eqIfPresent(PackageoverDetailDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(PackageoverDetailDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(PackageoverDetailDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(PackageoverDetailDO::getToQty, reqVO.getToQty()) + .eqIfPresent(PackageoverDetailDO::getFromQty, reqVO.getFromQty()) + .eqIfPresent(PackageoverDetailDO::getUom, reqVO.getUom()) + .eqIfPresent(PackageoverDetailDO::getInterfaceType, reqVO.getInterfaceType()) + .orderByDesc(PackageoverDetailDO::getId)); + } + + default List selectList(PackageoverDetailExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(PackageoverDetailDO::getLocationCode, reqVO.getLocationCode()) + .eqIfPresent(PackageoverDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode()) + .eqIfPresent(PackageoverDetailDO::getAreaCode, reqVO.getAreaCode()) + .eqIfPresent(PackageoverDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) + .eqIfPresent(PackageoverDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) + .eqIfPresent(PackageoverDetailDO::getFromBatch, reqVO.getFromBatch()) + .eqIfPresent(PackageoverDetailDO::getToBatch, reqVO.getToBatch()) + .eqIfPresent(PackageoverDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus()) + .eqIfPresent(PackageoverDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus()) + .eqIfPresent(PackageoverDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber()) + .eqIfPresent(PackageoverDetailDO::getToContainerNumber, reqVO.getToContainerNumber()) + .eqIfPresent(PackageoverDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) + .eqIfPresent(PackageoverDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) + .eqIfPresent(PackageoverDetailDO::getMasterId, reqVO.getMasterId()) + .eqIfPresent(PackageoverDetailDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackageoverDetailDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(PackageoverDetailDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackageoverDetailDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackageoverDetailDO::getSiteId, reqVO.getSiteId()) + .likeIfPresent(PackageoverDetailDO::getItemName, reqVO.getItemName()) + .eqIfPresent(PackageoverDetailDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(PackageoverDetailDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(PackageoverDetailDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(PackageoverDetailDO::getToQty, reqVO.getToQty()) + .eqIfPresent(PackageoverDetailDO::getFromQty, reqVO.getFromQty()) + .eqIfPresent(PackageoverDetailDO::getUom, reqVO.getUom()) + .eqIfPresent(PackageoverDetailDO::getInterfaceType, reqVO.getInterfaceType()) + .orderByDesc(PackageoverDetailDO::getId)); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverMainMapper.java new file mode 100644 index 00000000..0952cd87 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageovermain/PackageoverMainMapper.java @@ -0,0 +1,71 @@ +package com.win.module.wms.dal.mysql.packageovermain; + +import java.util.*; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; +import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO; +import org.apache.ibatis.annotations.Mapper; +import com.win.module.wms.controller.packageovermain.vo.*; + +/** + * 翻包记录主 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface PackageoverMainMapper extends BaseMapperX { + + default PageResult selectPage(PackageoverMainPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(PackageoverMainDO::getWarehouseCode, reqVO.getWarehouseCode()) + .eqIfPresent(PackageoverMainDO::getDetails, reqVO.getDetails()) + .eqIfPresent(PackageoverMainDO::getOutTransactionType, reqVO.getOutTransactionType()) + .eqIfPresent(PackageoverMainDO::getInTransactionType, reqVO.getInTransactionType()) + .betweenIfPresent(PackageoverMainDO::getExecuteTime, reqVO.getExecuteTime()) + .betweenIfPresent(PackageoverMainDO::getActiveDate, reqVO.getActiveDate()) + .eqIfPresent(PackageoverMainDO::getAvailable, reqVO.getAvailable()) + .betweenIfPresent(PackageoverMainDO::getRequestTime, reqVO.getRequestTime()) + .betweenIfPresent(PackageoverMainDO::getDueTime, reqVO.getDueTime()) + .eqIfPresent(PackageoverMainDO::getDepartmentCode, reqVO.getDepartmentCode()) + .eqIfPresent(PackageoverMainDO::getUserGroupCode, reqVO.getUserGroupCode()) + .eqIfPresent(PackageoverMainDO::getInterfaceType, reqVO.getInterfaceType()) + .eqIfPresent(PackageoverMainDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackageoverMainDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(PackageoverMainDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackageoverMainDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackageoverMainDO::getExtraProperties, reqVO.getExtraProperties()) + .eqIfPresent(PackageoverMainDO::getSiteId, reqVO.getSiteId()) + .orderByDesc(PackageoverMainDO::getId)); + } + + default List selectList(PackageoverMainExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(PackageoverMainDO::getWarehouseCode, reqVO.getWarehouseCode()) + .eqIfPresent(PackageoverMainDO::getDetails, reqVO.getDetails()) + .eqIfPresent(PackageoverMainDO::getOutTransactionType, reqVO.getOutTransactionType()) + .eqIfPresent(PackageoverMainDO::getInTransactionType, reqVO.getInTransactionType()) + .betweenIfPresent(PackageoverMainDO::getExecuteTime, reqVO.getExecuteTime()) + .betweenIfPresent(PackageoverMainDO::getActiveDate, reqVO.getActiveDate()) + .eqIfPresent(PackageoverMainDO::getAvailable, reqVO.getAvailable()) + .betweenIfPresent(PackageoverMainDO::getRequestTime, reqVO.getRequestTime()) + .betweenIfPresent(PackageoverMainDO::getDueTime, reqVO.getDueTime()) + .eqIfPresent(PackageoverMainDO::getDepartmentCode, reqVO.getDepartmentCode()) + .eqIfPresent(PackageoverMainDO::getUserGroupCode, reqVO.getUserGroupCode()) + .eqIfPresent(PackageoverMainDO::getInterfaceType, reqVO.getInterfaceType()) + .eqIfPresent(PackageoverMainDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackageoverMainDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(PackageoverMainDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackageoverMainDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackageoverMainDO::getExtraProperties, reqVO.getExtraProperties()) + .eqIfPresent(PackageoverMainDO::getSiteId, reqVO.getSiteId()) + .orderByDesc(PackageoverMainDO::getId)); + } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitDetailMapper.java new file mode 100644 index 00000000..ef9d72ba --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitDetailMapper.java @@ -0,0 +1,84 @@ +package com.win.module.wms.dal.mysql.packagesplitmain; + +import java.util.*; + +import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitDetailDO; +import org.apache.ibatis.annotations.Mapper; +import com.win.module.wms.controller.packagesplitmain.vo.*; + +/** + * 拆包记录子 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface PackagesplitDetailMapper extends BaseMapperX { + + default PageResult selectPage(PackagesplitDetailPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(PackagesplitDetailDO::getLocationCode, reqVO.getLocationCode()) + .eqIfPresent(PackagesplitDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode()) + .eqIfPresent(PackagesplitDetailDO::getAreaCode, reqVO.getAreaCode()) + .eqIfPresent(PackagesplitDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) + .eqIfPresent(PackagesplitDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) + .eqIfPresent(PackagesplitDetailDO::getFromBatch, reqVO.getFromBatch()) + .eqIfPresent(PackagesplitDetailDO::getToBatch, reqVO.getToBatch()) + .eqIfPresent(PackagesplitDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus()) + .eqIfPresent(PackagesplitDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus()) + .eqIfPresent(PackagesplitDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber()) + .eqIfPresent(PackagesplitDetailDO::getToContainerNumber, reqVO.getToContainerNumber()) + .eqIfPresent(PackagesplitDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) + .eqIfPresent(PackagesplitDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) + .eqIfPresent(PackagesplitDetailDO::getMasterId, reqVO.getMasterId()) + .eqIfPresent(PackagesplitDetailDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackagesplitDetailDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(PackagesplitDetailDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackagesplitDetailDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackagesplitDetailDO::getSiteId, reqVO.getSiteId()) + .likeIfPresent(PackagesplitDetailDO::getItemName, reqVO.getItemName()) + .eqIfPresent(PackagesplitDetailDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(PackagesplitDetailDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(PackagesplitDetailDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(PackagesplitDetailDO::getToQty, reqVO.getToQty()) + .eqIfPresent(PackagesplitDetailDO::getFromQty, reqVO.getFromQty()) + .eqIfPresent(PackagesplitDetailDO::getUom, reqVO.getUom()) + .eqIfPresent(PackagesplitDetailDO::getInterfaceType, reqVO.getInterfaceType()) + .orderByDesc(PackagesplitDetailDO::getId)); + } + + default List selectList(PackagesplitDetailExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(PackagesplitDetailDO::getLocationCode, reqVO.getLocationCode()) + .eqIfPresent(PackagesplitDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode()) + .eqIfPresent(PackagesplitDetailDO::getAreaCode, reqVO.getAreaCode()) + .eqIfPresent(PackagesplitDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) + .eqIfPresent(PackagesplitDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) + .eqIfPresent(PackagesplitDetailDO::getFromBatch, reqVO.getFromBatch()) + .eqIfPresent(PackagesplitDetailDO::getToBatch, reqVO.getToBatch()) + .eqIfPresent(PackagesplitDetailDO::getFromInventoryStatus, reqVO.getFromInventoryStatus()) + .eqIfPresent(PackagesplitDetailDO::getToInventoryStatus, reqVO.getToInventoryStatus()) + .eqIfPresent(PackagesplitDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber()) + .eqIfPresent(PackagesplitDetailDO::getToContainerNumber, reqVO.getToContainerNumber()) + .eqIfPresent(PackagesplitDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) + .eqIfPresent(PackagesplitDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) + .eqIfPresent(PackagesplitDetailDO::getMasterId, reqVO.getMasterId()) + .eqIfPresent(PackagesplitDetailDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackagesplitDetailDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(PackagesplitDetailDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackagesplitDetailDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackagesplitDetailDO::getSiteId, reqVO.getSiteId()) + .likeIfPresent(PackagesplitDetailDO::getItemName, reqVO.getItemName()) + .eqIfPresent(PackagesplitDetailDO::getItemDesc1, reqVO.getItemDesc1()) + .eqIfPresent(PackagesplitDetailDO::getItemDesc2, reqVO.getItemDesc2()) + .eqIfPresent(PackagesplitDetailDO::getProjectCode, reqVO.getProjectCode()) + .eqIfPresent(PackagesplitDetailDO::getToQty, reqVO.getToQty()) + .eqIfPresent(PackagesplitDetailDO::getFromQty, reqVO.getFromQty()) + .eqIfPresent(PackagesplitDetailDO::getUom, reqVO.getUom()) + .eqIfPresent(PackagesplitDetailDO::getInterfaceType, reqVO.getInterfaceType()) + .orderByDesc(PackagesplitDetailDO::getId)); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitMainMapper.java new file mode 100644 index 00000000..9ca2b38f --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packagesplitmain/PackagesplitMainMapper.java @@ -0,0 +1,71 @@ +package com.win.module.wms.dal.mysql.packagesplitmain; + +import java.util.*; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; +import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; +import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitMainDO; +import org.apache.ibatis.annotations.Mapper; +import com.win.module.wms.controller.packagesplitmain.vo.*; + +/** + * 拆包记录主 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface PackagesplitMainMapper extends BaseMapperX { + + default PageResult selectPage(PackagesplitMainPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(PackagesplitMainDO::getWarehouseCode, reqVO.getWarehouseCode()) + .eqIfPresent(PackagesplitMainDO::getDetails, reqVO.getDetails()) + .eqIfPresent(PackagesplitMainDO::getOutTransactionType, reqVO.getOutTransactionType()) + .eqIfPresent(PackagesplitMainDO::getInTransactionType, reqVO.getInTransactionType()) + .betweenIfPresent(PackagesplitMainDO::getExecuteTime, reqVO.getExecuteTime()) + .betweenIfPresent(PackagesplitMainDO::getActiveDate, reqVO.getActiveDate()) + .eqIfPresent(PackagesplitMainDO::getAvailable, reqVO.getAvailable()) + .betweenIfPresent(PackagesplitMainDO::getRequestTime, reqVO.getRequestTime()) + .betweenIfPresent(PackagesplitMainDO::getDueTime, reqVO.getDueTime()) + .eqIfPresent(PackagesplitMainDO::getDepartmentCode, reqVO.getDepartmentCode()) + .eqIfPresent(PackagesplitMainDO::getUserGroupCode, reqVO.getUserGroupCode()) + .eqIfPresent(PackagesplitMainDO::getInterfaceType, reqVO.getInterfaceType()) + .eqIfPresent(PackagesplitMainDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackagesplitMainDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(PackagesplitMainDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackagesplitMainDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackagesplitMainDO::getExtraProperties, reqVO.getExtraProperties()) + .eqIfPresent(PackagesplitMainDO::getSiteId, reqVO.getSiteId()) + .orderByDesc(PackagesplitMainDO::getId)); + } + + default List selectList(PackagesplitMainExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(PackagesplitMainDO::getWarehouseCode, reqVO.getWarehouseCode()) + .eqIfPresent(PackagesplitMainDO::getDetails, reqVO.getDetails()) + .eqIfPresent(PackagesplitMainDO::getOutTransactionType, reqVO.getOutTransactionType()) + .eqIfPresent(PackagesplitMainDO::getInTransactionType, reqVO.getInTransactionType()) + .betweenIfPresent(PackagesplitMainDO::getExecuteTime, reqVO.getExecuteTime()) + .betweenIfPresent(PackagesplitMainDO::getActiveDate, reqVO.getActiveDate()) + .eqIfPresent(PackagesplitMainDO::getAvailable, reqVO.getAvailable()) + .betweenIfPresent(PackagesplitMainDO::getRequestTime, reqVO.getRequestTime()) + .betweenIfPresent(PackagesplitMainDO::getDueTime, reqVO.getDueTime()) + .eqIfPresent(PackagesplitMainDO::getDepartmentCode, reqVO.getDepartmentCode()) + .eqIfPresent(PackagesplitMainDO::getUserGroupCode, reqVO.getUserGroupCode()) + .eqIfPresent(PackagesplitMainDO::getInterfaceType, reqVO.getInterfaceType()) + .eqIfPresent(PackagesplitMainDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PackagesplitMainDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(PackagesplitMainDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PackagesplitMainDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackagesplitMainDO::getExtraProperties, reqVO.getExtraProperties()) + .eqIfPresent(PackagesplitMainDO::getSiteId, reqVO.getSiteId()) + .orderByDesc(PackagesplitMainDO::getId)); + } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailService.java new file mode 100644 index 00000000..df5c049c --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailService.java @@ -0,0 +1,71 @@ +package com.win.module.wms.service.packagemergemain; + +import java.util.*; +import javax.validation.*; + +import com.win.module.wms.controller.packagemergemain.vo.*; +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeDetailDO; +import com.win.framework.common.pojo.PageResult; + +/** + * 合包记录子 Service 接口 + * + * @author 超级管理员 + */ +public interface PackagemergeDetailService { + + /** + * 创建合包记录子 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createPackagemergeDetail(@Valid PackagemergeDetailCreateReqVO createReqVO); + + /** + * 更新合包记录子 + * + * @param updateReqVO 更新信息 + */ + Integer updatePackagemergeDetail(@Valid PackagemergeDetailUpdateReqVO updateReqVO); + + /** + * 删除合包记录子 + * + * @param id 编号 + */ + Integer deletePackagemergeDetail(Long id); + + /** + * 获得合包记录子 + * + * @param id 编号 + * @return 合包记录子 + */ + PackagemergeDetailDO getPackagemergeDetail(Long id); + + /** + * 获得合包记录子列表 + * + * @param ids 编号 + * @return 合包记录子列表 + */ + List getPackagemergeDetailList(Collection ids); + + /** + * 获得合包记录子分页 + * + * @param pageReqVO 分页查询 + * @return 合包记录子分页 + */ + PageResult getPackagemergeDetailPage(PackagemergeDetailPageReqVO pageReqVO); + + /** + * 获得合包记录子列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 合包记录子列表 + */ + List getPackagemergeDetailList(PackagemergeDetailExportReqVO exportReqVO); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailServiceImpl.java new file mode 100644 index 00000000..c2b982ed --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeDetailServiceImpl.java @@ -0,0 +1,82 @@ +package com.win.module.wms.service.packagemergemain; + +import com.win.module.wms.controller.packagemergemain.vo.*; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; + +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeDetailDO; +import com.win.framework.common.pojo.PageResult; + +import com.win.module.wms.convert.packagemergemain.PackagemergeDetailConvert; +import com.win.module.wms.dal.mysql.packagemergemain.PackagemergeDetailMapper; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.PACKAGEMERGE_DETAIL_NOT_EXISTS; + +/** + * 合包记录子 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class PackagemergeDetailServiceImpl implements PackagemergeDetailService { + + @Resource + private PackagemergeDetailMapper packagemergeDetailMapper; + + @Override + public Long createPackagemergeDetail(PackagemergeDetailCreateReqVO createReqVO) { + // 插入 + PackagemergeDetailDO packagemergeDetail = PackagemergeDetailConvert.INSTANCE.convert(createReqVO); + packagemergeDetailMapper.insert(packagemergeDetail); + // 返回 + return packagemergeDetail.getId(); + } + + @Override + public Integer updatePackagemergeDetail(PackagemergeDetailUpdateReqVO updateReqVO) { + // 校验存在 + validatePackagemergeDetailExists(updateReqVO.getId()); + // 更新 + PackagemergeDetailDO updateObj = PackagemergeDetailConvert.INSTANCE.convert(updateReqVO); + return packagemergeDetailMapper.updateById(updateObj); + } + + @Override + public Integer deletePackagemergeDetail(Long id) { + // 校验存在 + validatePackagemergeDetailExists(id); + // 删除 + return packagemergeDetailMapper.deleteById(id); + } + + private void validatePackagemergeDetailExists(Long id) { + if (packagemergeDetailMapper.selectById(id) == null) { + throw exception(PACKAGEMERGE_DETAIL_NOT_EXISTS); + } + } + + @Override + public PackagemergeDetailDO getPackagemergeDetail(Long id) { + return packagemergeDetailMapper.selectById(id); + } + + @Override + public List getPackagemergeDetailList(Collection ids) { + return packagemergeDetailMapper.selectBatchIds(ids); + } + + @Override + public PageResult getPackagemergeDetailPage(PackagemergeDetailPageReqVO pageReqVO) { + return packagemergeDetailMapper.selectPage(pageReqVO); + } + + @Override + public List getPackagemergeDetailList(PackagemergeDetailExportReqVO exportReqVO) { + return packagemergeDetailMapper.selectList(exportReqVO); + } +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainService.java new file mode 100644 index 00000000..b484f0b3 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainService.java @@ -0,0 +1,73 @@ +package com.win.module.wms.service.packagemergemain; + +import java.util.*; +import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.controller.packagemergemain.vo.*; +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO; +import com.win.framework.common.pojo.PageResult; + +/** + * 合包记录主 Service 接口 + * + * @author 超级管理员 + */ +public interface PackagemergeMainService { + + /** + * 创建合包记录主 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createPackagemergeMain(@Valid PackagemergeMainCreateReqVO createReqVO); + + /** + * 更新合包记录主 + * + * @param updateReqVO 更新信息 + */ + Integer updatePackagemergeMain(@Valid PackagemergeMainUpdateReqVO updateReqVO); + + /** + * 删除合包记录主 + * + * @param id 编号 + */ + Integer deletePackagemergeMain(Long id); + + /** + * 获得合包记录主 + * + * @param id 编号 + * @return 合包记录主 + */ + PackagemergeMainDO getPackagemergeMain(Long id); + + /** + * 获得合包记录主列表 + * + * @param ids 编号 + * @return 合包记录主列表 + */ + List getPackagemergeMainList(Collection ids); + + /** + * 获得合包记录主分页 + * + * @param pageReqVO 分页查询 + * @return 合包记录主分页 + */ + PageResult getPackagemergeMainPage(PackagemergeMainPageReqVO pageReqVO); + + /** + * 获得合包记录主列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 合包记录主列表 + */ + List getPackagemergeMainList(PackagemergeMainExportReqVO exportReqVO); + + PageResult getPackagemergeMainSenior(CustomConditions conditions); +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainServiceImpl.java new file mode 100644 index 00000000..36e8f2dc --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagemergemain/PackagemergeMainServiceImpl.java @@ -0,0 +1,87 @@ +package com.win.module.wms.service.packagemergemain; + +import com.win.framework.common.pojo.CustomConditions; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.win.module.wms.controller.packagemergemain.vo.*; +import com.win.module.wms.dal.dataobject.packagemergemain.PackagemergeMainDO; +import com.win.framework.common.pojo.PageResult; + +import com.win.module.wms.convert.packagemergemain.PackagemergeMainConvert; +import com.win.module.wms.dal.mysql.packagemergemain.PackagemergeMainMapper; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.*; + +/** + * 合包记录主 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class PackagemergeMainServiceImpl implements PackagemergeMainService { + + @Resource + private PackagemergeMainMapper packagemergeMainMapper; + + @Override + public Long createPackagemergeMain(PackagemergeMainCreateReqVO createReqVO) { + // 插入 + PackagemergeMainDO packagemergeMain = PackagemergeMainConvert.INSTANCE.convert(createReqVO); + packagemergeMainMapper.insert(packagemergeMain); + // 返回 + return packagemergeMain.getId(); + } + + @Override + public Integer updatePackagemergeMain(PackagemergeMainUpdateReqVO updateReqVO) { + // 校验存在 + validatePackagemergeMainExists(updateReqVO.getId()); + // 更新 + PackagemergeMainDO updateObj = PackagemergeMainConvert.INSTANCE.convert(updateReqVO); + return packagemergeMainMapper.updateById(updateObj); + } + + @Override + public Integer deletePackagemergeMain(Long id) { + // 校验存在 + validatePackagemergeMainExists(id); + // 删除 + return packagemergeMainMapper.deleteById(id); + } + + private void validatePackagemergeMainExists(Long id) { + if (packagemergeMainMapper.selectById(id) == null) { + throw exception(PACKAGEMERGE_MAIN_NOT_EXISTS); + } + } + + @Override + public PackagemergeMainDO getPackagemergeMain(Long id) { + return packagemergeMainMapper.selectById(id); + } + + @Override + public List getPackagemergeMainList(Collection ids) { + return packagemergeMainMapper.selectBatchIds(ids); + } + + @Override + public PageResult getPackagemergeMainPage(PackagemergeMainPageReqVO pageReqVO) { + return packagemergeMainMapper.selectPage(pageReqVO); + } + + @Override + public List getPackagemergeMainList(PackagemergeMainExportReqVO exportReqVO) { + return packagemergeMainMapper.selectList(exportReqVO); + } + + @Override + public PageResult getPackagemergeMainSenior(CustomConditions conditions) { + return packagemergeMainMapper.selectSenior(conditions); + } +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailService.java new file mode 100644 index 00000000..9d937b35 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailService.java @@ -0,0 +1,71 @@ +package com.win.module.wms.service.packageovermain; + +import java.util.*; +import javax.validation.*; + +import com.win.module.wms.controller.packageovermain.vo.*; +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverDetailDO; +import com.win.framework.common.pojo.PageResult; + +/** + * 翻包记录子 Service 接口 + * + * @author 超级管理员 + */ +public interface PackageoverDetailService { + + /** + * 创建翻包记录子 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createPackageoverDetail(@Valid PackageoverDetailCreateReqVO createReqVO); + + /** + * 更新翻包记录子 + * + * @param updateReqVO 更新信息 + */ + Integer updatePackageoverDetail(@Valid PackageoverDetailUpdateReqVO updateReqVO); + + /** + * 删除翻包记录子 + * + * @param id 编号 + */ + Integer deletePackageoverDetail(Long id); + + /** + * 获得翻包记录子 + * + * @param id 编号 + * @return 翻包记录子 + */ + PackageoverDetailDO getPackageoverDetail(Long id); + + /** + * 获得翻包记录子列表 + * + * @param ids 编号 + * @return 翻包记录子列表 + */ + List getPackageoverDetailList(Collection ids); + + /** + * 获得翻包记录子分页 + * + * @param pageReqVO 分页查询 + * @return 翻包记录子分页 + */ + PageResult getPackageoverDetailPage(PackageoverDetailPageReqVO pageReqVO); + + /** + * 获得翻包记录子列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 翻包记录子列表 + */ + List getPackageoverDetailList(PackageoverDetailExportReqVO exportReqVO); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailServiceImpl.java new file mode 100644 index 00000000..cda89592 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverDetailServiceImpl.java @@ -0,0 +1,83 @@ +package com.win.module.wms.service.packageovermain; + +import com.win.module.wms.controller.packageovermain.vo.*; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; + +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverDetailDO; +import com.win.framework.common.pojo.PageResult; + +import com.win.module.wms.convert.packageovermain.PackageoverDetailConvert; +import com.win.module.wms.dal.mysql.packageovermain.PackageoverDetailMapper; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.PACKAGEOVER_DETAIL_NOT_EXISTS; + +/** + * 翻包记录子 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class PackageoverDetailServiceImpl implements PackageoverDetailService { + + @Resource + private PackageoverDetailMapper packageoverDetailMapper; + + @Override + public Long createPackageoverDetail(PackageoverDetailCreateReqVO createReqVO) { + // 插入 + PackageoverDetailDO packageoverDetail = PackageoverDetailConvert.INSTANCE.convert(createReqVO); + packageoverDetailMapper.insert(packageoverDetail); + // 返回 + return packageoverDetail.getId(); + } + + @Override + public Integer updatePackageoverDetail(PackageoverDetailUpdateReqVO updateReqVO) { + // 校验存在 + validatePackageoverDetailExists(updateReqVO.getId()); + // 更新 + PackageoverDetailDO updateObj = PackageoverDetailConvert.INSTANCE.convert(updateReqVO); + return packageoverDetailMapper.updateById(updateObj); + } + + @Override + public Integer deletePackageoverDetail(Long id) { + // 校验存在 + validatePackageoverDetailExists(id); + // 删除 + return packageoverDetailMapper.deleteById(id); + } + + private void validatePackageoverDetailExists(Long id) { + if (packageoverDetailMapper.selectById(id) == null) { + throw exception(PACKAGEOVER_DETAIL_NOT_EXISTS); + } + } + + @Override + public PackageoverDetailDO getPackageoverDetail(Long id) { + return packageoverDetailMapper.selectById(id); + } + + @Override + public List getPackageoverDetailList(Collection ids) { + return packageoverDetailMapper.selectBatchIds(ids); + } + + @Override + public PageResult getPackageoverDetailPage(PackageoverDetailPageReqVO pageReqVO) { + return packageoverDetailMapper.selectPage(pageReqVO); + } + + @Override + public List getPackageoverDetailList(PackageoverDetailExportReqVO exportReqVO) { + return packageoverDetailMapper.selectList(exportReqVO); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainService.java new file mode 100644 index 00000000..3219f3fb --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainService.java @@ -0,0 +1,73 @@ +package com.win.module.wms.service.packageovermain; + +import java.util.*; +import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.controller.packageovermain.vo.*; +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO; +import com.win.framework.common.pojo.PageResult; + +/** + * 翻包记录主 Service 接口 + * + * @author 超级管理员 + */ +public interface PackageoverMainService { + + /** + * 创建翻包记录主 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createPackageoverMain(@Valid PackageoverMainCreateReqVO createReqVO); + + /** + * 更新翻包记录主 + * + * @param updateReqVO 更新信息 + */ + Integer updatePackageoverMain(@Valid PackageoverMainUpdateReqVO updateReqVO); + + /** + * 删除翻包记录主 + * + * @param id 编号 + */ + Integer deletePackageoverMain(Long id); + + /** + * 获得翻包记录主 + * + * @param id 编号 + * @return 翻包记录主 + */ + PackageoverMainDO getPackageoverMain(Long id); + + /** + * 获得翻包记录主列表 + * + * @param ids 编号 + * @return 翻包记录主列表 + */ + List getPackageoverMainList(Collection ids); + + /** + * 获得翻包记录主分页 + * + * @param pageReqVO 分页查询 + * @return 翻包记录主分页 + */ + PageResult getPackageoverMainPage(PackageoverMainPageReqVO pageReqVO); + + /** + * 获得翻包记录主列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 翻包记录主列表 + */ + List getPackageoverMainList(PackageoverMainExportReqVO exportReqVO); + + PageResult getPackageoverMainSenior(CustomConditions conditions); +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainServiceImpl.java new file mode 100644 index 00000000..26e13201 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageovermain/PackageoverMainServiceImpl.java @@ -0,0 +1,88 @@ +package com.win.module.wms.service.packageovermain; + +import com.win.framework.common.pojo.CustomConditions; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.win.module.wms.controller.packageovermain.vo.*; +import com.win.module.wms.dal.dataobject.packageovermain.PackageoverMainDO; +import com.win.framework.common.pojo.PageResult; + +import com.win.module.wms.convert.packageovermain.PackageoverMainConvert; +import com.win.module.wms.dal.mysql.packageovermain.PackageoverMainMapper; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.*; + +/** + * 翻包记录主 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class PackageoverMainServiceImpl implements PackageoverMainService { + + @Resource + private PackageoverMainMapper packageoverMainMapper; + + @Override + public Long createPackageoverMain(PackageoverMainCreateReqVO createReqVO) { + // 插入 + PackageoverMainDO packageoverMain = PackageoverMainConvert.INSTANCE.convert(createReqVO); + packageoverMainMapper.insert(packageoverMain); + // 返回 + return packageoverMain.getId(); + } + + @Override + public Integer updatePackageoverMain(PackageoverMainUpdateReqVO updateReqVO) { + // 校验存在 + validatePackageoverMainExists(updateReqVO.getId()); + // 更新 + PackageoverMainDO updateObj = PackageoverMainConvert.INSTANCE.convert(updateReqVO); + return packageoverMainMapper.updateById(updateObj); + } + + @Override + public Integer deletePackageoverMain(Long id) { + // 校验存在 + validatePackageoverMainExists(id); + // 删除 + return packageoverMainMapper.deleteById(id); + } + + private void validatePackageoverMainExists(Long id) { + if (packageoverMainMapper.selectById(id) == null) { + throw exception(PACKAGEOVER_MAIN_NOT_EXISTS); + } + } + + @Override + public PackageoverMainDO getPackageoverMain(Long id) { + return packageoverMainMapper.selectById(id); + } + + @Override + public List getPackageoverMainList(Collection ids) { + return packageoverMainMapper.selectBatchIds(ids); + } + + @Override + public PageResult getPackageoverMainPage(PackageoverMainPageReqVO pageReqVO) { + return packageoverMainMapper.selectPage(pageReqVO); + } + + @Override + public List getPackageoverMainList(PackageoverMainExportReqVO exportReqVO) { + return packageoverMainMapper.selectList(exportReqVO); + } + + @Override + public PageResult getPackageoverMainSenior(CustomConditions conditions) { + return packageoverMainMapper.selectSenior(conditions); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitDetailService.java new file mode 100644 index 00000000..a26e4d4c --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitDetailService.java @@ -0,0 +1,70 @@ +package com.win.module.wms.service.packagesplitmain; + +import java.util.*; +import javax.validation.*; +import com.win.module.wms.controller.packagesplitmain.vo.*; +import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitDetailDO; +import com.win.framework.common.pojo.PageResult; + +/** + * 拆包记录子 Service 接口 + * + * @author 超级管理员 + */ +public interface PackagesplitDetailService { + + /** + * 创建拆包记录子 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createPackagesplitDetail(@Valid PackagesplitDetailCreateReqVO createReqVO); + + /** + * 更新拆包记录子 + * + * @param updateReqVO 更新信息 + */ + Integer updatePackagesplitDetail(@Valid PackagesplitDetailUpdateReqVO updateReqVO); + + /** + * 删除拆包记录子 + * + * @param id 编号 + */ + Integer deletePackagesplitDetail(Long id); + + /** + * 获得拆包记录子 + * + * @param id 编号 + * @return 拆包记录子 + */ + PackagesplitDetailDO getPackagesplitDetail(Long id); + + /** + * 获得拆包记录子列表 + * + * @param ids 编号 + * @return 拆包记录子列表 + */ + List getPackagesplitDetailList(Collection ids); + + /** + * 获得拆包记录子分页 + * + * @param pageReqVO 分页查询 + * @return 拆包记录子分页 + */ + PageResult getPackagesplitDetailPage(PackagesplitDetailPageReqVO pageReqVO); + + /** + * 获得拆包记录子列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 拆包记录子列表 + */ + List getPackagesplitDetailList(PackagesplitDetailExportReqVO exportReqVO); + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitDetailServiceImpl.java new file mode 100644 index 00000000..9bd8c5f1 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitDetailServiceImpl.java @@ -0,0 +1,83 @@ +package com.win.module.wms.service.packagesplitmain; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.win.module.wms.controller.packagesplitmain.vo.*; +import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitDetailDO; +import com.win.framework.common.pojo.PageResult; + +import com.win.module.wms.convert.packagesplitmain.PackagesplitDetailConvert; +import com.win.module.wms.dal.mysql.packagesplitmain.PackagesplitDetailMapper; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.PACKAGESPLIT_DETAIL_NOT_EXISTS; + +/** + * 拆包记录子 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class PackagesplitDetailServiceImpl implements PackagesplitDetailService { + + @Resource + private PackagesplitDetailMapper packagesplitDetailMapper; + + @Override + public Long createPackagesplitDetail(PackagesplitDetailCreateReqVO createReqVO) { + // 插入 + PackagesplitDetailDO packagesplitDetail = PackagesplitDetailConvert.INSTANCE.convert(createReqVO); + packagesplitDetailMapper.insert(packagesplitDetail); + // 返回 + return packagesplitDetail.getId(); + } + + @Override + public Integer updatePackagesplitDetail(PackagesplitDetailUpdateReqVO updateReqVO) { + // 校验存在 + validatePackagesplitDetailExists(updateReqVO.getId()); + // 更新 + PackagesplitDetailDO updateObj = PackagesplitDetailConvert.INSTANCE.convert(updateReqVO); + return packagesplitDetailMapper.updateById(updateObj); + } + + @Override + public Integer deletePackagesplitDetail(Long id) { + // 校验存在 + validatePackagesplitDetailExists(id); + // 删除 + return packagesplitDetailMapper.deleteById(id); + } + + private void validatePackagesplitDetailExists(Long id) { + if (packagesplitDetailMapper.selectById(id) == null) { + throw exception(PACKAGESPLIT_DETAIL_NOT_EXISTS); + } + } + + @Override + public PackagesplitDetailDO getPackagesplitDetail(Long id) { + return packagesplitDetailMapper.selectById(id); + } + + @Override + public List getPackagesplitDetailList(Collection ids) { + return packagesplitDetailMapper.selectBatchIds(ids); + } + + @Override + public PageResult getPackagesplitDetailPage(PackagesplitDetailPageReqVO pageReqVO) { + return packagesplitDetailMapper.selectPage(pageReqVO); + } + + @Override + public List getPackagesplitDetailList(PackagesplitDetailExportReqVO exportReqVO) { + return packagesplitDetailMapper.selectList(exportReqVO); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitMainService.java new file mode 100644 index 00000000..8a5076ad --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitMainService.java @@ -0,0 +1,73 @@ +package com.win.module.wms.service.packagesplitmain; + +import java.util.*; +import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.controller.packagesplitmain.vo.*; +import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitMainDO; +import com.win.framework.common.pojo.PageResult; + +/** + * 拆包记录主 Service 接口 + * + * @author 超级管理员 + */ +public interface PackagesplitMainService { + + /** + * 创建拆包记录主 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createPackagesplitMain(@Valid PackagesplitMainCreateReqVO createReqVO); + + /** + * 更新拆包记录主 + * + * @param updateReqVO 更新信息 + */ + Integer updatePackagesplitMain(@Valid PackagesplitMainUpdateReqVO updateReqVO); + + /** + * 删除拆包记录主 + * + * @param id 编号 + */ + Integer deletePackagesplitMain(Long id); + + /** + * 获得拆包记录主 + * + * @param id 编号 + * @return 拆包记录主 + */ + PackagesplitMainDO getPackagesplitMain(Long id); + + /** + * 获得拆包记录主列表 + * + * @param ids 编号 + * @return 拆包记录主列表 + */ + List getPackagesplitMainList(Collection ids); + + /** + * 获得拆包记录主分页 + * + * @param pageReqVO 分页查询 + * @return 拆包记录主分页 + */ + PageResult getPackagesplitMainPage(PackagesplitMainPageReqVO pageReqVO); + + /** + * 获得拆包记录主列表, 用于 Excel 导出 + * + * @param exportReqVO 查询条件 + * @return 拆包记录主列表 + */ + List getPackagesplitMainList(PackagesplitMainExportReqVO exportReqVO); + + PageResult getPackagesplitMainSenior(CustomConditions conditions); +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitMainServiceImpl.java new file mode 100644 index 00000000..f232304a --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packagesplitmain/PackagesplitMainServiceImpl.java @@ -0,0 +1,89 @@ +package com.win.module.wms.service.packagesplitmain; + +import cn.hutool.core.collection.CollUtil; +import com.win.framework.common.pojo.CustomConditions; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import com.win.module.wms.controller.packagesplitmain.vo.*; +import com.win.module.wms.dal.dataobject.packagesplitmain.PackagesplitMainDO; +import com.win.framework.common.pojo.PageResult; + +import com.win.module.wms.convert.packagesplitmain.PackagesplitMainConvert; +import com.win.module.wms.dal.mysql.packagesplitmain.PackagesplitMainMapper; + +import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.wms.enums.ErrorCodeConstants.*; + +/** + * 拆包记录主 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class PackagesplitMainServiceImpl implements PackagesplitMainService { + + @Resource + private PackagesplitMainMapper packagesplitMainMapper; + + @Override + public Long createPackagesplitMain(PackagesplitMainCreateReqVO createReqVO) { + // 插入 + PackagesplitMainDO packagesplitMain = PackagesplitMainConvert.INSTANCE.convert(createReqVO); + packagesplitMainMapper.insert(packagesplitMain); + // 返回 + return packagesplitMain.getId(); + } + + @Override + public Integer updatePackagesplitMain(PackagesplitMainUpdateReqVO updateReqVO) { + // 校验存在 + validatePackagesplitMainExists(updateReqVO.getId()); + // 更新 + PackagesplitMainDO updateObj = PackagesplitMainConvert.INSTANCE.convert(updateReqVO); + return packagesplitMainMapper.updateById(updateObj); + } + + @Override + public Integer deletePackagesplitMain(Long id) { + // 校验存在 + validatePackagesplitMainExists(id); + // 删除 + return packagesplitMainMapper.deleteById(id); + } + + private void validatePackagesplitMainExists(Long id) { + if (packagesplitMainMapper.selectById(id) == null) { + throw exception(PACKAGESPLIT_MAIN_NOT_EXISTS); + } + } + + @Override + public PackagesplitMainDO getPackagesplitMain(Long id) { + return packagesplitMainMapper.selectById(id); + } + + @Override + public List getPackagesplitMainList(Collection ids) { + return packagesplitMainMapper.selectBatchIds(ids); + } + + @Override + public PageResult getPackagesplitMainPage(PackagesplitMainPageReqVO pageReqVO) { + return packagesplitMainMapper.selectPage(pageReqVO); + } + + @Override + public List getPackagesplitMainList(PackagesplitMainExportReqVO exportReqVO) { + return packagesplitMainMapper.selectList(exportReqVO); + } + + @Override + public PageResult getPackagesplitMainSenior(CustomConditions conditions) { + return packagesplitMainMapper.selectSenior(conditions); + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagemergemain/PackagemergeDetailMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagemergemain/PackagemergeDetailMapper.xml new file mode 100644 index 00000000..76671c42 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagemergemain/PackagemergeDetailMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagemergemain/PackagemergeMainMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagemergemain/PackagemergeMainMapper.xml new file mode 100644 index 00000000..421c88ab --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagemergemain/PackagemergeMainMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packageovermain/PackageoverDetailMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packageovermain/PackageoverDetailMapper.xml new file mode 100644 index 00000000..f80d543f --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packageovermain/PackageoverDetailMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packageovermain/PackageoverMainMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packageovermain/PackageoverMainMapper.xml new file mode 100644 index 00000000..adde50f7 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packageovermain/PackageoverMainMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagesplitmain/PackagesplitDetailMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagesplitmain/PackagesplitDetailMapper.xml new file mode 100644 index 00000000..77397240 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagesplitmain/PackagesplitDetailMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagesplitmain/PackagesplitMainMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagesplitmain/PackagesplitMainMapper.xml new file mode 100644 index 00000000..8dc730d6 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/packagesplitmain/PackagesplitMainMapper.xml @@ -0,0 +1,12 @@ + + + + + + + From 7543f833706e5349ac75595227de323096e7863e Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 26 Dec 2023 09:04:50 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=95=B4=E4=BD=93=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomersettleRequestMainServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java index 3fd1a2bc..41414f1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java @@ -291,7 +291,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque //添加库存事务list TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVO); - TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId())); transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); From 26d76516d184a44777c78f01abae6d6d750d050b Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 26 Dec 2023 09:15:39 +0800 Subject: [PATCH 3/7] =?UTF-8?q?pda=E9=A6=96=E9=A1=B5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/index/IndexController.java | 63 +++++++++++++++++++ .../service/countJob/CountJobMainService.java | 5 ++ .../countJob/CountJobMainServiceImpl.java | 7 +++ .../CustomerreturnJobMainService.java | 16 +++-- .../CustomerreturnJobMainServiceImpl.java | 32 +++++----- .../deliverJob/DeliverJobMainService.java | 24 ++++--- .../deliverJob/DeliverJobMainServiceImpl.java | 28 ++++----- .../inspectJob/InspectJobMainService.java | 6 ++ .../inspectJob/InspectJobMainServiceImpl.java | 7 +++ .../InventorymoveJobMainService.java | 25 +++++--- .../InventorymoveJobMainServiceImpl.java | 28 ++++----- .../service/issueJob/IssueJobMainService.java | 6 ++ .../issueJob/IssueJobMainServiceImpl.java | 7 +++ .../service/pickJob/PickJobMainService.java | 6 ++ .../pickJob/PickJobMainServiceImpl.java | 10 ++- .../ProductdismantleJobMainService.java | 5 ++ .../ProductdismantleJobMainServiceImpl.java | 14 ++++- .../ProductionreceiptJobMainService.java | 6 ++ .../ProductionreceiptJobMainServiceImpl.java | 7 +++ .../ProductionreturnJobMainService.java | 6 ++ .../ProductionreturnJobMainServiceImpl.java | 7 +++ .../ProductputawayJobMainService.java | 6 ++ .../ProductputawayJobMainServiceImpl.java | 7 +++ .../ProductreceiptJobMainService.java | 6 ++ .../ProductreceiptJobMainServiceImpl.java | 7 +++ .../ProductscrapJobMainService.java | 6 ++ .../ProductscrapJobMainServiceImpl.java | 7 +++ .../PurchasereceiptJobMainService.java | 6 ++ .../PurchasereceiptJobMainServiceImpl.java | 7 +++ .../PurchasereturnJobMainService.java | 6 ++ .../PurchasereturnJobMainServiceImpl.java | 7 +++ .../putawayJob/PutawayJobMainService.java | 6 ++ .../putawayJob/PutawayJobMainServiceImpl.java | 7 +++ .../repleinshJob/RepleinshJobMainService.java | 6 ++ .../RepleinshJobMainServiceImpl.java | 7 +++ .../service/scrapJob/ScrapJobMainService.java | 16 +++-- .../scrapJob/ScrapJobMainServiceImpl.java | 8 +++ .../TransferissueJobMainService.java | 16 +++-- .../TransferissueJobMainServiceImpl.java | 8 +++ .../TransferreceiptJobMainService.java | 15 +++-- .../TransferreceiptJobMainServiceImpl.java | 9 ++- .../UnplannedissueJobMainService.java | 5 ++ .../UnplannedissueJobMainServiceImpl.java | 8 +++ .../UnplannedreceiptJobMainService.java | 15 +++-- .../UnplannedreceiptJobMainServiceImpl.java | 8 +++ 45 files changed, 428 insertions(+), 86 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java index 418d9699..b4abe7f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java @@ -2,12 +2,18 @@ package com.win.module.wms.controller.index; import com.win.framework.common.pojo.CommonResult; import com.win.module.wms.service.balance.BalanceService; +import com.win.module.wms.service.countJob.CountJobMainService; +import com.win.module.wms.service.customerreturnJob.CustomerreturnJobMainService; +import com.win.module.wms.service.deliverJob.DeliverJobMainService; import com.win.module.wms.service.deliverPlan.DeliverPlanMainService; import com.win.module.wms.service.inspectJob.InspectJobMainService; +import com.win.module.wms.service.inventorymoveJob.InventorymoveJobMainService; import com.win.module.wms.service.issueJob.IssueJobMainService; import com.win.module.wms.service.issueRequest.IssueRequestMainService; import com.win.module.wms.service.location.LocationService; +import com.win.module.wms.service.pickJob.PickJobMainService; import com.win.module.wms.service.preparetoissue.PreparetoissueMainService; +import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService; import com.win.module.wms.service.production.ProductionMainService; import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService; import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService; @@ -24,8 +30,13 @@ import com.win.module.wms.service.purchasereturnJob.PurchasereturnJobMainService import com.win.module.wms.service.purchasereturnRecord.PurchasereturnRecordDetailService; import com.win.module.wms.service.putawayJob.PutawayJobMainService; import com.win.module.wms.service.repleinshJob.RepleinshJobMainService; +import com.win.module.wms.service.scrapJob.ScrapJobMainService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; +import com.win.module.wms.service.transferissueJob.TransferissueJobMainService; +import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobMainService; +import com.win.module.wms.service.unplannedissueJob.UnplannedissueJobMainService; +import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.jetbrains.annotations.NotNull; @@ -96,6 +107,28 @@ public class IndexController { private ProductscrapJobMainService productscrapJobMainService; @Resource private RepleinshJobMainService repleinshJobMainService; + @Resource + private CountJobMainService countJobMainService; + @Resource + private CustomerreturnJobMainService customerreturnJobMainService; + @Resource + private DeliverJobMainService deliverJobMainService; + @Resource + private InventorymoveJobMainService inventorymoveJobMainService; + @Resource + private PickJobMainService pickJobMainService; + @Resource + private ProductdismantleJobMainService productdismantleJobMainService; + @Resource + private ScrapJobMainService scrapJobMainService; + @Resource + private TransferissueJobMainService transferissueJobMainService; + @Resource + private TransferreceiptJobMainService transferreceiptJobMainService; + @Resource + private UnplannedissueJobMainService unplannedissueJobMainService; + @Resource + private UnplannedreceiptJobMainService unplannedreceiptJobMainService; @GetMapping("/indexSupplier") @Operation(summary = "供应商首页") @@ -187,4 +220,34 @@ public class IndexController { return success(dataMap); } + @GetMapping("/indexPda") + @Operation(summary = "PDA首页任务数量") + public CommonResult> indexPda() { + Map dataMap = new HashMap<>(); + dataMap.put("count", countJobMainService.getCountJobCountPda());//盘点任务数 + dataMap.put("customerreturn", customerreturnJobMainService.getCustomerreturnJobCountPda());//客户退货任务数 + dataMap.put("deliver", deliverJobMainService.getDeliverJobCountPda());//发货退货任务数 + dataMap.put("inspect", inspectJobMainService.getInspectJobCountPda());//检验任务数 + dataMap.put("inventorymove", inventorymoveJobMainService.getInventorymoveJobCountPda());//库存转移任务数 + dataMap.put("issue", issueJobMainService.getIssueJobCountPda());//发料任务数 + dataMap.put("pick", pickJobMainService.getPickJobCountPda());//拣料任务数 + dataMap.put("productdismantle", productdismantleJobMainService.getProductdismantleJobCountPda());//制品拆解任务数 + dataMap.put("productionreceipt", productionreceiptJobMainService.getProductionreceiptJobCountPda());//生产收料任务数 + dataMap.put("productionreturn", productionreturnJobMainService.getProductionreturnJobCountPda());//生产退料任务数 + dataMap.put("productputawayJ", productputawayJobMainService.getProductputawayJobCountPda());//制品上架退料任务数 + dataMap.put("productreceipt", productreceiptJobMainService.getProductreceiptJobCountPda());//制品收货退料任务数 + dataMap.put("productscrap", productscrapJobMainService.getProductscrapJobCountPda());//制品报废任务数 + dataMap.put("purchasereceipt", purchasereceiptJobMainService.getPurchasereceiptJobCountPda());//采购收货任务数 + dataMap.put("purchasereturn", purchasereturnJobMainService.getPurchasereturnJobCountPda());//采购退货任务数 + dataMap.put("putaway", putawayJobMainService.getPutawayJobCountPda());//上架任务数 + dataMap.put("repleinsh", repleinshJobMainService.getRepleinshJobCountPda());//补料任务数 + dataMap.put("scrap", scrapJobMainService.getScrapJobCountPda());//报废出库任务数 + dataMap.put("transferissue", transferissueJobMainService.getTransferissueJobCountPda());//调拨出库任务数 + dataMap.put("transferreceipt", transferreceiptJobMainService.getTransferreceiptJobCountPda());//调拨入库任务数 + dataMap.put("unplannedissue", unplannedissueJobMainService.getUnplannedissueJobCountPda());//计划外出库任务数 + dataMap.put("unplannedreceipt", unplannedreceiptJobMainService.getUnplannedreceiptJobCountPda());//计划外入库任务数 + return success(dataMap); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java index de6bf144..86d10847 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java @@ -104,4 +104,9 @@ public interface CountJobMainService { */ String executeCountJobMain(CountJobMainUpdateReqVO countJobMainUpdateReqVO); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getCountJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index e990ede2..720baf2b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -265,6 +265,13 @@ public class CountJobMainServiceImpl implements CountJobMainService { return number; } + @Override + public Long getCountJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return countJobMainMapper.selectCount(queryWrapper); + } + private CountJobMainDO validateCountJobMainExists(Long id) { CountJobMainDO countJobMainDO = countJobMainMapper.selectById(id); if (countJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java index ae377d7e..0cc5cf64 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java @@ -1,19 +1,21 @@ package com.win.module.wms.service.customerreturnJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainCreateReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; -import com.win.framework.common.pojo.PageResult; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 客户退货任务主 Service 接口 * @@ -142,4 +144,10 @@ public interface CustomerreturnJobMainService { * @return */ String executeCustomerreturnJobMain(CustomerreturnJobMainUpdateReqVO customerreturnJobMainUpdateReqVO); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getCustomerreturnJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index 5cb03f24..4194f69c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -3,28 +3,27 @@ package com.win.module.wms.service.customerreturnJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.system.enums.serialNumber.RuleCodeEnum; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainCreateReqVO; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO; -import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobDetailUpdateReqVO; +import com.win.module.wms.controller.customerreturnJob.vo.*; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; +import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; -import com.win.module.wms.dal.dataobject.location.LocationDO; -import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordDetailDO; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordMainDO; import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO; +import com.win.module.wms.dal.dataobject.location.LocationDO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; +import com.win.module.wms.dal.mysql.customerreturnJob.CustomerreturnJobMainMapper; import com.win.module.wms.dal.mysql.customerreturnRecord.CustomerreturnRecordDetailMapper; import com.win.module.wms.dal.mysql.customerreturnRecord.CustomerreturnRecordMainMapper; import com.win.module.wms.dal.mysql.customerreturnRequest.CustomerreturnRequestMainMapper; @@ -39,23 +38,18 @@ import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; - import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert; -import com.win.module.wms.dal.mysql.customerreturnJob.CustomerreturnJobMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.CUSTOMERRETURN_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR; /** * 客户退货任务主 Service 实现类 @@ -350,4 +344,12 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe trendsApi.createTrends(customerreturnJobMainDO.getId(), "CustomerRejectJob", "执行了客户退货任务", TrendsTypeEnum.UPDATE); return number; } + + @Override + public Long getCustomerreturnJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return customerreturnJobMainMapper.selectCount(queryWrapper); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java index 68191f83..bb47f879 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java @@ -1,19 +1,21 @@ package com.win.module.wms.service.deliverJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO; -import com.win.framework.common.pojo.PageResult; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 发货任务主 Service 接口 * @@ -122,26 +124,32 @@ public interface DeliverJobMainService { * @param id * @return */ - public Integer closeDeliverJobMain(Long id); + Integer closeDeliverJobMain(Long id); /** * 承接 * @param id * @return */ - public Integer acceptDeliverJobMain(Long id); + Integer acceptDeliverJobMain(Long id); /** * 取消 * @param id * @return */ - public Integer abandonDeliverJobMain(Long id); + Integer abandonDeliverJobMain(Long id); /** * 执行 * @param updateReqVO * @return */ - public String executeDeliverJobMain(DeliverJobMainUpdateReqVO updateReqVO); + String executeDeliverJobMain(DeliverJobMainUpdateReqVO updateReqVO); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getDeliverJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java index 9d467df0..70940a09 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.deliverJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; @@ -13,14 +14,11 @@ import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRe import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestDetailCreateReqVO; import com.win.module.wms.controller.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailUpdateReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; -import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; +import com.win.module.wms.controller.deliverJob.vo.*; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestDetailConvert; import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestDetailConvert; +import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO; import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO; @@ -34,6 +32,7 @@ import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptRequestDetailMapper; +import com.win.module.wms.dal.mysql.deliverJob.DeliverJobMainMapper; import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordDetailMapper; import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordMainMapper; import com.win.module.wms.dal.mysql.deliverRequest.DeliverRequestMainMapper; @@ -42,7 +41,6 @@ import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.customerreceiptRequest.CustomerreceiptRequestMainService; import com.win.module.wms.service.customersettleRequest.CustomersettleRequestMainService; -import com.win.module.wms.service.deliverPlan.DeliverPlanMainService; import com.win.module.wms.service.expectout.ExpectoutService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.purchase.PurchaseMainService; @@ -52,23 +50,18 @@ import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; - import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert; -import com.win.module.wms.dal.mysql.deliverJob.DeliverJobMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.DELIVER_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.DELIVER_JOB_MAIN_STATUS_ERROR; /** * 发货任务主 Service 实现类 @@ -443,4 +436,11 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { trendsApi.createTrends(deliverJobMainDO.getId(), "deliverJob", "执行了发货任务", TrendsTypeEnum.UPDATE); return number; } + + @Override + public Long getDeliverJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return deliverJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index c211cf15..c0376910 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java @@ -117,4 +117,10 @@ public interface InspectJobMainService { * @return 未处理的任务数 */ Long getInspectJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getInspectJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index b4ee1ed9..8439e05f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -422,6 +422,13 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { return inspectJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getInspectJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return inspectJobMainMapper.selectCount(queryWrapper); + } + private InspectJobMainDO validateInspectJobMainExists(Long id) { InspectJobMainDO inspectJobMainDO = inspectJobMainMapper.selectById(id); if (inspectJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java index e9589cba..3ad1b6a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java @@ -1,18 +1,19 @@ package com.win.module.wms.service.inventorymoveJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; -import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 库存转移任务主 Service 接口 * @@ -102,28 +103,34 @@ public interface InventorymoveJobMainService { * @param id * @return */ - public Integer closeInventorymoveJobMain(Long id); + Integer closeInventorymoveJobMain(Long id); /** * 承接 * @param id * @return */ - public Integer acceptInventorymoveJobMain(Long id); + Integer acceptInventorymoveJobMain(Long id); /** * 取消 * @param id * @return */ - public Integer abandonInventorymoveJobMain(Long id); + Integer abandonInventorymoveJobMain(Long id); /** * 执行 * @param updateReqVO * @return */ - public String executeInventorymoveJobMain(InventorymoveJobMainUpdateReqVO updateReqVO); + String executeInventorymoveJobMain(InventorymoveJobMainUpdateReqVO updateReqVO); List getInventorymoveJobMainList(CustomConditions conditions); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getInventorymoveJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java index a508c189..54bb6bff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java @@ -3,26 +3,25 @@ package com.win.module.wms.service.inventorymoveJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.system.enums.serialNumber.RuleCodeEnum; -import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; -import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.*; -import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailUpdateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; +import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; -import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetailDO; +import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO; -import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobDetailMapper; +import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobMainMapper; import com.win.module.wms.dal.mysql.inventorymoveRecord.InventorymoveRecordDetailMapper; import com.win.module.wms.dal.mysql.inventorymoveRecord.InventorymoveRecordMainMapper; import com.win.module.wms.enums.job.JobStatusEnum; @@ -35,22 +34,14 @@ import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; -import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert; -import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -155,7 +146,7 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ @Override public InventorymoveJobMainDO inventorymoveJobMainDoStatusRight(String pnumber, String pstatus) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("number", pnumber); queryWrapper.eq("status", pstatus); InventorymoveJobMainDO inventorymoveJobMainDO = inventorymoveJobMainMapper.selectOne(queryWrapper); @@ -171,6 +162,13 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ return inventorymoveJobMainMapper.selectSeniorList(conditions); } + @Override + public Long getInventorymoveJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return inventorymoveJobMainMapper.selectCount(queryWrapper); + } + @Override public Map getCountByStatus(Collection types) { Long l = inventorymoveJobMainMapper.selectListCount(types); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java index f701742b..6965ef8d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java @@ -109,4 +109,10 @@ public interface IssueJobMainService { * @return 未处理的任务数 */ Long getIssueJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getIssueJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java index 291304d5..3bc723f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java @@ -377,6 +377,13 @@ public class IssueJobMainServiceImpl implements IssueJobMainService { return issueJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getIssueJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return issueJobMainMapper.selectCount(queryWrapper); + } + /** * 创建 生产收料任务 * @param issueRecordMainDO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java index 41810ef6..6efcc1ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java @@ -97,4 +97,10 @@ public interface PickJobMainService { * @return */ Map getCountByStatus(@Nullable Collection types); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getPickJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java index 1b685600..562ba555 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java @@ -10,6 +10,7 @@ import com.win.module.wms.controller.pickJob.vo.PickJobMainUpdateReqVO; import com.win.module.wms.convert.pickJob.PickJobMainConvert; import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; import com.win.module.wms.dal.mysql.pickJob.PickJobMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -88,7 +89,7 @@ public class PickJobMainServiceImpl implements PickJobMainService { } @Override public PickJobMainDO ipickJobMainDoStatusRight(String pnumber, String pstatus) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("number",pnumber); queryWrapper.eq("status",pstatus); PickJobMainDO pickJobMainDO = pickJobMainMapper.selectOne(queryWrapper); @@ -112,4 +113,11 @@ public class PickJobMainServiceImpl implements PickJobMainService { map.put("count", l.intValue()); return map; } + + @Override + public Long getPickJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return pickJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java index 7fd34e58..8c674254 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java @@ -97,4 +97,9 @@ public interface ProductdismantleJobMainService { */ Map getCountByStatus(@Nullable Collection types); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductdismantleJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java index 0669ce05..bd2acbdf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java @@ -10,6 +10,7 @@ import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobM import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; import com.win.module.wms.dal.mysql.productdismantleJob.ProductdismantleJobMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -94,7 +95,7 @@ public class ProductdismantleJobMainServiceImpl implements ProductdismantleJobMa } @Override public ProductdismantleJobMainDO productdismantleJobMainDoStatusRight(String pnumber, String pstatus) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("number",pnumber); queryWrapper.eq("status",pstatus); ProductdismantleJobMainDO productdismantleJobMainDO = productdismantleJobMainMapper.selectOne(queryWrapper); @@ -107,10 +108,17 @@ public class ProductdismantleJobMainServiceImpl implements ProductdismantleJobMa @Override public Map getCountByStatus(Collection types) { - Long l = productdismantleJobMainMapper.selectListCount(types); + Long count = productdismantleJobMainMapper.selectListCount(types); Map map = new HashMap<>(); map.put("jobType", 11); - map.put("count", l.intValue()); + map.put("count", count.intValue()); return map; } + + @Override + public Long getProductdismantleJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productdismantleJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java index db35ee99..09e9f52a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java @@ -113,4 +113,10 @@ public interface ProductionreceiptJobMainService { * @return 未处理的任务数 */ Long getProductionreceiptJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductionreceiptJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java index ae0a0421..2a418dfa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java @@ -388,6 +388,13 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob return productionreceiptJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getProductionreceiptJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productionreceiptJobMainMapper.selectCount(queryWrapper); + } + /** * 创建 上线结算记录 * @param productionreceiptRecordMainDO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java index f812430c..863b9f66 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java @@ -113,4 +113,10 @@ public interface ProductionreturnJobMainService { * @return 未处理的任务数 */ Long getProductionreturnJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductionreturnJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java index cf66994a..b879b9e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java @@ -366,4 +366,11 @@ public class ProductionreturnJobMainServiceImpl implements ProductionreturnJobMa queryWrapper.in("`status`", statusList); return productionreturnJobMainMapper.selectCount(queryWrapper); } + + @Override + public Long getProductionreturnJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productionreturnJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java index 579cdae1..5e180c57 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java @@ -114,4 +114,10 @@ public interface ProductputawayJobMainService { * @return 未处理的任务数 */ Long getProductputawayJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductputawayJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java index 91a3e289..37d1a630 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java @@ -354,4 +354,11 @@ public class ProductputawayJobMainServiceImpl implements ProductputawayJobMainSe queryWrapper.in("`status`", statusList); return productputawayJobMainMapper.selectCount(queryWrapper); } + + @Override + public Long getProductputawayJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productputawayJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java index aee43eff..1a32a124 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java @@ -126,4 +126,10 @@ public interface ProductreceiptJobMainService { * @return 未处理的任务数 */ Long getProductreceiptJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductreceiptJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java index ee7753eb..ab4216d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java @@ -530,6 +530,13 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe return productreceiptJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getProductreceiptJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productreceiptJobMainMapper.selectCount(queryWrapper); + } + /** * 创建 下线结算 记录 * @param productreceiptRecordMainDO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java index 745db739..e0388871 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java @@ -94,4 +94,10 @@ public interface ProductscrapJobMainService { * @return 未处理的任务数 */ Long getProductscrapJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getProductscrapJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java index 95cdddc0..edb73070 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java @@ -114,4 +114,11 @@ public class ProductscrapJobMainServiceImpl implements ProductscrapJobMainServic queryWrapper.in("`status`", statusList); return productscrapJobMainMapper.selectCount(queryWrapper); } + + @Override + public Long getProductscrapJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return productscrapJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 95469a79..334d6ff4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -120,4 +120,10 @@ public interface PurchasereceiptJobMainService { * @return 未处理的任务数 */ Long getPurchasereceiptJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getPurchasereceiptJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 52ebd5f4..50fb3d13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -497,6 +497,13 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain return purchasereceiptJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getPurchasereceiptJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return purchasereceiptJobMainMapper.selectCount(queryWrapper); + } + private PurchasereceiptJobMainDO validatePurchasereceiptJobMainExists(Long id) { PurchasereceiptJobMainDO purchasereceiptJobMainDO = purchasereceiptJobMainMapper.selectById(id); if (purchasereceiptJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java index 594e9fec..e44bf3bd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java @@ -108,4 +108,10 @@ public interface PurchasereturnJobMainService { * @return 未处理的任务数 */ Long getPurchasereturnJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getPurchasereturnJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index bd88b757..d105a03b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -355,6 +355,13 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe return purchasereturnJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getPurchasereturnJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return purchasereturnJobMainMapper.selectCount(queryWrapper); + } + private PurchasereturnJobMainDO validatePurchasereturnJobMainExists(Long id) { PurchasereturnJobMainDO purchasereturnJobMainDO = purchasereturnJobMainMapper.selectById(id); if (purchasereturnJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java index 51926b9a..33579630 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java @@ -108,4 +108,10 @@ public interface PutawayJobMainService { * @return 未处理的任务数 */ Long getPutawayJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getPutawayJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index b86b1204..07a954ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -306,6 +306,13 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { return putawayJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getPutawayJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return putawayJobMainMapper.selectCount(queryWrapper); + } + private PutawayJobMainDO validatePutawayJobMainExists(Long id) { PutawayJobMainDO putawayJobMainDO = putawayJobMainMapper.selectById(id); if (putawayJobMainDO == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java index dd610af9..1b6cccbb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java @@ -114,4 +114,10 @@ public interface RepleinshJobMainService { * @return 未处理的任务数 */ Long getRepleinshJobCount(); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getRepleinshJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java index 59c33222..316935f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java @@ -223,6 +223,13 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService { return repleinshJobMainMapper.selectCount(queryWrapper); } + @Override + public Long getRepleinshJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return repleinshJobMainMapper.selectCount(queryWrapper); + } + @Override @Transactional public String executeRepleinshJobMain(RepleinshJobMainUpdateReqVO repleinshJobMainUpdateReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java index d3e30220..1de81a96 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java @@ -1,17 +1,19 @@ package com.win.module.wms.service.scrapJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainPageReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobMainDO; -import com.win.framework.common.pojo.PageResult; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 报废出库任务主 Service 接口 * @@ -122,4 +124,10 @@ public interface ScrapJobMainService { * @return number */ String executeScrapJobMain(ScrapJobMainUpdateReqVO updateReqVO); + + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getScrapJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java index 0cc9e77e..11ec170b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java @@ -23,6 +23,7 @@ import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.scrapJob.ScrapJobMainMapper; import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordDetailMapper; import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.location.LocationService; @@ -313,4 +314,11 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { trendsApi.createTrends(scrapJobMainDO.getId(), "ScrapJob", "执行报废出库任务", TrendsTypeEnum.UPDATE); return number; } + + @Override + public Long getScrapJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return scrapJobMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java index 0dbb65ad..9d662536 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java @@ -1,17 +1,19 @@ package com.win.module.wms.service.transferissueJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO; -import com.win.framework.common.pojo.PageResult; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 调拨出库任务主 Service 接口 * @@ -124,4 +126,10 @@ public interface TransferissueJobMainService { */ String executeTransferissueJobMain(TransferissueJobMainUpdateReqVO updateReqVO); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getTransferissueJobCountPda(); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index 49b2a4be..67e9a7a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java @@ -30,6 +30,7 @@ import com.win.module.wms.dal.mysql.transferissueJob.TransferissueJobMainMapper; import com.win.module.wms.dal.mysql.transferissueRecord.TransferissueRecordDetailMapper; import com.win.module.wms.dal.mysql.transferissueRecord.TransferissueRecordMainMapper; import com.win.module.wms.dal.mysql.transferissueRequest.TransferissueRequestMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.expectin.ExpectinService; @@ -376,4 +377,11 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ return number; } + @Override + public Long getTransferissueJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return transferissueJobMainMapper.selectCount(queryWrapper); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java index f9752beb..6fc5f8e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java @@ -1,17 +1,19 @@ package com.win.module.wms.service.transferreceiptJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 调拨入库任务主 Service 接口 * @@ -123,4 +125,9 @@ public interface TransferreceiptJobMainService { */ String executeTransferreceiptJobMain(TransferreceiptJobMainUpdateReqVO updateReqVO); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getTransferreceiptJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index d76bb0fd..7bda533c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -13,7 +13,6 @@ import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.*; import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobMainConvert; -import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; @@ -27,6 +26,7 @@ import com.win.module.wms.dal.mysql.transferreceiptJob.TransferreceiptJobMainMap import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordDetailMapper; import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordMainMapper; import com.win.module.wms.dal.mysql.transferreceiptRequest.TransferreceiptRequestMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.expectin.ExpectinService; @@ -338,4 +338,11 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain return number; } + @Override + public Long getTransferreceiptJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return transferreceiptJobMainMapper.selectCount(queryWrapper); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java index 1069662d..329998d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java @@ -125,4 +125,9 @@ public interface UnplannedissueJobMainService { */ String executeUnplannedissueJobMain(UnplannedissueJobMainUpdateReqVO updateReqVO); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getUnplannedissueJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java index b14f6134..fea177c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java @@ -23,6 +23,7 @@ import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueReco import com.win.module.wms.dal.mysql.unplannedissueJob.UnplannedissueJobMainMapper; import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordDetailMapper; import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.location.LocationService; @@ -315,4 +316,11 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe return number; } + @Override + public Long getUnplannedissueJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return unplannedissueJobMainMapper.selectCount(queryWrapper); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java index e1d6cc35..5e233086 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java @@ -1,17 +1,19 @@ package com.win.module.wms.service.unplannedreceiptJob; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainPageReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; import org.springframework.lang.Nullable; +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * 计划外入库任务主 Service 接口 * @@ -123,4 +125,9 @@ public interface UnplannedreceiptJobMainService { */ String executeUnplannedreceiptJobMain(UnplannedreceiptJobMainUpdateReqVO updateReqVO); + /** + * pda未处理的任务数 + * @return pda未处理的任务数 + */ + Long getUnplannedreceiptJobCountPda(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java index 365bf26b..7a9385e0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java @@ -23,6 +23,7 @@ import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.Unplannedreceipt import com.win.module.wms.dal.mysql.unplannedreceiptJob.UnplannedreceiptJobMainMapper; import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordDetailMapper; import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordMainMapper; +import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.location.LocationService; @@ -314,4 +315,11 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa return number; } + @Override + public Long getUnplannedreceiptJobCountPda() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("`status`", JobStatusEnum.PENDING.getCode()); + return unplannedreceiptJobMainMapper.selectCount(queryWrapper); + } + } From 007ade643fb18368d7638ea2ebcd491ecb0abc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 26 Dec 2023 09:16:39 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=A1=A5=E6=96=99=E8=AE=B0=E5=BD=95=20?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/RepleinshRecordDetailBaseVO.java | 3 + .../vo/RepleinshRecordDetailCreateReqVO.java | 6 +- .../RepleinshRecordMainServiceImpl.java | 115 ++++++++++-------- 3 files changed, 73 insertions(+), 51 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailBaseVO.java index c3e8eff2..b05521c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailBaseVO.java @@ -107,4 +107,7 @@ public class RepleinshRecordDetailBaseVO { @Schema(description = "到批次") private String toBatch; + @Schema(description = "主表ID") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailCreateReqVO.java index d9ef80e7..5dec9470 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailCreateReqVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.repleinshRecord.vo; import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import java.util.Map; + @Schema(description = "管理后台 - 补料记录子创建 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class RepleinshRecordDetailCreateReqVO extends RepleinshRecordDetailBaseVO { - + @Schema(description = "子表记录数据") + private List> recordList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java index 1a7cec55..1fd2c7b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java @@ -7,8 +7,10 @@ import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.system.enums.serialNumber.RuleCodeEnum; +import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailCreateReqVO; import com.win.module.wms.controller.repleinshRecord.vo.*; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; +import com.win.module.wms.convert.issueRecord.IssueRecordDetailConvert; import com.win.module.wms.convert.purchasereturnRecord.PurchasereturnRecordDetailConvert; import com.win.module.wms.convert.repleinshRecord.RepleinshRecordDetailConvert; import com.win.module.wms.dal.dataobject.balance.BalanceDO; @@ -86,7 +88,7 @@ public class RepleinshRecordMainServiceImpl implements RepleinshRecordMainServic // 插入 AdminUserRespDTO userRespDTO = userApi.getUser(getLoginUserId()); RepleinshRecordMainDO mainDO = RepleinshRecordMainConvert.INSTANCE.convert(createReqVO); - List subDOList = RepleinshRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); + List subDOListVO = createReqVO.getSubList(); String number = serialNumberApi.generateCode(RuleCodeEnum.REPLEINMENT_RECORD.getCode()); mainDO.setNumber(number); mainDO.setDepartmentCode(String.valueOf(userRespDTO.getDeptId())); @@ -109,7 +111,8 @@ public class RepleinshRecordMainServiceImpl implements RepleinshRecordMainServic repleinshRecordMainMapper.insert(mainDO); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); - for (RepleinshRecordDetailDO detailDO : subDOList) { + for (RepleinshRecordDetailCreateReqVO detailDO : subDOListVO) { + List> recordList = detailDO.getRecordList(); detailDO.setMasterId(mainDO.getId()); detailDO.setNumber(number); LocationDO locationDOFrom = locationService.selectLocation(detailDO.getFromLocationCode()); @@ -136,55 +139,67 @@ public class RepleinshRecordMainServiceImpl implements RepleinshRecordMainServic } else { throw exception(ITEMBASIC_NOT_EXISTS); } - //查询库存余额 - BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode()); - if (balanceDO == null) { - throw exception(BALANCE_NOT_EXISTS); - } - // 库存事务——入 - TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); - BeanUtils.copyProperties(detailDO, transactionCreateReqVOIn); - transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); - transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); - transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); - transactionCreateReqVOIn.setWorker(String.valueOf(userRespDTO.getId())); - transactionCreateReqVOIn.setBatch(detailDO.getToBatch()); - transactionCreateReqVOIn.setPackingNumber(detailDO.getToPackingNumber()); - transactionCreateReqVOIn.setInventoryStatus(detailDO.getInventoryStatus()); - transactionCreateReqVOIn.setLocationCode(detailDO.getToLocationCode()); - transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); - transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); - transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate()); - transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate()); - transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate()); - transactionCreateReqVOIn.setWarehouseCode(mainDO.getFromWarehouseCode()); - transactionCreateReqVOIn.setRecordNumber(number); - transactionCreateReqVOIn.setId(null); - transactionCreateReqVOList.add(transactionCreateReqVOIn); - // 库存事务——出 - TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO(); - BeanUtils.copyProperties(detailDO, transactionCreateReqVOOut); - transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); - transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction()); - transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode()); - transactionCreateReqVOOut.setRecordNumber(number); - transactionCreateReqVOOut.setInventoryStatus(detailDO.getInventoryStatus()); - transactionCreateReqVOOut.setWorker(String.valueOf(userRespDTO.getId())); - transactionCreateReqVOOut.setBatch(detailDO.getFromBatch()); - transactionCreateReqVOOut.setPackingNumber(detailDO.getFromPackingNumber()); - transactionCreateReqVOOut.setLocationCode(detailDO.getFromLocationCode()); - transactionCreateReqVOOut.setSinglePrice(balanceDO.getSinglePrice()); - transactionCreateReqVOOut.setAmount(balanceDO.getAmount()); - transactionCreateReqVOOut.setArriveDate(balanceDO.getArriveDate()); - transactionCreateReqVOOut.setProduceDate(balanceDO.getProduceDate()); - transactionCreateReqVOOut.setExpireDate(balanceDO.getExpireDate()); - transactionCreateReqVOOut.setWarehouseCode(mainDO.getFromWarehouseCode()); - transactionCreateReqVOOut.setId(null); - transactionCreateReqVOList.add(transactionCreateReqVOOut); + recordList.forEach( recordListItem -> { + // record 相关数据 + String toInventoryStatus = recordListItem.get("toInventoryStatus").toString(); + String fromPackingNumber = recordListItem.get("fromPackingNumber").toString(); + String fromBatch = recordListItem.get("fromBatch").toString(); + String toPackingNumber = recordListItem.get("toPackingNumber").toString(); + String toBatch = recordListItem.get("toBatch").toString(); + String fromLocationCode = recordListItem.get("fromLocationCode").toString(); + String toLocationCode = recordListItem.get("toLocationCode").toString(); + //查询库存余额 + List inventoryStatusList = new ArrayList<>(); + inventoryStatusList.add(toInventoryStatus); + List balanceDO = jobUtils.selectlocationReturnManagementAccuracyToBalance(detailDO.getItemCode(),fromPackingNumber,fromBatch,fromLocationCode,inventoryStatusList); + if (balanceDO == null || balanceDO.size() == 0) { + throw exception(BALANCE_NOT_EXISTS); + } + // 库存事务——入 + TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); + BeanUtils.copyProperties(detailDO, transactionCreateReqVOIn); + transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); + TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); + transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); + transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); + transactionCreateReqVOIn.setWorker(String.valueOf(userRespDTO.getId())); + transactionCreateReqVOIn.setBatch(toBatch); + transactionCreateReqVOIn.setPackingNumber(toPackingNumber); + transactionCreateReqVOIn.setInventoryStatus(toInventoryStatus); + transactionCreateReqVOIn.setLocationCode(toLocationCode); + transactionCreateReqVOIn.setSinglePrice(balanceDO.get(0).getSinglePrice()); + transactionCreateReqVOIn.setAmount(balanceDO.get(0).getAmount()); + transactionCreateReqVOIn.setArriveDate(balanceDO.get(0).getArriveDate()); + transactionCreateReqVOIn.setProduceDate(balanceDO.get(0).getProduceDate()); + transactionCreateReqVOIn.setExpireDate(balanceDO.get(0).getExpireDate()); + transactionCreateReqVOIn.setWarehouseCode(mainDO.getFromWarehouseCode()); + transactionCreateReqVOIn.setRecordNumber(number); + transactionCreateReqVOIn.setId(null); + transactionCreateReqVOList.add(transactionCreateReqVOIn); + // 库存事务——出 + TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO(); + BeanUtils.copyProperties(detailDO, transactionCreateReqVOOut); + transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode()); + TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); + transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction()); + transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode()); + transactionCreateReqVOOut.setRecordNumber(number); + transactionCreateReqVOOut.setInventoryStatus(toInventoryStatus); + transactionCreateReqVOOut.setWorker(String.valueOf(userRespDTO.getId())); + transactionCreateReqVOOut.setBatch(fromBatch); + transactionCreateReqVOOut.setPackingNumber(fromPackingNumber); + transactionCreateReqVOOut.setLocationCode(fromLocationCode); + transactionCreateReqVOOut.setSinglePrice(balanceDO.get(0).getSinglePrice()); + transactionCreateReqVOOut.setAmount(balanceDO.get(0).getAmount()); + transactionCreateReqVOOut.setArriveDate(balanceDO.get(0).getArriveDate()); + transactionCreateReqVOOut.setProduceDate(balanceDO.get(0).getProduceDate()); + transactionCreateReqVOOut.setExpireDate(balanceDO.get(0).getExpireDate()); + transactionCreateReqVOOut.setWarehouseCode(mainDO.getFromWarehouseCode()); + transactionCreateReqVOOut.setId(null); + transactionCreateReqVOList.add(transactionCreateReqVOOut); + }); } - repleinshRecordDetailMapper.insertBatch(subDOList); + repleinshRecordDetailMapper.insertBatch(RepleinshRecordDetailConvert.INSTANCE.convertList03(subDOListVO)); //增加库存事务 transactionService.createTransaction(transactionCreateReqVOList); //增加操作记录 From ed7bb88f837c12d6f7e1838a0f9cdeefd22e4a62 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 26 Dec 2023 09:32:41 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CountRequestMainController.java | 17 +++++++++++++---- .../countRequest/CountRequestMainService.java | 12 ++++++++++-- .../CountRequestMainServiceImpl.java | 17 ++++++++++++++++- .../CountadjustRequestMainService.java | 2 +- 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java index 4da4926a..854960aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java @@ -197,6 +197,15 @@ public class CountRequestMainController { return success(count > 0); } + @PutMapping("/reAdd") + @Operation(summary = "重新添加采购收货申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:count-request-main:reAdd')") + public CommonResult openCountRequestMain(@RequestParam("id") Long id) { + Integer count = countRequestMainService.reAddCountRequestMain(id); + return success(count > 0); + } + @PutMapping("/submit") @Operation(summary = "提交盘点申请主") @Parameter(name = "id", description = "编号", required = true) @@ -224,12 +233,12 @@ public class CountRequestMainController { return success(count > 0); } - @PutMapping("/abort") + @PutMapping("/refused") @Operation(summary = "审批拒绝盘点申请主") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('wms:count-request-main:abort')") - public CommonResult abortCountRequestMain(@RequestParam("id") Long id) { - Integer count = countRequestMainService.abortCountRequestMain(id); + @PreAuthorize("@ss.hasPermission('wms:count-request-main:refused')") + public CommonResult refusedCountRequestMain(@RequestParam("id") Long id) { + Integer count = countRequestMainService.refusedCountRequestMain(id); return success(count > 0); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java index 99d6713e..716525fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java @@ -86,6 +86,14 @@ public interface CountRequestMainService { */ Integer closeCountRequestMain(Long id); + /** + * 重新添加盘点申请主 + * + * @param id 退货申请主ID + * @return 更新数量 + */ + Integer reAddCountRequestMain(Long id); + /** * 提交盘点申请主 * @@ -109,12 +117,12 @@ public interface CountRequestMainService { */ Integer handleCountRequestMain(Long id); /** - * 审批拒绝盘点申请主 + * 审批驳回盘点申请主 * * @param id 盘点申请主ID * @return 更新数量 */ - Integer abortCountRequestMain(Long id); + Integer refusedCountRequestMain(Long id); /** * 生成重盘任务 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 26c5896f..646cccd1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -277,6 +277,21 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { return countRequestMainMapper.updateById(mainDO); } + @Override + @Transactional + public Integer reAddCountRequestMain(Long id) { + // 校验存在存在下级单据 + CountRequestMainDO mainDO = validateCountRequestMainExists(id); + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.reAdd(); + if (!flag) { + throw new ServiceException(COUNTADJUST_REQUEST_CANNOT_RE_ADD); + } + mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 + trendsApi.createTrends(id, "countRequest", "打开了盘点申请", TrendsTypeEnum.UPDATE); + return countRequestMainMapper.updateById(mainDO); + } + @Override @Transactional public Integer submitCountRequestMain(Long id) { @@ -334,7 +349,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { @Override @Transactional - public Integer abortCountRequestMain(Long id) { + public Integer refusedCountRequestMain(Long id) { // 校验存在 CountRequestMainDO mainDO = validateCountRequestMainExists(id); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java index 96cb042f..45305b25 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainService.java @@ -55,7 +55,7 @@ public interface CountadjustRequestMainService { Integer closeCountadjustRequestMain(Long id); /** - * 重新添加退货申请主 + * 重新添加盘点调整申请主 * * @param id 退货申请主ID * @return 更新数量 From ab6146b00fbd065300200e64b94453d667d597dd Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 26 Dec 2023 10:17:45 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasereturnRequestMainServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index ec09198b..4cfdfcab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -232,7 +232,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque } private void ifDetailQtyBigThanQty(BigDecimal detailQty, BigDecimal qty) { - if (detailQty.compareTo(qty) < 0) { + if (detailQty.compareTo(qty) > 0) { throw exception(QTY_EXCEPTION, "退货数量" + qty + "不能大于收货数量" + detailQty); } } From c96803b9a8d14c6d8151bf41209db895d283ef43 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 26 Dec 2023 11:31:51 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=B7=B3=E8=BF=87=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/InspectRecordDetailBaseVO.java | 3 ++ .../vo/PurchasereceiptRecordDetailBaseVO.java | 3 ++ .../vo/PurchasereturnRecordDetailBaseVO.java | 13 +++--- .../vo/PutawayRecordDetailBaseVO.java | 3 ++ .../InspectRequestMainServiceImpl.java | 32 ++----------- ...PurchasereceiptRequestMainServiceImpl.java | 46 ++++++++----------- .../PurchasereturnRequestMainServiceImpl.java | 20 ++------ .../PutawayRequestMainServiceImpl.java | 23 +++------- 8 files changed, 49 insertions(+), 94 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java index 779bc7d9..8f42432b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java @@ -80,6 +80,9 @@ public class InspectRecordDetailBaseVO { @Schema(description = "其他属性") private String otherProperties; + @Schema(description = "主表ID") + private Long masterId; + @Schema(description = "单据号") private String number; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java index 3c0b9c45..7e0eb023 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java @@ -140,6 +140,9 @@ public class PurchasereceiptRecordDetailBaseVO { @Schema(description = "物品描述2") private String itemDesc2; + @Schema(description = "主表ID") + private Long masterId; + @Schema(description = "单据号") private String number; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java index 8c399300..5d90f1fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java @@ -1,14 +1,12 @@ package com.win.module.wms.controller.purchasereturnRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.math.BigDecimal; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.math.BigDecimal; -import javax.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -74,6 +72,9 @@ public class PurchasereturnRecordDetailBaseVO { @Schema(description = "金额") private BigDecimal amount; + @Schema(description = "主表ID") + private Long masterId; + @Schema(description = "单据号") private String number; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java index 76d1b398..b8a187b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java @@ -63,6 +63,9 @@ public class PutawayRecordDetailBaseVO { @Schema(description = "到库区代码") private String toAreaCode; + @Schema(description = "主表ID") + private Long masterId; + @Schema(description = "单据号") private String number; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index 79c5f420..4a2fd40d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -18,14 +18,10 @@ import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.*; import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert; import com.win.module.wms.convert.inspectJob.InspectJobMainConvert; -import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert; -import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert; import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; @@ -47,6 +43,7 @@ import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.enums.request.RequestStatusState; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.expectout.ExpectoutService; +import com.win.module.wms.service.inspectRecord.InspectRecordMainService; import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService; @@ -115,6 +112,8 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService private ExpectoutService expectoutService; @Resource private ExpectinService expectinService; + @Resource + private InspectRecordMainService inspectRecordMainService; @Override @Transactional @@ -377,30 +376,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService * @param detailDOList 收货检验子 */ private void generateJob(InspectRequestMainDO mainDO, List detailDOList) { - //跳过任务直接生成记录 - if("TRUE".equals(mainDO.getDirectCreateRecord())) { - InspectRecordMainCreateReqVO inspectRecordMainCreateReqVO = new InspectRecordMainCreateReqVO(); - BeanUtils.copyProperties(mainDO, inspectRecordMainCreateReqVO); - inspectRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); - String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_RECORD.getCode()); - inspectRecordMainCreateReqVO.setNumber(number); - //增加业务类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRecord"); - inspectRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); - inspectRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); - inspectRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType()); - inspectRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType()); - inspectRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); - inspectRecordMainCreateReqVO.setId(null); - inspectRecordMainMapper.insert(InspectRecordMainConvert.INSTANCE.convert(inspectRecordMainCreateReqVO)); - for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) { - InspectRecordDetailCreateReqVO inspectRecordDetailCreateReqVO = new InspectRecordDetailCreateReqVO(); - BeanUtils.copyProperties(inspectRequestDetailDO, inspectRecordDetailCreateReqVO); - inspectRecordDetailCreateReqVO.setNumber(number); - inspectRecordDetailMapper.insert(InspectRecordDetailConvert.INSTANCE.convert(inspectRecordDetailCreateReqVO)); - } - return; - } + //检验不能跳过任务直接生成记录 List expectoutCreateReqVOList = new ArrayList<>(); List expectinCreateReqVOList = new ArrayList<>(); InspectJobMainDO inspectJobMainDO = InspectJobMainConvert.INSTANCE.convert(mainDO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index d9ed5860..ca447ae0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -16,14 +16,10 @@ import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailCreateReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainCreateReqVO; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO; -import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.*; import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert; import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobMainConvert; -import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert; -import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordMainConvert; import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert; import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; @@ -49,6 +45,7 @@ import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.itempackaging.ItempackagingService; import com.win.module.wms.service.jobsetting.JobsettingService; import com.win.module.wms.service.purchase.PurchaseMainService; +import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService; import com.win.module.wms.service.requestsetting.RequestsettingService; import com.win.module.wms.service.rule.RuleService; import com.win.module.wms.service.shift.ShiftService; @@ -115,6 +112,8 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq private ExpectinService expectinService; @Resource private JobsettingService jobsettingService; + @Resource + private PurchasereceiptRecordMainService purchasereceiptRecordMainService; @Override @Transactional @@ -421,30 +420,21 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq * @param detailDOList 采购收货子 */ private void generateJob(PurchasereceiptRequestMainDO mainDO, List detailDOList) { - //跳过任务直接生成记录 - if("TRUE".equals(mainDO.getDirectCreateRecord())) { - PurchasereceiptRecordMainCreateReqVO purchasereceiptRecordMainCreateReqVO = new PurchasereceiptRecordMainCreateReqVO(); - BeanUtils.copyProperties(mainDO, purchasereceiptRecordMainCreateReqVO); - purchasereceiptRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); - String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_RECORD.getCode()); - purchasereceiptRecordMainCreateReqVO.setNumber(number); - //增加业务类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptRecord"); - purchasereceiptRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); - purchasereceiptRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); - purchasereceiptRecordMainCreateReqVO.setToLocationTypes(businesstypeDO.getInLocationTypes()); - purchasereceiptRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); - purchasereceiptRecordMainCreateReqVO.setToAreaCodes(businesstypeDO.getInAreaCodes()); - purchasereceiptRecordMainMapper.insert(PurchasereceiptRecordMainConvert.INSTANCE.convert(purchasereceiptRecordMainCreateReqVO)); - for(PurchasereceiptRequestDetailDO purchasereceiptRequestDetailDO : detailDOList) { - PurchasereceiptRecordDetailCreateReqVO purchasereceiptRecordDetailCreateReqVO = new PurchasereceiptRecordDetailCreateReqVO(); - BeanUtils.copyProperties(purchasereceiptRequestDetailDO, purchasereceiptRecordDetailCreateReqVO); - purchasereceiptRecordDetailCreateReqVO.setToLocationCode(purchasereceiptRequestDetailDO.getDefaultToLocationCode()); - purchasereceiptRecordDetailCreateReqVO.setNumber(number); - purchasereceiptRecordDetailMapper.insert(PurchasereceiptRecordDetailConvert.INSTANCE.convert(purchasereceiptRecordDetailCreateReqVO)); - } - return; - } + //采购收货不能跳过任务直接生成记录 +// if("TRUE".equals(mainDO.getDirectCreateRecord())) { +// PurchasereceiptRecordMainCreateReqVO purchasereceiptRecordMainCreateReqVO = new PurchasereceiptRecordMainCreateReqVO(); +// BeanUtils.copyProperties(mainDO, purchasereceiptRecordMainCreateReqVO); +// purchasereceiptRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); +// List purchasereturnRecordDetailCreateReqVOList = new ArrayList<>(); +// for(PurchasereceiptRequestDetailDO purchasereceiptRequestDetailDO : detailDOList) { +// PurchasereceiptRecordDetailCreateReqVO purchasereceiptRecordDetailCreateReqVO = new PurchasereceiptRecordDetailCreateReqVO(); +// BeanUtils.copyProperties(purchasereceiptRequestDetailDO, purchasereceiptRecordDetailCreateReqVO); +// purchasereturnRecordDetailCreateReqVOList.add(purchasereceiptRecordDetailCreateReqVO); +// } +// purchasereceiptRecordMainCreateReqVO.setSubList(purchasereturnRecordDetailCreateReqVOList); +// purchasereceiptRecordMainService.createPurchasereceiptRecordMain(purchasereceiptRecordMainCreateReqVO); +// return; +// } RuleRespVO ruleRespVO = ruleService.deliveryGoods(mainDO.getSupplierCode()); JSONObject jsonObject = JSONUtil.parseObj(ruleRespVO.getConfiguration()); Map> listMap = new HashMap<>(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 4cfdfcab..453c5049 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -17,8 +17,6 @@ import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecor import com.win.module.wms.controller.purchasereturnRequest.vo.*; import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobDetailConvert; import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobMainConvert; -import com.win.module.wms.convert.purchasereturnRecord.PurchasereturnRecordDetailConvert; -import com.win.module.wms.convert.purchasereturnRecord.PurchasereturnRecordMainConvert; import com.win.module.wms.convert.purchasereturnRequest.PurchasereturnRequestDetailConvert; import com.win.module.wms.convert.purchasereturnRequest.PurchasereturnRequestMainConvert; import com.win.module.wms.dal.dataobject.balance.BalanceDO; @@ -368,24 +366,14 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque PurchasereturnRecordMainCreateReqVO purchasereturnRecordMainCreateReqVO = new PurchasereturnRecordMainCreateReqVO(); BeanUtils.copyProperties(mainDO, purchasereturnRecordMainCreateReqVO); purchasereturnRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); - String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RETURN_RECORD.getCode()); - purchasereturnRecordMainCreateReqVO.setNumber(number); - //增加业务类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayRecord"); - purchasereturnRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); - purchasereturnRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); - purchasereturnRecordMainCreateReqVO.setToLocationTypes(businesstypeDO.getInLocationTypes()); - purchasereturnRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType()); - purchasereturnRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType()); - purchasereturnRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); - purchasereturnRecordMainCreateReqVO.setToAreaCodes(businesstypeDO.getInAreaCodes()); - purchasereturnRecordMainMapper.insert(PurchasereturnRecordMainConvert.INSTANCE.convert(purchasereturnRecordMainCreateReqVO)); + List purchasereturnRecordDetailCreateReqVOList = new ArrayList<>(); for(PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : detailDOList) { PurchasereturnRecordDetailCreateReqVO purchasereturnRecordDetailCreateReqVO = new PurchasereturnRecordDetailCreateReqVO(); BeanUtils.copyProperties(purchasereturnRequestDetailDO, purchasereturnRecordDetailCreateReqVO); - purchasereturnRecordDetailCreateReqVO.setNumber(number); - purchasereturnRecordDetailMapper.insert(PurchasereturnRecordDetailConvert.INSTANCE.convert(purchasereturnRecordDetailCreateReqVO)); + purchasereturnRecordDetailCreateReqVOList.add(purchasereturnRecordDetailCreateReqVO); } + purchasereturnRecordMainCreateReqVO.setSubList(purchasereturnRecordDetailCreateReqVOList); + purchasereturnRecordMainService.createPurchasereturnRecordMain(purchasereturnRecordMainCreateReqVO); return; } PurchasereturnJobMainDO purchasereturnJobMainDO = PurchasereturnJobMainConvert.INSTANCE.convert(mainDO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java index 345bf0dc..7f73b6e0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java @@ -17,8 +17,6 @@ import com.win.module.wms.controller.putawayRequest.vo.*; import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert; import com.win.module.wms.convert.putawayJob.PutawayJobMainConvert; -import com.win.module.wms.convert.putawayRecord.PutawayRecordDetailConvert; -import com.win.module.wms.convert.putawayRecord.PutawayRecordMainConvert; import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert; import com.win.module.wms.convert.putawayRequest.PutawayRequestMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; @@ -47,6 +45,7 @@ import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.jobsetting.JobsettingService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.purchase.PurchaseMainService; +import com.win.module.wms.service.putawayRecord.PutawayRecordMainService; import com.win.module.wms.service.requestsetting.RequestsettingService; import com.win.module.wms.service.rule.RuleService; import com.win.module.wms.util.JobUtils; @@ -109,6 +108,8 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService private RuleService ruleService; @Resource private JobsettingService jobsettingService; + @Resource + private PutawayRecordMainService putawayRecordMainService; @Override @Transactional @@ -324,24 +325,14 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService PutawayRecordMainCreateReqVO putawayRecordMainCreateReqVO = new PutawayRecordMainCreateReqVO(); BeanUtils.copyProperties(mainDO, putawayRecordMainCreateReqVO); putawayRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber()); - String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_RECORD.getCode()); - putawayRecordMainCreateReqVO.setNumber(number); - //增加业务类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayRecord"); - putawayRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); - putawayRecordMainCreateReqVO.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); - putawayRecordMainCreateReqVO.setToLocationTypes(businesstypeDO.getInLocationTypes()); - putawayRecordMainCreateReqVO.setInTransactionType(businesstypeDO.getInTransactionType()); - putawayRecordMainCreateReqVO.setOutTransactionType(businesstypeDO.getOutTransactionType()); - putawayRecordMainCreateReqVO.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); - putawayRecordMainCreateReqVO.setToAreaCodes(businesstypeDO.getInAreaCodes()); - putawayRecordMainMapper.insert(PutawayRecordMainConvert.INSTANCE.convert(putawayRecordMainCreateReqVO)); + List putawayRecordDetailCreateReqVOList = new ArrayList<>(); for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) { PutawayRecordDetailCreateReqVO putawayRecordDetailCreateReqVO = new PutawayRecordDetailCreateReqVO(); BeanUtils.copyProperties(putawayRequestDetailDO, putawayRecordDetailCreateReqVO); - putawayRecordDetailCreateReqVO.setNumber(number); - putawayRecordDetailMapper.insert(PutawayRecordDetailConvert.INSTANCE.convert(putawayRecordDetailCreateReqVO)); + putawayRecordDetailCreateReqVOList.add(putawayRecordDetailCreateReqVO); } + putawayRecordMainCreateReqVO.setSubList(putawayRecordDetailCreateReqVOList); + putawayRecordMainService.createPutawayRecordMain(putawayRecordMainCreateReqVO); return; } List expectoutCreateReqVOList = new ArrayList<>();