物品基础新增 结算方式

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;
 
 }

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("生效时间")

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;
 

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;

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;
 

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;
+
 }

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);
 }

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<ItembasicDO> 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<ItembasicDO> 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;
+        }
     }
 }