Browse Source

BUG修改

master
parent
commit
983534d325
  1. 1
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countRecord/vo/CountRecordMainRespVO.java
  2. 12
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/vo/ItemExcelVO.java
  3. 4
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/locationarea/LocationAreaController.java
  4. 2
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/countJobDetail/CountJobDetailServiceImpl.java

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

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

4
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<LocationAreaExcelVO> getExcelVo(List<LocationAreaDO> list, Map<Integer, String[]> 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<LocationAreaExcelVO> resultList = LocationAreaConvert.INSTANCE.convertList02(list);
return resultList;

2
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();

Loading…
Cancel
Save