src/main/java/com/ruoyi/common/enums/StockRecordTypeEnum.java
@@ -9,15 +9,17 @@ */ @Getter public enum StockRecordTypeEnum implements BaseEnum { CUSTOMIZATION_STOCK_IN(0, "自定义入库"), CUSTOMIZATION_STOCK_OUT(1, "自定义出库"), CUSTOMIZATION_STOCK_IN(0, "合格自定义入库"), CUSTOMIZATION_STOCK_OUT(1, "合格自定义出库"), PRODUCTION_REPORT_STOCK_IN(2, "生产报工-入库"), PRODUCTION_REPORT_STOCK_OUT(3, "生产报工-出库"), PRODUCTION_SCRAP(4, "生产报工-报废"), DEFECTIVE_SCRAP(5, "不合格处理-报废"), DEFECTIVE_PASS(6, "不合格处理-让步放行"), PURCHASE_STOCK_IN(7, "采购-入库"), SALE_STOCK_OUT(8, "销售-出库"); SALE_STOCK_OUT(8, "销售-出库"), CUSTOMIZATION_UNSTOCK_IN(9, "不合格自定义入库"), CUSTOMIZATION_UNSTOCK_OUT(10, "不合格自定义出库"); private final Integer code; private final String value; src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -44,10 +44,10 @@ * @param recordType * @param recordId */ public void addUnStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) { public void addUnStock(Long productModelId, BigDecimal quantity, Integer recordType,Long recordId) { StockUninventoryDto stockUninventoryDto = new StockUninventoryDto(); stockUninventoryDto.setRecordId(recordId); stockUninventoryDto.setRecordType(recordType); stockUninventoryDto.setRecordType(String.valueOf(recordType)); stockUninventoryDto.setQualitity(quantity); stockUninventoryDto.setProductModelId(productModelId); stockUninventoryService.addStockUninventory(stockUninventoryDto); @@ -60,10 +60,10 @@ * @param recordType * @param recordId */ public void subtractUnStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) { public void subtractUnStock(Long productModelId, BigDecimal quantity, Integer recordType,Long recordId) { StockUninventoryDto stockUninventoryDto = new StockUninventoryDto(); stockUninventoryDto.setRecordId(recordId); stockUninventoryDto.setRecordType(recordType); stockUninventoryDto.setRecordType(String.valueOf(recordType)); stockUninventoryDto.setQualitity(quantity); stockUninventoryDto.setProductModelId(productModelId); stockUninventoryService.subtractStockUninventory(stockUninventoryDto); @@ -76,10 +76,10 @@ * @param recordType * @param recordId */ public void addStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) { public void addStock(Long productModelId, BigDecimal quantity, Integer recordType,Long recordId) { StockInventoryDto stockInventoryDto = new StockInventoryDto(); stockInventoryDto.setRecordId(recordId); stockInventoryDto.setRecordType(recordType); stockInventoryDto.setRecordType(String.valueOf(recordType)); stockInventoryDto.setQualitity(quantity); stockInventoryDto.setProductModelId(productModelId); stockInventoryService.addstockInventory(stockInventoryDto); @@ -92,10 +92,10 @@ * @param recordType * @param recordId */ public void substractStock(Long productModelId, BigDecimal quantity, String recordType,Long recordId) { public void substractStock(Long productModelId, BigDecimal quantity, Integer recordType,Long recordId) { StockInventoryDto stockInventoryDto = new StockInventoryDto(); stockInventoryDto.setRecordId(recordId); stockInventoryDto.setRecordType(recordType); stockInventoryDto.setRecordType(String.valueOf(recordType)); stockInventoryDto.setQualitity(quantity); stockInventoryDto.setProductModelId(productModelId); stockInventoryService.subtractStockInventory(stockInventoryDto); src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.enums.StockRecordTypeEnum; import com.ruoyi.framework.web.domain.R; import com.ruoyi.stock.dto.StockInventoryDto; import com.ruoyi.stock.pojo.StockInventory; @@ -40,7 +41,7 @@ @PostMapping("/addstockInventory") @ApiOperation("新增库存") public R addstockInventory(StockInventoryDto stockInventoryDto) { stockInventoryDto.setRecordType("合格自定义入库"); stockInventoryDto.setRecordType(String.valueOf(StockRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode())); stockInventoryDto.setRecordId(0L); return R.ok(stockInventoryService.addstockInventory(stockInventoryDto)); } @@ -49,7 +50,7 @@ @PostMapping("/subtractStockInventory") @ApiOperation("扣减库存") public R subtractStockInventory(StockInventoryDto stockInventoryDto) { stockInventoryDto.setRecordType("合格自定义出库库"); stockInventoryDto.setRecordType(String.valueOf(StockRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode())); stockInventoryDto.setRecordId(0L); return R.ok(stockInventoryService.subtractStockInventory(stockInventoryDto)); } src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.enums.StockRecordTypeEnum; import com.ruoyi.framework.web.domain.R; import com.ruoyi.stock.dto.StockInventoryDto; import com.ruoyi.stock.dto.StockUninventoryDto; @@ -38,7 +39,7 @@ @PostMapping("/addstockUninventory") @ApiOperation("新增库存") public R addstockUninventory(StockUninventoryDto stockUninventoryDto) { stockUninventoryDto.setRecordType("不合格自定义入库"); stockUninventoryDto.setRecordType(String.valueOf(StockRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode())); stockUninventoryDto.setRecordId(0L); return R.ok(stockUninventoryService.addStockUninventory(stockUninventoryDto)); } @@ -47,7 +48,7 @@ @PostMapping("/subtractstockUninventory") @ApiOperation("扣减库存") public R subtractstockUninventory(StockUninventoryDto stockUninventoryDto) { stockUninventoryDto.setRecordType("不合格自定义出库"); stockUninventoryDto.setRecordType(String.valueOf(StockRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode())); stockUninventoryDto.setRecordId(0L); return R.ok(stockUninventoryService.subtractStockUninventory(stockUninventoryDto)); }
