diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/adjustRecord/AdjustRecordMainController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/adjustRecord/AdjustRecordMainController.java index b8db351..4702603 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/adjustRecord/AdjustRecordMainController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/adjustRecord/AdjustRecordMainController.java @@ -29,7 +29,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备件盘点调整记录主") @RestController -@RequestMapping("/eam/adjustRecordMain") +@RequestMapping("/eam/item/adjustRecordMain") @Validated public class AdjustRecordMainController { diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countJob/CountJobMainController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countJob/CountJobMainController.java index 4786e3f..d4498ff 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countJob/CountJobMainController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countJob/CountJobMainController.java @@ -33,7 +33,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备件盘点任务主") @RestController -@RequestMapping("/eam/countJobMain") +@RequestMapping("/eam/item/countJobMain") @Validated public class CountJobMainController { diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countRecord/CountRecordMainController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countRecord/CountRecordMainController.java index 4f21ee6..c9bb7d3 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countRecord/CountRecordMainController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countRecord/CountRecordMainController.java @@ -29,7 +29,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备件盘点记录主") @RestController -@RequestMapping("/eam/countRecordMain") +@RequestMapping("/eam/item/countRecordMain") @Validated public class CountRecordMainController { diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/CountadjustPlanController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/CountadjustPlanController.java index 625183b..8e553b1 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/CountadjustPlanController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/countadjustPlan/CountadjustPlanController.java @@ -29,7 +29,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备件盘点计划") @RestController -@RequestMapping("/eam/countadjust-plan") +@RequestMapping("/eam/item/countadjust-plan") @Validated public class CountadjustPlanController { diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/ItemController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/ItemController.java index e7ebe88..d314597 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/ItemController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/item/ItemController.java @@ -33,7 +33,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备件") @RestController -@RequestMapping("/eam/item") +@RequestMapping("/eam/basic/item") @Validated public class ItemController { diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemaccounts/ItemAccountsController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemaccounts/ItemAccountsController.java index 9dbc381..ceb520d 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemaccounts/ItemAccountsController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemaccounts/ItemAccountsController.java @@ -42,7 +42,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备件台账") @RestController -@RequestMapping("/eam/item-accounts") +@RequestMapping("/eam/item/item-accounts") @Validated public class ItemAccountsController { diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemaccounts/vo/ItemAccountsPageReqVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemaccounts/vo/ItemAccountsPageReqVO.java index 6714079..f6599fb 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemaccounts/vo/ItemAccountsPageReqVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemaccounts/vo/ItemAccountsPageReqVO.java @@ -24,4 +24,10 @@ public class ItemAccountsPageReqVO extends PageParam { @Schema(description = "库位类型") private String type; + @Schema(description = "库位编号") + private String locationNumber; + + @Schema(description = "库区编号") + private String areaNumber; + } diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/iteminlocation/ItemInLocationController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/iteminlocation/ItemInLocationController.java index a518429..4fb7267 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/iteminlocation/ItemInLocationController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/iteminlocation/ItemInLocationController.java @@ -34,7 +34,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备件入库记录") @RestController -@RequestMapping("/eam/item-in-location") +@RequestMapping("/eam/item/item-in-location") @Validated public class ItemInLocationController { diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/ItemLocationReplaceController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/ItemLocationReplaceController.java index cd21e18..25e8c71 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/ItemLocationReplaceController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/ItemLocationReplaceController.java @@ -30,7 +30,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备件库位变更记录") @RestController -@RequestMapping("/eam/item-location-replace") +@RequestMapping("/eam/item/item-location-replace") @Validated public class ItemLocationReplaceController { diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/vo/ItemLocationReplaceBaseVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/vo/ItemLocationReplaceBaseVO.java index dba53b5..7a23742 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/vo/ItemLocationReplaceBaseVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/vo/ItemLocationReplaceBaseVO.java @@ -30,4 +30,7 @@ public class ItemLocationReplaceBaseVO { @NotNull(message = "变更后备件编码不能为空") private String itemNumber; + @Schema(description = "库存类型") + private String type; + } diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/vo/ItemLocationReplaceExcelVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/vo/ItemLocationReplaceExcelVO.java index e9a3ab2..58677c7 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/vo/ItemLocationReplaceExcelVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemlocationreplace/vo/ItemLocationReplaceExcelVO.java @@ -25,6 +25,9 @@ public class ItemLocationReplaceExcelVO { @ExcelProperty("变更后备件编码") private String itemNumber; + @ExcelProperty("库存类型") + private String type; + @ExcelProperty("创建时间") private LocalDateTime createTime; diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemoutlocation/ItemOutLocationController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemoutlocation/ItemOutLocationController.java index fab3cb5..aed1975 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemoutlocation/ItemOutLocationController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/itemoutlocation/ItemOutLocationController.java @@ -36,7 +36,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备件出库记录") @RestController -@RequestMapping("/eam/item-out-location") +@RequestMapping("/eam/item/item-out-location") @Validated public class ItemOutLocationController { diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/LocationController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/LocationController.java index 614ce90..a70fa64 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/LocationController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/LocationController.java @@ -33,7 +33,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 库位") @RestController -@RequestMapping("/eam/location") +@RequestMapping("/eam/basic/location") @Validated public class LocationController { 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 8c609c5..ed7b4b4 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 @@ -33,7 +33,7 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 库区") @RestController -@RequestMapping("/eam/location-area") +@RequestMapping("/eam/basic/location-area") @Validated public class LocationAreaController { diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/TransactionController.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/TransactionController.java index 4e33747..cc34dee 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/TransactionController.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/TransactionController.java @@ -5,9 +5,14 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.eam.controller.item.vo.ItemPageReqVO; +import com.win.module.eam.controller.item.vo.ItemRespVO; import com.win.module.eam.controller.transaction.vo.*; +import com.win.module.eam.convert.item.ItemConvert; import com.win.module.eam.convert.transaction.TransactionConvert; +import com.win.module.eam.dal.dataobject.item.ItemDO; import com.win.module.eam.dal.dataobject.transaction.TransactionDO; +import com.win.module.eam.service.item.ItemService; import com.win.module.eam.service.transaction.TransactionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -29,13 +34,16 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 库存事务") @RestController -@RequestMapping("/eam/transaction") +@RequestMapping("/eam/item/transaction") @Validated public class TransactionController { @Resource private TransactionService Service; + @Resource + private ItemService itemService; + @PostMapping("/create") @Operation(summary = "创建库存事务") @PreAuthorize("@ss.hasPermission('item:transaction:create')") @@ -115,4 +123,19 @@ public class TransactionController { return success(result); } + + /** + * 库存预警 + * @param pageVO + * @return + */ + @GetMapping("/warningPage") + @Operation(summary = "获得备件分页") +// @PreAuthorize("@ss.hasPermission('basic:item:query')") + public CommonResult> getItemWarningPage(@Valid ItemPageReqVO pageVO) { + PageResult pageResult = itemService.getWarningPage(pageVO); + return success(ItemConvert.INSTANCE.convertPage(pageResult)); + } + + } diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/dataobject/itemlocationreplace/ItemLocationReplaceDO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/dataobject/itemlocationreplace/ItemLocationReplaceDO.java index cd99b36..bdbf575 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/dataobject/itemlocationreplace/ItemLocationReplaceDO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/dataobject/itemlocationreplace/ItemLocationReplaceDO.java @@ -53,4 +53,9 @@ public class ItemLocationReplaceDO extends BaseDO { */ private Integer concurrencyStamp; + /** + * 库存类型 + */ + private String type; + } diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/itemaccounts/ItemAccountsMapper.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/itemaccounts/ItemAccountsMapper.java index 6ff581d..d513ce5 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/itemaccounts/ItemAccountsMapper.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/dal/mysql/itemaccounts/ItemAccountsMapper.java @@ -232,7 +232,10 @@ public interface ItemAccountsMapper extends BaseMapperX { default PageResult selectPage(ItemAccountsPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ItemAccountsDO::getItemNumber, reqVO.getItemNumber()) + .likeIfPresent(ItemAccountsDO::getItemNumber, reqVO.getItemNumber()) + .likeIfPresent(ItemAccountsDO::getLocationNumber, reqVO.getLocationNumber()) + .likeIfPresent(ItemAccountsDO::getAreaNumber, reqVO.getAreaNumber()) + .eqIfPresent(ItemAccountsDO::getType, reqVO.getType()) .eqIfPresent(ItemAccountsDO::getAvailable, reqVO.getAvailable()) .orderByDesc(ItemAccountsDO::getId)); } diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemaccounts/ItemAccountsServiceImpl.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemaccounts/ItemAccountsServiceImpl.java index e8ccb4a..c8c5f49 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemaccounts/ItemAccountsServiceImpl.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemaccounts/ItemAccountsServiceImpl.java @@ -327,24 +327,6 @@ public class ItemAccountsServiceImpl implements ItemAccountsService { itemAccountsDO.setName(itemDO.getName()); itemAccountsDO.setBrand(itemDO.getBrand()); itemAccountsDO.setSpecifications(itemDO.getSpecifications()); -// itemAccountsDO.setIsConstant(itemDO.getIsConstant()); -// itemAccountsDO.setIsOverall(itemDO.getIsOverall()); -// itemAccountsDO.setSubject(itemDO.getSubject()); -// itemAccountsDO.setSubjectCode(itemDO.getSubjectCode()); -// itemAccountsDO.setRegion(itemDO.getRegion()); -// itemAccountsDO.setClassification(itemDO.getClassification()); -// itemAccountsDO.setUom(itemDO.getUom()); -// itemAccountsDO.setSinglePrice(itemDO.getSinglePrice()); -// itemAccountsDO.setReprocurement(itemDO.getReprocurement()); -// itemAccountsDO.setSafetyStock(itemDO.getSafetyStock()); -// itemAccountsDO.setCost(itemDO.getCost()); -// itemAccountsDO.setPurchaser(itemDO.getPurchaser()); -// itemAccountsDO.setFinancer(itemDO.getFinancer()); -// itemAccountsDO.setIsFramework(itemDO.getIsFramework()); -// itemAccountsDO.setIsRadeIn(itemDO.getIsRadeIn()); -// itemAccountsDO.setPurchaseTime(itemDO.getPurchaseTime()); -// itemAccountsDO.setStockAge(itemDO.getStockAge()); -// itemAccountsDO.setCategory(itemDO.getCategory()); itemAccountsDO.setDescribes(itemDO.getDescribes()); } } @@ -522,6 +504,7 @@ public class ItemAccountsServiceImpl implements ItemAccountsService { itemLocationReplaceDO.setOldItemNumber(itemAccountsDO.getItemNumber()); itemLocationReplaceDO.setLocationNumber(accountsDO.getLocationNumber()); itemLocationReplaceDO.setCreateTime(LocalDateTime.now()); + itemLocationReplaceDO.setType(itemAccountsDO.getType()); itemLocationReplaceMapper.insert(itemLocationReplaceDO); en.setItemNumber(accountsDO.getItemNumber()); //库位中新的备件数量是0