代码清理

hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockController.java

@@ -37,31 +37,6 @@ public class StockController {
     public Page<StockVo> page(@RequestBody StockSelectDto dto) {
         return stockService.getPage(dto);
     }
-
-//    /**
-//     * 维多利亚 按仓库查询
-//     */
-//    @PostMapping("/pageByWarehouse")
-//    public Page<StockVo> pageByWarehouse(@RequestBody StockSelectDto dto) {
-//        return stockService.pageByWarehouse(dto);
-//    }
-//
-//    /**
-//     * 维多利亚 按产品查询
-//     */
-//    @PostMapping("/pageByProduct")
-//    public Page<StockVo> pageByProduct(@RequestBody StockSelectDto dto) {
-//        return stockService.pageByProduct(dto);
-//    }
-//
-//    /**
-//     * 维多利亚 按产品spu查询
-//     */
-//    @PostMapping("/pageByProductSpu")
-//    public Page<StockVo> pageByProductSpu(@RequestBody StockSelectDto dto) {
-//        return stockService.pageByProductSpu(dto);
-//    }
-
     /**
      * 库存明细
      */
@@ -94,25 +69,4 @@ public class StockController {
         stockService.delete(dto.getId());
     }
 
-//    /**
-//     * 次品转良品
-//     *
-//     * @return
-//     */
-//    @PostMapping("/defectiveToQualified")
-//    public void defectiveToQualified(@RequestBody Stock stock){
-//        stockService.defectiveToQualified(stock);
-//    }
-//
-//    /**
-//     * 良品转次品
-//     *
-//     * @return
-//     */
-//    @PostMapping("/qualifiedToDefective")
-//    public void qualifiedToDefective(@RequestBody Stock stock){
-//        stockService.qualifiedToDefective(stock);
-//    }
-
-
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/StockService.java

@@ -28,21 +28,6 @@ public interface StockService extends BaseService<Stock> {
     Page<StockVo> getPage(StockSelectDto dto);
 
     /**
-     * 维多利亚 按仓库分类分页
-     */
-    Page<StockVo> pageByWarehouse(StockSelectDto dto);
-
-    /**
-     * 维多利亚 按产品分类分页
-     */
-    Page<StockVo> pageByProduct(StockSelectDto dto);
-
-    /**
-     * 维多利亚 按产品spu分类分页
-     */
-    Page<StockVo> pageByProductSpu(StockSelectDto dto);
-
-    /**
      * 库存明细
      */
     Stock detail(StockDto dto);
@@ -62,30 +47,5 @@ public interface StockService extends BaseService<Stock> {
      */
     void delete(Long id);
 
-
-    /**
-     * 良品转次品
-     */
-    void qualifiedToDefective(Stock stock);
-
-    /**
-     * 次品转良品
-     */
-    void defectiveToQualified(Stock stock);
-
-    /**
-     * 通用出/入库方法
-     *
-     * <p>
-     * 调用时记得加上事务注解
-     * </P>
-     *
-     * @param list        产品改变数量
-     * @param warehouseId 仓库id
-     * @param journalType 出/入库类型
-     * @param businessId  业务id
-     */
-    void inOut(List<? extends InOutBo> list, Long warehouseId, JournalType journalType, Long businessId);
-
     void changeStock(List<? extends InOutBo> list, Long warehouseId, JournalType journalType);
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -3,9 +3,6 @@ package com.fjhx.wms.service.stock.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.JSONWriter;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -134,209 +131,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         return page;
     }
 
-    /**
-     * 维多利亚 按仓库库存查询
-     */
-    @Override
-    public Page<StockVo> pageByWarehouse(StockSelectDto dto) {
-        Page<StockVo> page = getPage(dto);
-        List<StockVo> stockVos = page.getRecords();
-
-        //获取产品id列表
-        List<Long> productIds = stockVos.stream().map(Stock::getProductId).collect(Collectors.toList());
-        if (ObjectUtil.isNotEmpty(productIds)) {
-            //赋值产品名称
-            productInfoService.attributeAssign(stockVos, StockVo::getProductId, (item, productInfo) -> {
-                //赋值维多利亚扩展产品信息
-                String victoriatouristJson = item.getVictoriatouristJson();
-                JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
-                json.put("code", productInfo.getCode());
-                json.put("spec", productInfo.getSpec());
-                json.put("unit", productInfo.getUnit());
-                json.put("customCode", productInfo.getCustomCode());
-
-                BigDecimal frozenQuantity = json.getBigDecimal("frozenQuantity");
-                frozenQuantity = ObjectUtil.isEmpty(frozenQuantity) ? BigDecimal.ZERO : frozenQuantity;
-                json.put("frozenQuantity", frozenQuantity);
-                BigDecimal defectiveQuantity = json.getBigDecimal("defectiveQuantity");
-                defectiveQuantity = ObjectUtil.isEmpty(defectiveQuantity) ? BigDecimal.ZERO : defectiveQuantity;
-                json.put("defectiveQuantity", defectiveQuantity);
-                item.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
-            });
-        }
-
-        //维多利亚扩展
-        List<Long> warehouseIds = new ArrayList<>();
-        for (StockVo stockVo : stockVos) {
-            String victoriatouristJson = stockVo.getVictoriatouristJson();
-            if (ObjectUtil.isNotEmpty(victoriatouristJson)) {
-                JSONObject json = JSONObject.parseObject(victoriatouristJson);
-                //遍历仓库id
-                warehouseIds.add(json.getLong("warehouseId"));
-            }
-        }
-        //如果仓库id列表为空直接返回
-        if (ObjectUtil.isEmpty(warehouseIds)) {
-            return page;
-        }
-        List<Warehouse> warehouses = warehouseService.listByIds(warehouseIds);
-        Map<Long, String> warehouseMap = warehouses.stream().collect(Collectors.toMap(Warehouse::getId, Warehouse::getName));
-        for (StockVo stockVo : stockVos) {
-            String victoriatouristJson = stockVo.getVictoriatouristJson();
-            JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
-            String warehouseName = warehouseMap.get(json.getLong("warehouseId"));
-            json.put("warehouseName", warehouseName);
-            stockVo.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
-        }
-        return page;
-    }
-
-    @Override
-    public Page<StockVo> pageByProduct(StockSelectDto dto) {
-        IWrapper<Stock> wrapper = getWrapper();
-        wrapper.orderByDesc("s", Stock::getId);
-        wrapper.eq(Stock::getWarehouseId, dto.getId());
-//        wrapper.like(Stock::getQuantity, dto.getKeyword());
-        String keyword = dto.getKeyword();
-        if (ObjectUtil.isNotEmpty(keyword)) {
-            //根据 库存数量 产品自定义编码 产品名称 过滤
-            List<Long> productIds = productInfoService.listObject(ProductInfo::getId,
-                    q -> q.like(ProductInfo::getCustomCode, keyword).or().like(ProductInfo::getName, keyword));
-            wrapper.and(q -> q.like(Stock::getQuantity, keyword).or().in(Stock::getProductId, productIds));
-        }
-        wrapper.eq("pi.definition", dto.getDefinition());
-        wrapper.groupBy("s.product_id");
-        Page<StockVo> page = this.baseMapper.pageByProduct(dto.getPage(), wrapper);
-        List<StockVo> stockVos = page.getRecords();
-
-        //赋值冻结库存和次品库存
-        for (StockVo stockVo : stockVos) {
-            JSONObject json = new JSONObject();
-            BigDecimal frozenQuantity = stockVo.getFrozenQuantity();
-            frozenQuantity = frozenQuantity == null ? BigDecimal.ZERO : frozenQuantity;
-            json.put("frozenQuantity", frozenQuantity);
-            BigDecimal defectiveQuantity = stockVo.getDefectiveQuantity();
-            defectiveQuantity = defectiveQuantity == null ? BigDecimal.ZERO : defectiveQuantity;
-            json.put("defectiveQuantity", defectiveQuantity);
-            stockVo.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
-        }
-
-        //赋值产品名称
-        productInfoService.attributeAssign(stockVos, StockVo::getProductId, (item, productInfo) -> {
-            item.setType(productInfo.getType());
-            item.setProductName(productInfo.getName());
-            item.setProductCode(productInfo.getCode());
-            item.setProductUnit(productInfo.getUnit());
-            item.setProductType(productInfo.getType());
-            item.setProductSpec(productInfo.getSpec());
-            item.setProductClassifyId(productInfo.getProductClassifyId());
-            item.setProductDefinition(productInfo.getDefinition());
-            item.setProductCustomCode(productInfo.getCustomCode());
-
-            //赋值维多利亚扩展产品信息
-            String victoriatouristJson = item.getVictoriatouristJson();
-            JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
-            json.put("code", productInfo.getCode());
-            json.put("spec", productInfo.getSpec());
-            json.put("unit", productInfo.getUnit());
-
-            BigDecimal frozenQuantity = json.getBigDecimal("frozenQuantity");
-            frozenQuantity = ObjectUtil.isEmpty(frozenQuantity) ? BigDecimal.ZERO : frozenQuantity;
-            json.put("frozenQuantity", frozenQuantity);
-            BigDecimal defectiveQuantity = json.getBigDecimal("defectiveQuantity");
-            defectiveQuantity = ObjectUtil.isEmpty(defectiveQuantity) ? BigDecimal.ZERO : defectiveQuantity;
-            json.put("defectiveQuantity", defectiveQuantity);
-            item.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
-        });
-
-        //赋值产品分类
-        productClassifyService.attributeAssign(stockVos, StockVo::getProductClassifyId, (item, productClassify) -> {
-            item.setProductClassifyName(productClassify.getName());
-        });
-
-        //赋值仓库名称
-        warehouseService.attributeAssign(stockVos, StockVo::getWarehouseId, (item, warehouse) -> {
-            item.setWarehouseName(warehouse.getName());
-        });
-
-        return page;
-    }
-
-    @Override
-    public Page<StockVo> pageByProductSpu(StockSelectDto dto) {
-        IWrapper<Stock> wrapper = getWrapper();
-        wrapper.eq(Stock::getWarehouseId, dto.getId());
-        wrapper.like(Stock::getQuantity, dto.getKeyword());
-        wrapper.eq("pi.definition", dto.getDefinition());
-        wrapper.isNotNull("ps.id");
-        wrapper.groupBy("ps.id");
-        wrapper.orderByDesc("s", Stock::getId);
-        Page<StockVo> page = this.baseMapper.pageByProductSpu(dto.getPage(), wrapper);
-        //赋值关联产品数
-        List<StockVo> records = page.getRecords();
-        List<Long> spuids = records.stream().map(StockVo::getProductSpuId).collect(Collectors.toList());
-        if (ObjectUtil.isEmpty(spuids)) {
-            return page;
-        }
-        List<ProductInfo> productInfoList = productInfoService.list(q -> q.in(ProductInfo::getProductSpuId, spuids));
-        Map<Long, List<ProductInfo>> productInfoMap = productInfoList.stream().collect(Collectors.groupingBy(ProductInfo::getProductSpuId));
-        for (StockVo record : records) {
-            List<ProductInfo> productInfoList1 = productInfoMap.get(record.getProductSpuId());
-            record.setLinkProductQuantity(BigDecimal.valueOf(productInfoList1.size()));
-            record.setCombinationQuantity(0l);
-        }
-        //赋值可组合数量
-        List<Long> linkProductIds = new ArrayList<>();
-        for (StockVo record : records) {
-            String victoriatouristJson = record.getVictoriatouristJson();
-            JSONObject json = JSONObject.parseObject(victoriatouristJson);
-            if (json.getInteger("combination") != 1) {
-                continue;
-            }
-            JSONArray productCombinationList = json.getJSONArray("productCombinationList");
-            for (int i = 0; i < productCombinationList.size(); i++) {
-                JSONObject item = productCombinationList.getJSONObject(i);
-                Long linkProductId = item.getLong("linkProductId");
-                linkProductIds.add(linkProductId);
-//                BigDecimal linkQuantity = item.getBigDecimal("linkQuantity");
-            }
-        }
-        if (ObjectUtil.isEmpty(linkProductIds)) {
-            return page;
-        }
-        //查询关联产品库存
-        List<Stock> list = list(q -> q.in(Stock::getProductId, linkProductIds));
-        Map<Long, BigDecimal> stockMap = list.stream().collect(Collectors.toMap(Stock::getProductId, Stock::getQuantity));
-        for (StockVo record : records) {
-            String victoriatouristJson = record.getVictoriatouristJson();
-            JSONObject json = JSONObject.parseObject(victoriatouristJson);
-            if (json.getInteger("combination") != 1) {
-                continue;
-            }
-            JSONArray productCombinationList = json.getJSONArray("productCombinationList");
-
-            Long min = -1l;
-            for (int i = 0; i < productCombinationList.size(); i++) {
-                JSONObject item = productCombinationList.getJSONObject(i);
-                Long linkProductId = item.getLong("linkProductId");
-                BigDecimal linkQuantity = item.getBigDecimal("linkQuantity");
-
-                BigDecimal stockQuantity = stockMap.getOrDefault(linkProductId, BigDecimal.ZERO);
-
-                BigDecimal divide = stockQuantity.divide(linkQuantity, 0, BigDecimal.ROUND_DOWN);
-
-                //计算最小值
-                if (min == -1) {
-                    min = divide.longValue();
-                } else if (divide.intValue() < min) {
-                    min = divide.longValue();
-                }
-            }
-            record.setCombinationQuantity(min);
-        }
-        return page;
-    }
-
     @Override
     public Stock detail(StockDto dto) {
         return getOne(q -> q.eq(Stock::getWarehouseId, dto.getWarehouseId()).eq(Stock::getProductId, dto.getProductId()));
@@ -391,122 +185,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         this.removeById(id);
     }
 
-//    /**
-//     * 操作库存通用方法
-//     *
-//     * @param type 1入库 2出库 3维多利亚冻结库存入库 4维多利亚待出库次品库存
-//     */
-//    public synchronized void ModifyInventory(int type, List<Stock> list, Long warehouseId) {
-//        List<Stock> data = new ArrayList<>();
-//
-//        //获取现有库存
-//        List<Long> productIds = list.stream().map(Stock::getProductId).collect(Collectors.toList());
-//        Map<Long, Stock> stockMap = this.mapKEntity(Stock::getProductId, q -> q.in(Stock::getProductId, productIds).eq(Stock::getWarehouseId, warehouseId));
-//
-//        for (Stock stock : list) {
-//            //忽略操作数量为0的记录 避免出现出入库记录为0的条目
-//            if (BigDecimal.ZERO.compareTo(stock.getQuantity()) == 0) {
-//                continue;
-//            }
-//
-//            Stock oldStocks = stockMap.get(stock.getProductId());
-//            //如果库存不存在 就创建一条空库存
-//            if (ObjectUtil.isEmpty(oldStocks)) {
-//                oldStocks = new Stock();
-//                oldStocks.setProductId(stock.getProductId());
-//                oldStocks.setWarehouseId(warehouseId);
-//                oldStocks.setQuantity(BigDecimal.ZERO);
-//            }
-//
-//            if (type == 1) {
-//                //入库库存相加
-//                BigDecimal quantity = oldStocks.getQuantity().add(stock.getQuantity());
-//                oldStocks.setQuantity(quantity);
-//            } else if (type == 2) {
-//                //出库库存相减
-//                ProductInfo productInfo = productInfoService.getById(stock.getProductId());
-//                if (productInfo == null) {
-//                    throw new ServiceException("产品id：" + stock.getProductId() + "不存在");
-//                }
-//                BigDecimal quantity = oldStocks.getQuantity().subtract(stock.getQuantity());
-//                if (quantity.compareTo(BigDecimal.ZERO) < 0) {
-//                    throw new ServiceException("以下商品库存不足，无法出库：" + productInfo.getName());
-//                }
-//                oldStocks.setQuantity(quantity);
-//            } else {
-//                throw new ServiceException("未知库存操作类型");
-//            }
-//            data.add(oldStocks);
-//
-//        }
-//        //操作库存
-//        saveOrUpdateBatch(data);
-//    }
-
-    /**
-     * 次品转良品
-     */
-    @Override
-    public void defectiveToQualified(Stock stock) {
-        if (ObjectUtil.isEmpty(stock.getId())) {
-            throw new ServiceException("库存id不能为空");
-        }
-        if (ObjectUtil.isEmpty(stock.getQuantity())) {
-            throw new ServiceException("要转换的数量不能为空");
-        }
-        Stock stock1 = getById(stock.getId());
-        String victoriatouristJson = stock1.getVictoriatouristJson();
-        JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
-        BigDecimal quantity = stock1.getQuantity();
-        BigDecimal defectiveQuantity = ObjectUtil.isNotEmpty(json.getBigDecimal("defectiveQuantity")) ? json.getBigDecimal("defectiveQuantity") : BigDecimal.ZERO;
-        if (defectiveQuantity.compareTo(BigDecimal.ZERO) == 0) {
-            throw new ServiceException("库存不足，无法转换");
-        }
-        stock1.setQuantity(quantity.add(stock.getQuantity()));
-        json.put("defectiveQuantity", defectiveQuantity.subtract(stock.getQuantity()));
-        stock1.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
-        updateById(stock1);
-    }
-
-    @Override
-    public void inOut(List<? extends InOutBo> list, Long warehouseId, JournalType journalType, Long businessId) {
-
-        // 改变库存数量
-        changeStock(list, warehouseId, journalType);
-
-        // 增加出入库记录
-        Long journalId = addJournal(warehouseId, journalType, businessId);
-
-        // 添加出入库明细
-        addJournalDetails(list, journalId);
-
-    }
-
-    /**
-     * 良品转次品
-     */
-    @Override
-    public void qualifiedToDefective(Stock stock) {
-        if (ObjectUtil.isEmpty(stock.getId())) {
-            throw new ServiceException("库存id不能为空");
-        }
-        if (ObjectUtil.isEmpty(stock.getQuantity())) {
-            throw new ServiceException("要转换的数量不能为空");
-        }
-        Stock stock1 = getById(stock.getId());
-        String victoriatouristJson = stock1.getVictoriatouristJson();
-        JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
-        BigDecimal quantity = stock1.getQuantity();
-        BigDecimal defectiveQuantity = ObjectUtil.isNotEmpty(json.getBigDecimal("defectiveQuantity")) ? json.getBigDecimal("defectiveQuantity") : BigDecimal.ZERO;
-        if (quantity.compareTo(BigDecimal.ZERO) == 0) {
-            throw new ServiceException("库存不足，无法转换");
-        }
-        stock1.setQuantity(quantity.subtract(stock.getQuantity()));
-        json.put("defectiveQuantity", defectiveQuantity.add(stock.getQuantity()));
-        stock1.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
-        updateById(stock1);
-    }
-
     /**
      * 改变库存数量
      */
@@ -567,49 +245,4 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         }
     }
 
