From f8c9b90ce14388e4924d389d578987258b9c57be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 13 Dec 2023 10:26:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=9F=BA=E7=A1=80=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E7=BB=93=E7=AE=97=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itembasic/vo/ItembasicBaseVO.java | 6 ++- .../itembasic/vo/ItembasicExcelVO.java | 39 +++++++++++-------- .../itembasic/vo/ItembasicExportReqVO.java | 3 ++ .../itembasic/vo/ItembasicImportExcelVo.java | 5 +++ .../itembasic/vo/ItembasicPageReqVO.java | 7 ++++ .../dal/dataobject/itembasic/ItembasicDO.java | 5 +++ .../service/itembasic/ItembasicService.java | 7 ++++ .../itembasic/ItembasicServiceImpl.java | 23 +++++++++-- 8 files changed, 74 insertions(+), 21 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java index dbe64353..0be28114 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java @@ -90,6 +90,10 @@ public class ItembasicBaseVO { @Schema(description = "项目") private String project; + @Schema(description = "结算方式") + private String settlementType; + + @Schema(description = "质量等级") private String eqLevel; @@ -109,7 +113,7 @@ public class ItembasicBaseVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime expireTime; - @Schema(description = "备注", example = "你猜") + @Schema(description = "备注") private String remark; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java index 083138ff..959932ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java @@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import com.win.module.wms.enums.DictTypeConstants; import lombok.Data; import java.time.LocalDateTime; @@ -30,77 +31,81 @@ public class ItembasicExcelVO { private String desc2; @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat("item_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.ITEM_STATUS) private String status; @ExcelProperty(value = "计量单位", converter = DictConvert.class) - @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.UOM) private String uom; @ExcelProperty(value = "替代计量单位", converter = DictConvert.class) - @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.UOM) private String altUom; @ExcelProperty(value = "是否标包", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String isStdPack; @ExcelProperty(value = "可采购", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String enableBuy; @ExcelProperty(value = "可制造", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String enableMake; @ExcelProperty(value = "可委外加工", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String enableOutsourcing; @ExcelProperty(value = "回收件", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String isRecycled; @ExcelProperty(value = "虚零件", converter = DictConvert.class) - @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.TRUE_FALSE) private String isPhantom; @ExcelProperty(value = "ABC类", converter = DictConvert.class) - @DictFormat("abc_class") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.ABC_CLASS) private String abcClass; @ExcelProperty(value = "类型", converter = DictConvert.class) - @DictFormat("item_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.ITEM_TYPE) private String type; @ExcelProperty(value = "种类", converter = DictConvert.class) - @DictFormat("Item_category") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.ITEM_CATEGORY) private String category; @ExcelProperty(value = "分组", converter = DictConvert.class) - @DictFormat("item_group") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.ITEM_GROUP) private String itemGroup; @ExcelProperty(value = "颜色", converter = DictConvert.class) - @DictFormat("item_color") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.ITEM_COLOR) private String color; @ExcelProperty(value = "配置", converter = DictConvert.class) - @DictFormat("item_configuration") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.ITEM_CONFIGURATION) private String configuration; @ExcelProperty("项目") private String project; + @ExcelProperty(value = "结算方式", converter = DictConvert.class) + @DictFormat(DictTypeConstants.SETTLEMENT_TYPE) + private String settlementType; + @ExcelProperty(value = "质量等级", converter = DictConvert.class) - @DictFormat("eq_level") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + @DictFormat(DictTypeConstants.EQ_LEVEL) private String eqLevel; @ExcelProperty("有效天数") private Integer validityDays; @ExcelProperty(value = "是否可用", converter = DictConvert.class) - @DictFormat("true_false") + @DictFormat(DictTypeConstants.TRUE_FALSE) private String available; @ExcelProperty("生效时间") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExportReqVO.java index b96dbf91..c53c0792 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExportReqVO.java @@ -72,6 +72,9 @@ public class ItembasicExportReqVO { @Schema(description = "项目") private String project; + @Schema(description = "结算方式") + private String settlementType; + @Schema(description = "质量等级") private String eqLevel; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicImportExcelVo.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicImportExcelVo.java index 926c8816..b9587691 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicImportExcelVo.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicImportExcelVo.java @@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.win.framework.excel.core.annotations.DictFormat; 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.Builder; import lombok.Data; @@ -95,6 +96,10 @@ public class ItembasicImportExcelVo { @ExcelProperty(value = "项目") private String project; + @ExcelProperty(value = "结算方式", converter = DictConvert.class) + @DictFormat(DictTypeConstants.SETTLEMENT_TYPE) + private String settlementType; + @ExcelProperty(value = "质量等级", converter = DictConvert.class) @DictFormat(DictTypeConstants.EQ_LEVEL) private String eqLevel; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicPageReqVO.java index 44f8a0b8..3ed4ce1c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicPageReqVO.java @@ -1,6 +1,10 @@ package com.win.module.wms.controller.itembasic.vo; +import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.common.pojo.PageParam; +import com.win.framework.excel.core.annotations.DictFormat; +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.Data; import lombok.EqualsAndHashCode; @@ -77,6 +81,9 @@ public class ItembasicPageReqVO extends PageParam { @Schema(description = "项目") private String project; + @Schema(description = "结算方式") + private String settlementType; + @Schema(description = "质量等级") private String eqLevel; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java index b3307dbc..061aade8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java @@ -190,4 +190,9 @@ public class ItembasicDO extends BaseDO { */ private String siteId; + /** + * 结算方式 + */ + private String settlementType; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java index b11d11af..a5f01c03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java @@ -115,4 +115,11 @@ public interface ItembasicService { * @return */ public Boolean isOfflines(String code); + + /** + * 判断 物品 是否为上线结算物品 + * @param code + * @return + */ + public Boolean isOnlines(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java index b7534930..f1079723 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java @@ -365,10 +365,27 @@ public class ItembasicServiceImpl implements ItembasicService { public Boolean isOfflines(String code) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("code",code); + queryWrapper.eq("settlement_type","OFFLINE"); + queryWrapper.eq("available","TRUE"); + ItembasicDO itembasicDO = itembasicMapper.selectOne(queryWrapper); + if (itembasicDO != null) { + return true; + } else { + return false; + } + } + + @Override + public Boolean isOnlines(String code) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("code",code); + queryWrapper.eq("settlement_type","ONLINE"); queryWrapper.eq("available","TRUE"); -// queryWrapper.eq("status","ENABLE"); ItembasicDO itembasicDO = itembasicMapper.selectOne(queryWrapper); - // TODO: 如何判断是否 下线结算件 - return false; + if (itembasicDO != null) { + return true; + } else { + return false; + } } }