feat：新增进销存管理模块

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/PutInStorageServiceImpl.java

@@ -3,14 +3,14 @@ package org.dromara.InventoryManagement.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.RequiredArgsConstructor;
-import org.dromara.InventoryManagement.domain.PutInStorage;
-import org.dromara.InventoryManagement.domain.bo.PutInStorageBo;
-import org.dromara.InventoryManagement.domain.vo.PutInStorageVo;
+import org.dromara.InventoryManagement.domain.Storage;
+import org.dromara.InventoryManagement.domain.bo.StorageBo;
+import org.dromara.InventoryManagement.domain.vo.StorageVo;
 import org.dromara.InventoryManagement.mapper.PutInStorageMapper;
 import org.dromara.InventoryManagement.service.PutInStorageService;
-import org.dromara.commodityManagement.domain.bo.DiBuBo;
 import org.dromara.commodityManagement.service.impl.DiBuServiceImpl;
 import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.OrderNumberGenerator;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.stereotype.Service;
@@ -24,30 +24,26 @@ public class PutInStorageServiceImpl implements PutInStorageService {
 
     private final PutInStorageMapper putInStorageMapper;
 
-    private final DiBuServiceImpl diBuService;
-
     /**
      * 查询入库订单分页列表
-     * @param putInStorageBo
+     * @param storageBo
      * @param pageQuery
      * @return
      */
     @Override
-    public TableDataInfo<PutInStorageVo> selectPutInStoragePageList(PutInStorageBo putInStorageBo, PageQuery pageQuery) {
-        QueryWrapper<PutInStorage> qw = new QueryWrapper<>();
-        qw.like(StringUtils.isNotBlank(putInStorageBo.getCode()), "code", putInStorageBo.getCode());
-        qw.eq(StringUtils.isNotBlank(putInStorageBo.getStatus()), "status", putInStorageBo.getStatus());
-//        qw.eq(StringUtils.isNotBlank();
-
-        List<PutInStorage> page = putInStorageMapper.selectList(pageQuery.build(), qw);
-        List<PutInStorageVo> supplierVoList = MapstructUtils.convert(page, PutInStorageVo.class);
+    public TableDataInfo<StorageVo> selectPutInStoragePageList(StorageBo storageBo, PageQuery pageQuery) {
+        QueryWrapper<Storage> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(storageBo.getCode()), "code", storageBo.getCode());
+        qw.eq(StringUtils.isNotBlank(storageBo.getStatus()), "status", storageBo.getStatus());
+        List<Storage> page = putInStorageMapper.selectList(pageQuery.build(), qw);
+        List<StorageVo> supplierVoList = MapstructUtils.convert(page, StorageVo.class);
         return TableDataInfo.build(supplierVoList);
     }
 
     @Override
-    public int insertInventory(PutInStorageBo putInStorageBo) {
-        PutInStorage putInStorage = MapstructUtils.convert(putInStorageBo, PutInStorage.class);
-        // 入库数
-        return putInStorageMapper.insert(putInStorage);
+    public int insertInventory(StorageBo storageBo) {
+        OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
+        storageBo.setCode(generator.generateOrderNumber("YKS"));
+        return putInStorageMapper.insertInventory(storageBo);
     }
 }