From a5b7dde6d57a135aba81debce84af581a051b357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 14 Dec 2023 18:46:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/issueJob/vo/IssueJobMainBaseVO.java | 3 ++- .../wms/controller/issueJob/vo/IssueJobMainExcelVO.java | 3 +++ .../wms/controller/issueJob/vo/IssueJobMainExportReqVO.java | 3 ++- .../wms/controller/issueJob/vo/IssueJobMainPageReqVO.java | 3 +++ .../wms/controller/issueRecord/vo/IssueRecordMainBaseVO.java | 3 +++ .../controller/issueRecord/vo/IssueRecordMainExcelVO.java | 3 +++ .../issueRecord/vo/IssueRecordMainExportReqVO.java | 3 +++ .../controller/issueRecord/vo/IssueRecordMainPageReqVO.java | 3 +++ .../controller/issueRequest/vo/IssueRequestMainBaseVO.java | 3 +++ .../controller/issueRequest/vo/IssueRequestMainExcelVO.java | 2 ++ .../issueRequest/vo/IssueRequestMainExportReqVO.java | 4 ++++ .../issueRequest/vo/IssueRequestMainPageReqVO.java | 4 ++++ .../module/wms/dal/dataobject/issueJob/IssueJobMainDO.java | 5 +++++ .../wms/dal/dataobject/issueRecord/IssueRecordMainDO.java | 5 ++++- .../wms/dal/dataobject/issueRequest/IssueRequestMainDO.java | 5 +++++ .../wms/dal/mysql/issueRecord/IssueRecordMainMapper.java | 2 ++ .../wms/dal/mysql/issueRequest/IssueRequestMainMapper.java | 2 ++ .../module/wms/service/issueJob/IssueJobMainServiceImpl.java | 2 +- .../service/issueRequest/IssueRequestMainServiceImpl.java | 1 + 19 files changed, 55 insertions(+), 4 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainBaseVO.java index 6f91cb44..9f894bc5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainBaseVO.java @@ -150,6 +150,7 @@ public class IssueJobMainBaseVO { @Schema(description = "出库库存状态范围") private String outInventoryStatuses; - + @Schema(description = "备料计划单号") + private String preparetoissuePlanNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExcelVO.java index 1837c864..6a52e597 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExcelVO.java @@ -219,4 +219,7 @@ public class IssueJobMainExcelVO { @ExcelProperty("到货主代码") private String toOwnerCode; + + @ExcelProperty("备料计划单号") + private String preparetoissuePlanNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExportReqVO.java index c64aad88..2f98bcd1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExportReqVO.java @@ -133,5 +133,6 @@ public class IssueJobMainExportReqVO { @Schema(description = "允许修改批次") private String allowModifyBatch; - + @Schema(description = "备料计划单号") + private String preparetoissuePlanNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainPageReqVO.java index a11a0941..600433ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainPageReqVO.java @@ -142,4 +142,7 @@ public class IssueJobMainPageReqVO extends PageParam { @Schema(description = "出库库存状态范围") private String outInventoryStatuses; + @Schema(description = "备料计划单号") + private String preparetoissuePlanNumber; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainBaseVO.java index b409f2e5..f010695e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainBaseVO.java @@ -104,4 +104,7 @@ public class IssueRecordMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "备料计划单号") + private String preparetoissuePlanNumber; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExcelVO.java index c10cc77d..30334f84 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExcelVO.java @@ -175,4 +175,7 @@ public class IssueRecordMainExcelVO { @ExcelProperty(value = "计量单位", converter = DictConvert.class) @DictFormat(DictTypeConstants.UOM) private String uom; + + @ExcelProperty("备料计划单号") + private String preparetoissuePlanNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExportReqVO.java index 15e7acfb..7ba56230 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExportReqVO.java @@ -93,4 +93,7 @@ public class IssueRecordMainExportReqVO { @Schema(description = "是否可用") private String available; + @Schema(description = "备料计划单号") + private String preparetoissuePlanNumber; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainPageReqVO.java index e3ffdefe..5d1f47db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainPageReqVO.java @@ -95,4 +95,7 @@ public class IssueRecordMainPageReqVO extends PageParam { @Schema(description = "是否可用") private String available; + @Schema(description = "备料计划单号") + private String preparetoissuePlanNumber; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainBaseVO.java index 4928f5bf..75006122 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainBaseVO.java @@ -97,4 +97,7 @@ public class IssueRequestMainBaseVO { @Schema(description = "直接生成记录") private String directCreateRecord; + @Schema(description = "备料计划单号") + private String preparetoissuePlanNumber; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java index 6adda35e..19111b7f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java @@ -145,5 +145,7 @@ public class IssueRequestMainExcelVO { @ExcelProperty("备注子") private String remarkDetail; + @ExcelProperty("备料计划单号") + private String preparetoissuePlanNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExportReqVO.java index d03cdf35..9d3cc95e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExportReqVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.issueRequest.vo; +import com.alibaba.excel.annotation.ExcelProperty; import lombok.*; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; @@ -86,4 +87,7 @@ public class IssueRequestMainExportReqVO { @Schema(description = "直接生成记录") private String directCreateRecord; + @ExcelProperty("备料计划单号") + private String preparetoissuePlanNumber; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainPageReqVO.java index 06f99c6f..8f3ef2dd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainPageReqVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.issueRequest.vo; +import com.alibaba.excel.annotation.ExcelProperty; import lombok.*; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; @@ -88,4 +89,7 @@ public class IssueRequestMainPageReqVO extends PageParam { @Schema(description = "直接生成记录") private String directCreateRecord; + @ExcelProperty("备料计划单号") + private String preparetoissuePlanNumber; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobMainDO.java index 089efb43..19a93ede 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobMainDO.java @@ -228,4 +228,9 @@ public class IssueJobMainDO extends BaseDO { */ private String outInventoryStatuses; + /** + * 备料计划单号 + */ + private String preparetoissuePlanNumber; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRecord/IssueRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRecord/IssueRecordMainDO.java index ed6d6088..d11b7bc2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRecord/IssueRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRecord/IssueRecordMainDO.java @@ -143,5 +143,8 @@ public class IssueRecordMainDO extends BaseDO { * 是否可用 */ private String available; - + /** + * 备料计划单号 + */ + private String preparetoissuePlanNumber; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java index 791eecad..30a69b44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java @@ -146,5 +146,10 @@ public class IssueRequestMainDO extends BaseDO { */ private String outInventoryStatuses; + /** + * 备料计划单号 + */ + private String preparetoissuePlanNumber; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java index c4de4e34..e5ba6677 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java @@ -48,6 +48,7 @@ public interface IssueRecordMainMapper extends BaseMapperX { .eqIfPresent(IssueRecordMainDO::getToAreaCodes, reqVO.getToAreaCodes()) .eqIfPresent(IssueRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation()) .eqIfPresent(IssueRecordMainDO::getAvailable, reqVO.getAvailable()) + .eqIfPresent(IssueRecordMainDO::getPreparetoissuePlanNumber, reqVO.getPreparetoissuePlanNumber()) .orderByDesc(IssueRecordMainDO::getId)); } default PageResult selectSenior(CustomConditions conditions) { @@ -80,6 +81,7 @@ public interface IssueRecordMainMapper extends BaseMapperX { .eqIfPresent(IssueRecordMainDO::getToAreaCodes, reqVO.getToAreaCodes()) .eqIfPresent(IssueRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation()) .eqIfPresent(IssueRecordMainDO::getAvailable, reqVO.getAvailable()) + .eqIfPresent(IssueRecordMainDO::getPreparetoissuePlanNumber, reqVO.getPreparetoissuePlanNumber()) .orderByDesc(IssueRecordMainDO::getId)); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java index e59cd184..de9c8ee4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java @@ -46,6 +46,7 @@ public interface IssueRequestMainMapper extends BaseMapperX .eqIfPresent(IssueRequestMainDO::getAutoAgree, reqVO.getAutoAgree()) .eqIfPresent(IssueRequestMainDO::getAutoExecute, reqVO.getAutoExecute()) .eqIfPresent(IssueRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()) + .eqIfPresent(IssueRequestMainDO::getPreparetoissuePlanNumber, reqVO.getPreparetoissuePlanNumber()) .orderByDesc(IssueRequestMainDO::getId)); } default PageResult selectSenior(CustomConditions conditions) { @@ -76,6 +77,7 @@ public interface IssueRequestMainMapper extends BaseMapperX .eqIfPresent(IssueRequestMainDO::getAutoAgree, reqVO.getAutoAgree()) .eqIfPresent(IssueRequestMainDO::getAutoExecute, reqVO.getAutoExecute()) .eqIfPresent(IssueRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()) + .eqIfPresent(IssueRequestMainDO::getPreparetoissuePlanNumber, reqVO.getPreparetoissuePlanNumber()) .orderByDesc(IssueRequestMainDO::getId)); } 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 a50d03ae..50c71523 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 @@ -316,7 +316,7 @@ public class IssueJobMainServiceImpl implements IssueJobMainService { transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(issueRecordMainDO.getBusinessType()); - transactionCreateReqVO.setOwnerCode(issueRecordDetailDO.getFromOwnerCode()); + transactionCreateReqVO.setOwnerCode(issueRecordDetailDO.getToOwnerCode()); transactionCreateReqVO.setRecordNumber(number); transactionCreateReqVO.setId(null); transactionCreateReqVO.setPackingNumber(issueRecordDetailDO.getToPackingNumber()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java index c8eba4b9..eadd9da7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java @@ -644,6 +644,7 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService { for(String mapKey : listMap.keySet()) { // 任务主表信息 IssueJobMainDO issueJobMainDO = new IssueJobMainDO(); + issueJobMainDO.setPreparetoissuePlanNumber(mainDO.getNumber()); issueJobMainDO.setRequestNumber(mainDO.getNumber()); issueJobMainDO.setWorkShopCode(mainDO.getWorkshopCode()); issueJobMainDO.setUseOnTheWayLocation(mainDO.getUseOnTheWayLocation());