From 8bf81f14161db35a71742097cc5daba7ad664bd1 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Fri, 9 Aug 2024 23:40:39 +0800 Subject: [PATCH] add device component --- .../admin/product/ErpProductController.java | 15 ++++++++++----- .../product/vo/product/ErpProductRespVO.java | 3 +++ .../product/vo/product/ProductSaveReqVO.java | 2 ++ .../admin/stock/ErpStockInController.java | 9 ++++++++- .../admin/stock/vo/in/StockInTypeEnum.java | 2 +- .../erp/dal/dataobject/product/ErpProductDO.java | 4 ++++ .../erp/framework/bean/ProductTypeEnum.java | 3 +-- .../admin/machine/vo/MachineTypeEnum.java | 3 ++- 8 files changed, 31 insertions(+), 10 deletions(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java index be34e8c0fa..73b6c0e3e2 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java @@ -124,10 +124,6 @@ public class ErpProductController { categorys.add(caDO.getId().intValue()); } } -// categorys.add(ProductTypeEnum.ITEM.getTypeId()); -// categorys.add(ProductTypeEnum.TOOL.getTypeId()); -// categorys.add(ProductTypeEnum.HAOCAI.getTypeId()); -// categorys.add(ProductTypeEnum.GUANJJ.getTypeId()); List productDOList = productService.selectByCategorys(categorys); List list = productService.buildProductVOList(productDOList); @@ -137,9 +133,18 @@ public class ErpProductController { .setUnitId(product.getUnitId()).setUnitName(product.getUnitName()) .setPurchasePrice(product.getPurchasePrice()).setSalePrice(product.getSalePrice()).setMinPrice(product.getMinPrice()))); } + @GetMapping("/simple-list-component") + @Operation(summary = "获得备件精简列表", description = "用于前端的下拉选项") + public CommonResult> getComponentSimpleList() { + List list = productService.getProductVOListByCategory(ProductTypeEnum.BEIJIAN.getTypeId()); + return success(convertList(list, product -> new ErpProductRespVO().setId(product.getId()) + .setName(product.getName()).setBarCode(product.getBarCode()) + .setCategoryId(product.getCategoryId()).setCategoryName(product.getCategoryName()) + .setUnitId(product.getUnitId()).setUnitName(product.getUnitName()) + .setPurchasePrice(product.getPurchasePrice()).setSalePrice(product.getSalePrice()).setMinPrice(product.getMinPrice()))); + } @GetMapping("/export-excel") @Operation(summary = "导出产品 Excel") - //@PreAuthorize("@ss.hasPermission('erp:product:export')") @ApiAccessLog(operateType = EXPORT) public void exportProductExcel(@Valid ErpProductPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductRespVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductRespVO.java index 9be9bc2559..8483eef6ca 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductRespVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductRespVO.java @@ -73,4 +73,7 @@ public class ErpProductRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + @Schema(description = "预警库存", example = "161.87") + @ExcelProperty("预警库存") + private BigDecimal safetyNumber; } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSaveReqVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSaveReqVO.java index cd34e88d9f..01325d92b4 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSaveReqVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSaveReqVO.java @@ -55,4 +55,6 @@ public class ProductSaveReqVO { @Schema(description = "最低价格，单位：元", example = "161.87") private BigDecimal minPrice; + @Schema(description = "预警库存", example = "161.87") + private BigDecimal safetyNumber; } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java index 01bd5bf450..ae48435faf 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java @@ -126,7 +126,7 @@ public class ErpStockInController { list.add(StockInTypeEnum.产品入库.getValue()); list.add(StockInTypeEnum.其他入库.getValue()); list.add(StockInTypeEnum.原料入库.getValue()); - list.add(StockInTypeEnum.关键件入库.getValue()); + list.add(StockInTypeEnum.备件入库.getValue()); pageReqVO.setInTypeList(list); } PageResult pageResult = stockInService.getStockInPage(pageReqVO); @@ -186,5 +186,12 @@ public class ErpStockInController { PageResult pageResult = stockInService.getStockInPage(pageReqVO); return success(buildStockInVOPageResult(pageResult)); } + @GetMapping("/pageComponent") + @Operation(summary = "获得备件入库单分页") + public CommonResult> pageComponent(@Valid ErpStockInPageReqVO pageReqVO) { + pageReqVO.setInType(StockInTypeEnum.生产入库.getValue()); + PageResult pageResult = stockInService.getStockInPage(pageReqVO); + return success(buildStockInVOPageResult(pageResult)); + } } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/StockInTypeEnum.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/StockInTypeEnum.java index 27725d1470..9b9a3073eb 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/StockInTypeEnum.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/StockInTypeEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; public enum StockInTypeEnum { 其他入库("其他入库"), - 关键件入库("关键件入库"), + 备件入库("备件入库"), 原料入库("原料入库"), 产品入库("产品入库"), 生产入库("生产入库"); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductDO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductDO.java index 31e4aa2d9a..90b4111379 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductDO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductDO.java @@ -83,4 +83,8 @@ public class ErpProductDO extends BaseDO { */ private BigDecimal minPrice; + /** + * 预警库存 + */ + private BigDecimal safetyNumber; } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/bean/ProductTypeEnum.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/bean/ProductTypeEnum.java index 8273645bb6..ba02994a74 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/bean/ProductTypeEnum.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/bean/ProductTypeEnum.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.erp.framework.bean; -import cn.hutool.core.util.ObjUtil; import cn.iocoder.yudao.framework.common.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; @@ -15,7 +14,7 @@ public enum ProductTypeEnum implements IntArrayValuable { PRODUCT(2, "产品"), TOOL(3, "工具"), HAOCAI(4, "耗材"), - GUANJJ(5, "关键件"); + BEIJIAN(5, "备件"); public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ProductTypeEnum::getTypeId).toArray(); /** diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/vo/MachineTypeEnum.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/vo/MachineTypeEnum.java index ae5e8ccba6..963d7d178d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/vo/MachineTypeEnum.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/vo/MachineTypeEnum.java @@ -10,7 +10,8 @@ public enum MachineTypeEnum { 产线(1), 机台(2), - 关键件(3); + 关键件(3), + 其他(4); private final Integer value;