From bc916a5f531928956dccae2720987d461872dca4 Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 16 Apr 2024 15:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=20=20=20?= =?UTF-8?q?=E6=BA=A2=E5=87=BA=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/win/module/wms/enums/ErrorCodeConstants.java | 4 +++- .../wms/controller/itemarea/ItemareaController.java | 12 ++++++------ .../wms/controller/itemarea/vo/ItemareaExcelVO.java | 4 ++++ .../controller/itemarea/vo/ItemareaExportReqVO.java | 6 ++++++ .../wms/controller/itemarea/vo/ItemareaImportVO.java | 5 +++++ .../controller/itemarea/vo/ItemareaPageReqVO.java | 3 +++ .../wms/dal/dataobject/itemarea/ItemareaDO.java | 8 ++++++++ .../wms/dal/mysql/itemarea/ItemareaMapper.java | 3 +++ 8 files changed, 38 insertions(+), 7 deletions(-) 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 99d68c611e..724e85a0fe 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 @@ -1348,6 +1348,8 @@ public interface ErrorCodeConstants { ErrorCode SYSTEM_INSTALL_PACKAGE_IS_EMPTY = new ErrorCode(1_000_322_002, "当前没有安装包数据"); //供应商发货申请质检信息子 ErrorCode SUPPLIERDELIVER_INSPECTION_DETAIL_NOT_EXISTS = new ErrorCode(1_000_323_000, "供应商发货申请质检信息子不存在"); - + ErrorCode SUPPLIERDELIVER_INSPECTION_BATCH_ERROR = new ErrorCode(1_000_323_001, "批次【{}】与供应商批次【{}】不一致"); + //打印标签关联 + ErrorCode PRINT_CORRELATION_NOT_EXISTS = new ErrorCode(1_000_324_000, "打印标签关联不存在"); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/ItemareaController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/ItemareaController.java index 71efe6f640..922b81ee8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/ItemareaController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/ItemareaController.java @@ -142,13 +142,13 @@ public class ItemareaController { private List getExcelVo(List list, Map mapDropDown) { String[] autoRepleinsh = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(7, autoRepleinsh); - mapDropDown.put(10, autoRepleinsh); + mapDropDown.put(8, autoRepleinsh); + mapDropDown.put(12, autoRepleinsh); mapDropDown.put(11, autoRepleinsh); - mapDropDown.put(15, autoRepleinsh); + mapDropDown.put(17, autoRepleinsh); mapDropDown.put(16, autoRepleinsh); String[] manageMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.MANAGEMENT_MODE); - mapDropDown.put(14, manageMode); + mapDropDown.put(15, manageMode); // 导出 List datas = ItemareaConvert.INSTANCE.convertList02(list); return datas; @@ -160,9 +160,9 @@ public class ItemareaController { List list = Arrays.asList(); Map mapDropDown = new HashMap<>(); String[] manageMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.MANAGEMENT_MODE); - mapDropDown.put(3, manageMode); + mapDropDown.put(4, manageMode); String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(6, trueFalse); + mapDropDown.put(8, trueFalse); mapDropDown.put(7, trueFalse); // 输出 ExcelUtils.write(response, "物料库区配置基本信息导入模板.xls", "物料库区配置基本信息列表", ItemareaImportVO.class, list,mapDropDown); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaExcelVO.java index b266314075..9a88405fad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaExcelVO.java @@ -37,6 +37,10 @@ public class ItemareaExcelVO { @Colour(IndexedColors.LIGHT_YELLOW) private String areaCode; + @ExcelProperty(value = "溢出库位") + @Colour(IndexedColors.LIGHT_YELLOW) + private String overflowLocationCode; + @ExcelProperty("入库包装规格") @Colour(IndexedColors.LIGHT_YELLOW) private String inPackUnit; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaExportReqVO.java index 543c2f6889..a4e3945c98 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaExportReqVO.java @@ -21,6 +21,12 @@ public class ItemareaExportReqVO { @Schema(description = "库区代码") private String areaCode; + @Schema(description = "库区类型") + private String areaType; + + @Schema(description = "溢出库位") + private String overflowLocationCode; + @Schema(description = "出库后剩余库存自动转换为出库包装规格") private String surplusToOutpackunit; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaImportVO.java index c1ec013f48..59ad1cb30c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaImportVO.java @@ -6,6 +6,7 @@ import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.annotations.ExcelValid; import com.win.framework.excel.core.convert.DictConvert; import com.win.module.wms.enums.DictTypeConstants; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -41,6 +42,10 @@ public class ItemareaImportVO { @Colour(IndexedColors.LIGHT_YELLOW) private String areaCode; + @ExcelProperty(value = "溢出库位") + @Colour(IndexedColors.LIGHT_YELLOW) + private String overflowLocationCode; + @ExcelProperty(value = "管理精度",converter = DictConvert.class) @DictFormat(DictTypeConstants.MANAGEMENT_MODE) @ExcelValid(message = "必填") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaPageReqVO.java index 0889ca6f9e..9b16950d0b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itemarea/vo/ItemareaPageReqVO.java @@ -26,6 +26,9 @@ public class ItemareaPageReqVO extends PageParam { @Schema(description = "库区类型") private String areaType; + @Schema(description = "溢出库位") + private String overflowLocationCode; + @Schema(description = "出库后剩余库存自动转换为出库包装规格") private String surplusToOutpackunit; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itemarea/ItemareaDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itemarea/ItemareaDO.java index 891beb42ea..a5cb76d036 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itemarea/ItemareaDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itemarea/ItemareaDO.java @@ -1,5 +1,8 @@ package com.win.module.wms.dal.dataobject.itemarea; +import com.alibaba.excel.annotation.ExcelProperty; +import com.win.framework.excel.core.annotations.Colour; +import com.win.framework.excel.core.convert.DictConvert; import lombok.*; import java.util.*; import java.math.BigDecimal; @@ -13,6 +16,7 @@ import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; +import org.apache.poi.ss.usermodel.IndexedColors; /** * 物料库区配置 DO @@ -45,6 +49,10 @@ public class ItemareaDO extends BaseDO { * 区域类型 */ private String areaType; + /** + * 溢出库位 + */ + private String overflowLocationCode; /** * 入库包装规格 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itemarea/ItemareaMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itemarea/ItemareaMapper.java index 5e68ca346f..5add97dc5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itemarea/ItemareaMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itemarea/ItemareaMapper.java @@ -30,6 +30,7 @@ public interface ItemareaMapper extends BaseMapperX { .likeIfPresent(ItemareaDO::getItemCode, reqVO.getItemCode()) .likeIfPresent(ItemareaDO::getAreaCode, reqVO.getAreaCode()) .likeIfPresent(ItemareaDO::getAreaType, reqVO.getAreaType()) + .likeIfPresent(ItemareaDO::getOverflowLocationCode, reqVO.getOverflowLocationCode()) .likeIfPresent(ItemareaDO::getSurplusToOutpackunit, reqVO.getSurplusToOutpackunit()) .likeIfPresent(ItemareaDO::getAllowIssueRequest, reqVO.getAllowIssueRequest()) .likeIfPresent(ItemareaDO::getEmptyLocationFirst, reqVO.getEmptyLocationFirst()) @@ -50,6 +51,8 @@ public interface ItemareaMapper extends BaseMapperX { .eqIfPresent(ItemareaDO::getManageMode, reqVO.getManageMode()) .eqIfPresent(ItemareaDO::getItemCode, reqVO.getItemCode()) .eqIfPresent(ItemareaDO::getAreaCode, reqVO.getAreaCode()) + .eqIfPresent(ItemareaDO::getAreaType, reqVO.getAreaType()) + .eqIfPresent(ItemareaDO::getOverflowLocationCode, reqVO.getOverflowLocationCode()) .eqIfPresent(ItemareaDO::getSurplusToOutpackunit, reqVO.getSurplusToOutpackunit()) .eqIfPresent(ItemareaDO::getAllowIssueRequest, reqVO.getAllowIssueRequest()) .eqIfPresent(ItemareaDO::getEmptyLocationFirst, reqVO.getEmptyLocationFirst())