diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java index 1b392eda..f7af8012 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java @@ -97,7 +97,6 @@ public class CountPlanMainController { PageResult result = CountPlanMainConvert.INSTANCE.convertPage(pageResult); for(CountPlanMainRespVO vo : result.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } return success(result); @@ -112,7 +111,6 @@ public class CountPlanMainController { List datas = CountPlanMainConvert.INSTANCE.convertList02(list); for(CountPlanMainExcelVO vo : datas) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } ExcelUtils.write(response, "盘点计划主.xlsx", "数据", CountPlanMainExcelVO.class, datas); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainImportErrorVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainImportErrorVO.java new file mode 100644 index 00000000..10393bee --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainImportErrorVO.java @@ -0,0 +1,18 @@ +package com.win.module.wms.controller.countPlan.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + + +/** + * 盘点计划主 Excel VO + * + * @author 超级管理员 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class CountPlanMainImportErrorVO extends CountPlanMainImportVO { + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainImportVO.java new file mode 100644 index 00000000..ccce235e --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainImportVO.java @@ -0,0 +1,101 @@ +package com.win.module.wms.controller.countPlan.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.win.framework.excel.core.annotations.DictFormat; +import com.win.framework.excel.core.convert.DictConvert; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * 盘点计划主 Excel VO + * + * @author 超级管理员 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Accessors(chain = false) // 设置 chain = false,避免用户导入有问题 +public class CountPlanMainImportVO { + + @ExcelProperty(value = "盘点类型", converter = DictConvert.class) + @DictFormat("count_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中 + private String type; + + @ExcelProperty("执行周期") + private String crontab; + + @ExcelProperty(value = "维度", converter = DictConvert.class) + @DictFormat("count_dimension") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中 + private String dimension; + + @ExcelProperty("限值") + private BigDecimal limitedValue; + + @ExcelProperty("物品忽略名单") + private String ignoreListOfItem; + + @ExcelProperty("库位忽略名单") + private String ignoreListOfLocation; + + @ExcelProperty("盘点范围列表") + private String scopeList; + + @ExcelProperty("单据号") + private String number; + + @ExcelProperty("业务类型") + private String businessType; + + @ExcelProperty("备注") + private String remark; + + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("创建者用户名") + private String creator; + + @ExcelProperty("开始时间") + private LocalDateTime beginTime; + + @ExcelProperty("结束时间") + private LocalDateTime endTime; + + @ExcelProperty(value = "状态", converter = DictConvert.class) + @DictFormat("plan_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中 + private String status; + + @ExcelProperty("最后更新时间") + private LocalDateTime updateTime; + + @ExcelProperty("最后更新者用户名") + private String updater; + + @ExcelProperty("快照盘点") + private String isSnapshot; + + @ExcelProperty("冻结盘点") + private String isFreeze; + + @ExcelProperty("盘点空库位") + private String isCountEmptyLocation; + + @ExcelProperty("盘点零库存") + private String isCountZeroInventory; + + @ExcelProperty("盘点负库存") + private String isCountNegativeInventory; + + @ExcelProperty("明盘") + private String isOpenCount; + + @ExcelProperty("是否可用") + private String available; + +} 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 b7909ccf..0135f95c 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 @@ -102,7 +102,6 @@ public class CountRequestMainController { PageResult result = CountRequestMainConvert.INSTANCE.convertPage(pageResult); for(CountRequestMainRespVO vo : result.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } return success(result); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java index 813f786d..f5058c38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java @@ -1,15 +1,12 @@ package com.win.module.wms.controller.countRequest.vo; +import com.win.framework.excel.core.annotations.OnlyOne; 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 javax.validation.constraints.*; +import lombok.Data; 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; /** @@ -25,6 +22,7 @@ public class CountRequestMainBaseVO { @Schema(description = "申请单号") private String requestNumber; + @OnlyOne @Schema(description = "计划单号") private String planNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainCreateReqVO.java index db3789f7..bca09599 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainCreateReqVO.java @@ -13,6 +13,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class CountRequestMainCreateReqVO extends CountRequestMainBaseVO { + @SubObject @Schema(description = "子表数据") private List subList;