fix stock category

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierService.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
 
 import javax.validation.Valid;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -72,6 +73,7 @@ public interface ErpSupplierService {
      * @return 供应商 Map
      */
     default Map<Long, ErpSupplierDO> getSupplierMap(Collection<Long> ids) {
+        if(ids.isEmpty())return new HashMap<>();
         return convertMap(getSupplierList(ids), ErpSupplierDO::getId);
     }
 

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java

@@ -65,7 +65,7 @@ public class ErpStockInServiceImpl implements ErpStockInService {
         // 1.1 校验入库项的有效性
         List<ErpStockInItemDO> stockInItems = validateStockInItems(createReqVO.getItems());
         // 1.2 校验供应商
-        supplierService.validateSupplier(createReqVO.getSupplierId());
+        //supplierService.validateSupplier(createReqVO.getSupplierId());
         // 1.3 生成入库单号，并校验唯一性
         String no = noRedisDAO.generate(ErpNoRedisDAO.STOCK_IN_NO_PREFIX);
         if (stockInMapper.selectByNo(no) != null) {
@@ -93,7 +93,7 @@ public class ErpStockInServiceImpl implements ErpStockInService {
             throw exception(STOCK_IN_UPDATE_FAIL_APPROVE, stockIn.getNo());
         }
         // 1.2 校验供应商
-        supplierService.validateSupplier(updateReqVO.getSupplierId());
+        //supplierService.validateSupplier(updateReqVO.getSupplierId());
         // 1.3 校验入库项的有效性
         List<ErpStockInItemDO> stockInItems = validateStockInItems(updateReqVO.getItems());
 

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockRecordServiceImpl.java

@@ -42,7 +42,7 @@ public class ErpStockRecordServiceImpl implements ErpStockRecordService {
     @Transactional(rollbackFor = Exception.class)
     public void createStockRecord(ErpStockRecordCreateReqBO createReqBO) {
         // 1. 更新库存
-        BigDecimal totalCount = stockService.updateStockCountIncrement(
+        BigDecimal totalCount = stockService.updateStockCountIncrement(createReqBO.getCategoryId(),
                 createReqBO.getProductId(), createReqBO.getWarehouseId(), createReqBO.getCount());
         // 2. 创建库存明细
         ErpStockRecordDO stockRecord = BeanUtils.toBean(createReqBO, ErpStockRecordDO.class)

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockService.java

@@ -56,6 +56,6 @@ public interface ErpStockService {
      * @param count 增量数量：正数，表示增加；负数，表示减少
      * @return 更新后的库存
      */
-    BigDecimal updateStockCountIncrement(Long productId, Long warehouseId, BigDecimal count);
+    BigDecimal updateStockCountIncrement(Long categoryId, Long productId, Long warehouseId, BigDecimal count);
 
 }

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockServiceImpl.java

@@ -61,11 +61,12 @@ public class ErpStockServiceImpl implements ErpStockService {
     }
 
     @Override
-    public BigDecimal updateStockCountIncrement(Long productId, Long warehouseId, BigDecimal count) {
+    public BigDecimal updateStockCountIncrement(Long categoryId,Long productId, Long warehouseId, BigDecimal count) {
         // 1.1 查询当前库存
         ErpStockDO stock = stockMapper.selectByProductIdAndWarehouseId(productId, warehouseId);
         if (stock == null) {
             stock = new ErpStockDO().setProductId(productId).setWarehouseId(warehouseId).setCount(BigDecimal.ZERO);
+            stock.setCategoryId(categoryId);
             stockMapper.insert(stock);
         }
         // 1.2 校验库存是否充足