add device component

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<ErpProductDO> productDOList = productService.selectByCategorys(categorys);
         List<ErpProductRespVO> 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<List<ErpProductRespVO>> getComponentSimpleList() {
+        List<ErpProductRespVO> 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 {

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

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

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<ErpStockInDO> pageResult = stockInService.getStockInPage(pageReqVO);
@@ -186,5 +186,12 @@ public class ErpStockInController {
         PageResult<ErpStockInDO> pageResult = stockInService.getStockInPage(pageReqVO);
         return success(buildStockInVOPageResult(pageResult));
     }
+    @GetMapping("/pageComponent")
+    @Operation(summary = "获得备件入库单分页")
+    public CommonResult<PageResult<ErpStockInRespVO>> pageComponent(@Valid ErpStockInPageReqVO pageReqVO) {
+        pageReqVO.setInType(StockInTypeEnum.生产入库.getValue());
+        PageResult<ErpStockInDO> pageResult = stockInService.getStockInPage(pageReqVO);
+        return success(buildStockInVOPageResult(pageResult));
+    }
 
 }

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 {
 
     其他入库("其他入库"),
-    关键件入库("关键件入库"),
+    备件入库("备件入库"),
     原料入库("原料入库"),
     产品入库("产品入库"),
     生产入库("生产入库");

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

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();
 
     /**

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;