-    /**
-     * 添加出入库记录
-     */
-    private Long addJournal(Long warehouseId, JournalType journalType, Long businessId) {
-        StockJournal stockJournal = new StockJournal();
-        stockJournal.setType(journalType.getDetailType());
-        switch (journalType.getDetailType()) {
-            case 1:
-                stockJournal.setOpType(1);//入库
-                stockJournal.setCode(CodeEnum.SIN_CODE.getCode());
-                break;
-            case 2:
-                stockJournal.setOpType(2);//出库
-                stockJournal.setCode(CodeEnum.SOUT_CODE.getCode());
-                break;
-            case 3:
-                stockJournal.setOpType(1);//调仓入库
-//                stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());//调仓入库
-                break;
-            case 11:
-                stockJournal.setOpType(2);//调仓出库
-//                stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());//调仓出库
-                break;
-
-        }
-        stockJournal.setBusinessId(businessId);
-        stockJournal.setWarehouseId(warehouseId);
-        stockJournalService.save(stockJournal);
-        return stockJournal.getId();
-    }
-
-    /**
-     * 添加出入库明细
-     */
-    private void addJournalDetails(List<? extends InOutBo> list, Long journalId) {
-        List<StockJournalDetails> journalDetailsList = list.stream().map(item -> {
-            StockJournalDetails stockJournalDetails = new StockJournalDetails();
-            stockJournalDetails.setStockJournalId(journalId);
-            stockJournalDetails.setProductId(item.getProductId());
-            stockJournalDetails.setQuantity(item.getQuantity());
-            return stockJournalDetails;
-        }).collect(Collectors.toList());
-        stockJournalDetailsService.saveBatch(journalDetailsList);
-    }
-
 }