From 983534d3253e65f9d30e6b3a4bc484a0e4ff4fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Sat, 11 May 2024 17:31:39 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countRecord/vo/CountRecordMainRespVO.java | 1 + .../module/eam/controller/item/vo/ItemExcelVO.java | 12 ------------ .../locationarea/LocationAreaController.java | 4 ---- .../countJobDetail/CountJobDetailServiceImpl.java | 2 ++ 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countRecord/vo/CountRecordMainRespVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countRecord/vo/CountRecordMainRespVO.java index cd3788a..952a78a 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countRecord/vo/CountRecordMainRespVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countRecord/vo/CountRecordMainRespVO.java @@ -11,6 +11,7 @@ import java.time.LocalDateTime; @ToString(callSuper = true) public class CountRecordMainRespVO extends CountRecordMainBaseVO { + @Schema(description = "创建时间") private LocalDateTime createTime; } diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemExcelVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemExcelVO.java index 5df107c..8fdc051 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemExcelVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemExcelVO.java @@ -18,9 +18,6 @@ import java.time.LocalDateTime; @Data public class ItemExcelVO { - @ExcelProperty("id") - private Long id; - @ExcelProperty("零件编码") private String number; @@ -66,13 +63,4 @@ public class ItemExcelVO { @ExcelProperty("创建时间") private LocalDateTime createTime; - @ExcelProperty("地点ID") - private String siteId; - - @ExcelProperty("是否可用") - private String available; - - @ExcelProperty("并发乐观锁") - private Integer concurrencyStamp; - } diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/locationarea/LocationAreaController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/locationarea/LocationAreaController.java index ed7b4b4..8211b54 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/locationarea/LocationAreaController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/locationarea/LocationAreaController.java @@ -103,10 +103,6 @@ public class LocationAreaController { } private List getExcelVo(List list, Map mapDropDown) { - String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_AREA_TYPE); - mapDropDown.put(3, type); - String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); - mapDropDown.put(4, available); // 导出 Excel List resultList = LocationAreaConvert.INSTANCE.convertList02(list); return resultList; diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/countJobDetail/CountJobDetailServiceImpl.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/countJobDetail/CountJobDetailServiceImpl.java index 7ee6a61..957eb47 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/countJobDetail/CountJobDetailServiceImpl.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/countJobDetail/CountJobDetailServiceImpl.java @@ -166,6 +166,8 @@ public class CountJobDetailServiceImpl implements CountJobDetailService { if (res) { //如果子表中的库存数量和盘点数量都不同时，盘点调整才能生成 counRecordMainDO.setStatus(AdjustStatusEnum.CANGENERATE.getCode()); + counRecordMainDO.setCreateTime(LocalDateTime.now()); + counRecordMainDO.setUpdateTime(LocalDateTime.now()); countRecordMainMapper.insert(counRecordMainDO); for (CountJobDetailExcelVO data : countJobDetailExcelVOList) { CountRecordDetailDO countRecordDetailDO = new CountRecordDetailDO();