代码清理

hx-purchase/src/main/java/com/fjhx/purchase/controller/arrival/ArrivalController.java

@@ -1,89 +0,0 @@
-package com.fjhx.purchase.controller.arrival;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalDto;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalSelectDto;
-import com.fjhx.purchase.entity.arrival.po.Arrival;
-import com.fjhx.purchase.entity.arrival.vo.ArrivalVo;
-import com.fjhx.purchase.service.arrival.ArrivalService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * <p>
- * 到货 前端控制器
- * </p>
- *
- * @author
- * @since 2023-04-07
- */
-//@DS(SourceConstant.PURCHASE)
-@RestController
-@RequestMapping("/arrival")
-public class ArrivalController {
-
-    @Autowired
-    private ArrivalService arrivalService;
-
-    /**
-     * 到货分页
-     */
-    @PostMapping("/page")
-    public Page<ArrivalVo> page(@RequestBody ArrivalSelectDto dto) {
-        return arrivalService.getPage(dto);
-    }
-
-    /**
-     * 到货明细
-     */
-    @PostMapping("/detail")
-    public ArrivalVo detail(@RequestBody BaseSelectDto dto) {
-        return arrivalService.detail(dto.getId());
-    }
-
-    /**
-     * 到货新增
-     */
-    @PostMapping("/add")
-    public void add(@RequestBody Arrival arrival) {
-        arrivalService.add(arrival);
-    }
-
-//    /**
-//     * 到货新增 维多利亚
-//     */
-//    @PostMapping("/addByWdly")
-//    public void addByWdly(@RequestBody ArrivalDto arrival) {
-//        arrivalService.addByWdly(arrival);
-//    }
-
-    /**
-     * 到货编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody ArrivalDto arrivalDto) {
-        arrivalService.edit(arrivalDto);
-    }
-
-    /**
-     * 到货删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        arrivalService.delete(dto.getId());
-    }
-
-    /**
-     * 根据发货id获取本次发货的到货信息
-     */
-    @PostMapping("/arrivalInfo")
-    public ArrivalVo arrivalInfo(@RequestBody ArrivalDto dto) {
-        return arrivalService.arrivalInfo(dto.getDeliverGoodsId());
-    }
-
-}

hx-purchase/src/main/java/com/fjhx/purchase/controller/arrival/ArrivalDetailController.java

@@ -1,48 +0,0 @@
-package com.fjhx.purchase.controller.arrival;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalDetailSelectDto;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalDetailDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.fjhx.purchase.service.arrival.ArrivalDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 到货明细单 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-07
- */
-//@DS(SourceConstant.PURCHASE)
-@RestController
-@RequestMapping("/arrivalDetail")
-public class ArrivalDetailController {
-
-    @Autowired
-    private ArrivalDetailService arrivalDetailService;
-
-    /**
-     * 到货明细单分页
-     */
-    @PostMapping("/page")
-    public Page<ArrivalDetailVo> page(@RequestBody ArrivalDetailSelectDto dto) {
-        return arrivalDetailService.getPage(dto);
-    }
-
-    /**
-     * 到货明细单明细
-     */
-    @PostMapping("/detail")
-    public List<ArrivalDetailVo> detail(@RequestBody ArrivalDetailSelectDto dto) {
-        return arrivalDetailService.detail(dto.getIds());
-    }
-}

hx-purchase/src/main/java/com/fjhx/purchase/service/MyPurchaseServiceImpl.java

@@ -1,17 +1,10 @@
 package com.fjhx.purchase.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.fjhx.common.utils.Assert;
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
-import com.fjhx.purchase.entity.sales.enums.SalesReturnDetailStatusEnum;
-import com.fjhx.purchase.entity.sales.po.SalesReturnDetail;
-import com.fjhx.purchase.service.arrival.ArrivalDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.fjhx.purchase.service.sales.SalesReturnDetailService;
-import com.fjhx.wms.entity.arrival.po.ArrivalDetailPo;
 import com.fjhx.wms.entity.purchase.po.PurchaseDetailPo;
 import com.fjhx.wms.entity.purchase.po.PurchasePo;
 import com.fjhx.wms.service.MyPurchaseService;
@@ -25,37 +18,10 @@ import java.util.stream.Collectors;
 
 @Service
 public class MyPurchaseServiceImpl implements MyPurchaseService {
-
-    @Autowired
-    private SalesReturnDetailService salesReturnDetailService;
     @Autowired
     private PurchaseService purchaseService;
     @Autowired
     private PurchaseDetailService purchaseDetailService;
-    @Autowired
-    private ArrivalDetailService arrivalDetailService;
-
-    /**
-     * 修改采购退货状态
-     */
-    @Override
-    public void updateSalesReturnStatus(Long id, Integer status) {
-        switch (status) {
-            case 0://待出库
-                status = SalesReturnDetailStatusEnum.STATUS_20.getKey();//待退货
-                break;
-            case 1://部分出库
-                status = SalesReturnDetailStatusEnum.STATUS_30.getKey();//部分退货
-                break;
-            case 2://已出库
-                status = SalesReturnDetailStatusEnum.STATUS_40.getKey();//退货完成
-                break;
-        }
-        SalesReturnDetail salesReturnDetail = salesReturnDetailService.getById(id);
-        Assert.notEmpty(salesReturnDetail, "查询不到退货信息");
-        salesReturnDetail.setStatus(status);
-        salesReturnDetailService.updateById(salesReturnDetail);
-    }
 
     @Override
     public PurchasePo getPurchaseInfo(Long id) {
@@ -70,22 +36,4 @@ public class MyPurchaseServiceImpl implements MyPurchaseService {
         return purchaseDetailPos.stream().collect(Collectors.toMap(PurchaseDetailPo::getId, Function.identity()));
     }
 
-    @Override
-    public ArrivalDetailPo getArrivalDetailInfo(Long id) {
-        ArrivalDetail arrivalDetail = arrivalDetailService.getById(id);
-        ArrivalDetailPo arrivalDetailPo = BeanUtil.copyProperties(arrivalDetail, ArrivalDetailPo.class);
-        return arrivalDetailPo;
-    }
-
-    @Override
-    public List<ArrivalDetailPo> getArrivalDetailList(List<Long> ids) {
-        List<ArrivalDetail> arrivalDetailList = arrivalDetailService.list(q -> q.in(ArrivalDetail::getId, ids));
-        return BeanUtil.copyToList(arrivalDetailList, ArrivalDetailPo.class);
-    }
-
-    @Override
-    public List<PurchaseDetailPo> getPurchaseDetailList(List<Long> ids) {
-        List<PurchaseDetail> arrivalDetailList = purchaseDetailService.list(q -> q.in(PurchaseDetail::getId, ids));
-        return BeanUtil.copyToList(arrivalDetailList, PurchaseDetailPo.class);
-    }
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/ArrivalDetailService.java

@@ -1,59 +0,0 @@
-package com.fjhx.purchase.service.arrival;
-
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
-import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalDetailSelectDto;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalDetailDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-
-/**
- * <p>
- * 到货明细单 服务类
- * </p>
- *
- * @author 
- * @since 2023-04-07
- */
-public interface ArrivalDetailService extends BaseService<ArrivalDetail> {
-
-    /**
-     * 到货明细单分页
-     */
-    Page<ArrivalDetailVo> getPage(ArrivalDetailSelectDto dto);
-
-    /**
-     * 到货明细单明细--可传多个ID
-     */
-    List<ArrivalDetailVo> detail(List<Long> ids);
-
-    /**
-     * 到货明细单新增
-     */
-    void add(ArrivalDetailDto arrivalDetailDto);
-
-    /**
-     * 到货明细单编辑
-     */
-    void edit(ArrivalDetailDto arrivalDetailDto);
-
-    /**
-     * 到货明细单删除
-     */
-    void delete(Long id);
-
-    /**
-     * 统计到货明细总数
-     *
-     * @return
-     */
-    BigDecimal getSumCount(Long purchaseDetailId, Long businessId);
-
-    List<ArrivalDetailVo> getArrivalDetail(IWrapper<ArrivalDetail> wrapper1);
-}

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/ArrivalService.java

@@ -1,55 +0,0 @@
-package com.fjhx.purchase.service.arrival;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalDto;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalSelectDto;
-import com.fjhx.purchase.entity.arrival.po.Arrival;
-import com.fjhx.purchase.entity.arrival.vo.ArrivalVo;
-import com.ruoyi.common.core.service.BaseService;
-
-
-/**
- * <p>
- * 到货 服务类
- * </p>
- *
- * @author 
- * @since 2023-04-07
- */
-public interface ArrivalService extends BaseService<Arrival> {
-
-    /**
-     * 到货分页
-     */
-    Page<ArrivalVo> getPage(ArrivalSelectDto dto);
-
-    /**
-     * 到货明细
-     */
-    ArrivalVo detail(Long id);
-
-    /**
-     * 到货新增
-     */
-    void add(Arrival arrival);
-
-//    /**
-//     * 到货新增 维多利亚
-//     */
-//    void addByWdly(ArrivalDto arrival);
-
-    /**
-     * 到货编辑
-     */
-    void edit(ArrivalDto arrivalDto);
-
-    /**
-     * 到货删除
-     */
-    void delete(Long id);
-
-    /**
-     * 根据发货id获取本次发货的到货信息
-     */
-    ArrivalVo arrivalInfo(Long deliverGoodsId);
-}

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalDetailServiceImpl.java

@@ -1,173 +0,0 @@
-package com.fjhx.purchase.service.arrival.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.item.entity.product.vo.ProductInfoVo;
-import com.fjhx.item.service.product.ProductClassifyService;
-import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalDetailDto;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalDetailSelectDto;
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
-import com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo;
-import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
-import com.fjhx.purchase.mapper.arrival.ArrivalDetailMapper;
-import com.fjhx.purchase.service.arrival.ArrivalDetailService;
-import com.fjhx.purchase.service.quality.QualityDetailService;
-import com.fjhx.supply.service.supplier.SupplierInfoService;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.ruoyi.common.utils.wrapper.SqlField;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-
-/**
- * <p>
- * 到货明细单 服务实现类
- * </p>
- *
- * @author
- * @since 2023-04-07
- */
-//@DS(SourceConstant.PURCHASE)
-@Service
-public class ArrivalDetailServiceImpl extends ServiceImpl<ArrivalDetailMapper, ArrivalDetail> implements ArrivalDetailService {
-
-    @Autowired
-    private SupplierInfoService supplierInfoService;
-
-    @Autowired
-    private ProductInfoService productInfoService;
-
-    @Autowired
-    private ProductClassifyService productClassifyService;
-
-    @Autowired
-    private QualityDetailService qualityDetailService;
-
-    /**
-     * 分页
-     *
-     * @param dto
-     * @return
-     */
-    @Override
-    public Page<ArrivalDetailVo> getPage(ArrivalDetailSelectDto dto) {
-        IWrapper<ArrivalDetail> wrapper = getWrapper();
-        if (StringUtils.isNotEmpty(dto.getStatus())) {
-            wrapper.eq("t1", PurchaseDetail::getStatus, dto.getStatus());
-        }
-        if (StringUtils.isNotEmpty(dto.getKeyword())) {
-            wrapper.keyword(dto.getKeyword(), new SqlField("t2.code"));
-        }
-        wrapper.eq("t1", PurchaseDetail::getStatus, dto.getStatus());
-        wrapper.orderByDesc("t1", ArrivalDetail::getCreateTime);
-        wrapper.groupBy("t1.id");
-        //过滤掉采购单作废的记录
-        wrapper.ne("p.purchase_status", 88);
-        Page<ArrivalDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        List<ArrivalDetailVo> list = page.getRecords();
-        if (CollectionUtils.isNotEmpty(list)) {
-
-            // 赋值供应商名称
-            supplierInfoService.attributeAssign(list, ArrivalDetailVo::getSupplyId, (item, supplier) -> {
-                item.setSupplyName(supplier.getName());
-            });
-
-            // 赋值产品属性
-            productInfoService.attributeAssign(list, ArrivalDetail::getBussinessId, (item, product) -> {
-                item.setProductCode(product.getCode());
-                item.setProductUnit(product.getUnit());
-                item.setProductType(product.getType());
-                item.setProductName(product.getName());
-                item.setProductSpec(product.getSpec());
-                item.setProductCategoryId(product.getProductClassifyId());
-                item.setProductDefinition(product.getDefinition());
-            });
-
-            // 赋值产品分类名称
-            productClassifyService.attributeAssign(list, ArrivalDetailVo::getProductCategoryId, (item, productClassify) -> {
-                item.setProductCategory(productClassify.getName());
-            });
-
-        }
-        return page;
-    }
-
-    /**
-     * 详情--
-     *
-     * @param ids
-     * @return
-     */
-    @Override
-    public List<ArrivalDetailVo> detail(List<Long> ids) {
-        List<ArrivalDetail> arrivalDetailList = this.list(Wrappers.<ArrivalDetail>query().lambda().in(ArrivalDetail::getId, ids));
-        List<ArrivalDetailVo> results = new ArrayList<>();
-        //查询产品
-        List<Long> productIds = arrivalDetailList.stream().map(ArrivalDetail::getBussinessId).collect(Collectors.toList());
-        List<ProductInfoVo> productInfoVos = productInfoService.getListByProductIds(productIds);
-        Map<Long, List<ProductInfoVo>> productMap = productInfoVos.stream().collect(Collectors.groupingBy(ProductInfoVo::getId));
-        if (MapUtils.isNotEmpty(productMap)) {
-            for (ArrivalDetail s : arrivalDetailList) {
-                //查询出当前这款到货明细的质检总数
-                ArrivalDetailVo result = BeanUtil.toBean(s, ArrivalDetailVo.class);
-                ProductInfoVo p = productMap.get(s.getBussinessId()).get(0);
-                result.setSumQualityCount(qualityDetailService.getSumQualityCount(s.getId()));
-                result.setProductCategory(p.getClassifyName());
-                result.setProductCode(p.getCode());
-                result.setProductUnit(p.getUnit());
-                result.setProductType(p.getType());
-                result.setProductName(p.getName());
-                result.setProductSpec(p.getSpec());
-                results.add(result);
-            }
-        }
-        return results;
-    }
-
-    @Override
-    public void add(ArrivalDetailDto arrivalDetailDto) {
-        this.save(arrivalDetailDto);
-    }
-
-    @Override
-    public void edit(ArrivalDetailDto arrivalDetailDto) {
-        this.updateById(arrivalDetailDto);
-    }
-
-    @Override
-    public void delete(Long id) {
-        this.removeById(id);
-    }
-
-    /**
-     * 统计到货明细总数
-     *
-     * @param purchaseDetailId
-     * @param businessId
-     * @return
-     */
-    @Override
-    public BigDecimal getSumCount(Long purchaseDetailId, Long businessId) {
-        return baseMapper.getSumCount(purchaseDetailId, businessId);
-    }
-
-    @Override
-    public List<ArrivalDetailVo> getArrivalDetail(IWrapper<ArrivalDetail> wrapper1) {
-        return baseMapper.getArrivalDetail(wrapper1);
-    }
-
-}

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalServiceImpl.java

@@ -1,335 +0,0 @@
-package com.fjhx.purchase.service.arrival.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.service.coding.CodingRuleService;
-import com.fjhx.common.utils.Assert;
-import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalDto;
-import com.fjhx.purchase.entity.arrival.dto.ArrivalSelectDto;
-import com.fjhx.purchase.entity.arrival.po.Arrival;
-import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
-import com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo;
-import com.fjhx.purchase.entity.arrival.vo.ArrivalVo;
-import com.fjhx.purchase.entity.purchase.po.Purchase;
-import com.fjhx.purchase.mapper.arrival.ArrivalMapper;
-import com.fjhx.purchase.service.arrival.ArrivalDetailService;
-import com.fjhx.purchase.service.arrival.ArrivalService;
-import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.fjhx.wms.entity.stock.emums.JournalType;
-import com.fjhx.wms.entity.stock.po.StockWait;
-import com.fjhx.wms.entity.stock.po.StockWaitDetails;
-import com.fjhx.wms.service.stock.StockWaitDetailsService;
-import com.fjhx.wms.service.stock.StockWaitService;
-import com.ruoyi.common.core.domain.BaseIdPo;
-import com.ruoyi.common.core.domain.BasePo;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * <p>
- * 到货 服务实现类
- * </p>
- *
- * @author
- * @since 2023-04-07
- */
-@Service
-public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> implements ArrivalService {
-
-    @Autowired
-    private StockWaitService stockWaitService;
-
-    @Autowired
-    private ArrivalDetailService arrivalDetailService;
-
-    @Autowired
-    private PurchaseService purchaseService;
-
-    @Autowired
-    private StockWaitDetailsService stockWaitDetailsService;
-    @Autowired
-    private ProductInfoService productInfoService;
-
-    @Autowired
-    private CodingRuleService codingRuleService;
-
-    @Override
-    public Page<ArrivalVo> getPage(ArrivalSelectDto dto) {
-        IWrapper<Arrival> wrapper = getWrapper();
-        wrapper.orderByDesc("a", Arrival::getId);
-        Page<ArrivalVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        return page;
-    }
-
-    @Override
-    public ArrivalVo detail(Long id) {
-        Arrival Arrival = this.getById(id);
-        ArrivalVo result = BeanUtil.toBean(Arrival, ArrivalVo.class);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param arrival
-     */
-    @DSTransactional
-    @Override
-    public void add(Arrival arrival) {
-
-//        arrival.setCode(codingRuleService.createCode(CodingRuleEnum.ARRIVAL.getKey(), null));
-        this.save(arrival);
-
-        // 修改采购状态
-        purchaseService.update(q -> q
-                .eq(BaseIdPo::getId, arrival.getPurchaseId())
-                .set(Purchase::getArrivalStatus, arrival.getArrivalStatus())
-                .set(BasePo::getUpdateTime, new Date())
-                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-        );
-
-        Purchase purchase = purchaseService.getById(arrival.getPurchaseId());
-
-        // 取出到货明细
-        List<ArrivalDetail> arrivalDetailList = arrival.getArrivalDetailList();
-        if (CollectionUtils.isNotEmpty(arrivalDetailList)) {
-
-            StockWait stockWait = new StockWait();
-            stockWait.setBusinessId(purchase.getId());// 采购id
-            stockWait.setBusinessCode(purchase.getCode());// 采购编码
-            stockWait.setType(1);// 入库
-            stockWait.setStatus(0);// 待入库
-            stockWait.setBusinessType(JournalType.PURCHASE_IN.getDetailType());// 采购到货
-            stockWaitService.save(stockWait);
-
-            List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
-
-            for (ArrivalDetail arrivalDetail : arrivalDetailList) {
-                Assert.notEmpty(arrivalDetail.getBussinessId(), "产品id不能为空");
-                arrivalDetail.setId(IdWorker.getId());
-                arrivalDetail.setArrivalId(arrival.getId());
-
-                StockWaitDetails stockWaitDetails = new StockWaitDetails();
-                stockWaitDetails.setStockWaitId(stockWait.getId());
-                stockWaitDetails.setProductId(arrivalDetail.getBussinessId());
-                stockWaitDetails.setQuantity(arrivalDetail.getCount());
-                stockWaitDetails.setBusinessDetailsId(arrivalDetail.getId());
-                stockWaitDetailsList.add(stockWaitDetails);
-            }
-            arrivalDetailService.saveBatch(arrivalDetailList);
-
-            stockWaitDetailsService.saveBatch(stockWaitDetailsList);
-        }
-    }
-
-//    /**
-//     * 维多利亚到货
-//     */
-//    @DSTransactional
-//    @Override
-//    public void addByWdly(ArrivalDto arrival) {
-//        //获取维多利亚json中的发货id
-//        String victoriatouristJson = arrival.getVictoriatouristJson();
-//        JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
-//        if (ObjectUtil.isEmpty(arrival.getDeliverGoodsId())) {
-//            arrival.setDeliverGoodsId(json.getLong("deliverGoodsId"));
-//        }
-//        //根据发货id查采购信息
-//        if (ObjectUtil.isNotEmpty(arrival.getDeliverGoodsId())) {
-//            DeliverGoodsPo deliverGoodsInfo = wdlyService.getDeliverGoodsInfo(arrival.getDeliverGoodsId());
-//            Assert.notEmpty(deliverGoodsInfo, "查询不到发货信息");
-//            arrival.setPurchaseId(deliverGoodsInfo.getPurchaseId());
-//        }
-//
-//        if (ObjectUtil.isEmpty(arrival.getPurchaseId())) {
-//            throw new ServiceException("采购id不能为空");
-//        }
-//        Purchase purchase0 = purchaseService.getById(arrival.getPurchaseId());
-//        Assert.notEmpty(purchase0, "无法获取到采购信息");
-//        arrival.setSupplyId(purchase0.getSupplyId());
-//        arrival.setCode(codingRuleService.createCode(CodingRuleEnum.ARRIVAL.getKey(), null));
-////        arrival.setCode(CodeEnum.ARRIVAL.getCode());
-//        arrival.setStatus(1);//设置到货
-//        this.save(arrival);
-//
-//        //修改采购状态
-////        Purchase purchase = new Purchase();
-////        purchase.setArrivalStatus(arrival.getArrivalStatus());
-////        purchase.setId(arrival.getPurchaseId());
-////        purchaseService.updateById(purchase);
-//
-//        //创建待入库记录
-////        String victoriatouristJson = arrival.getVictoriatouristJson();
-////        JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
-//        Long deliverGoodsId = json.getLong("deliverGoodsId");
-//
-//        if (ObjectUtil.isEmpty(deliverGoodsId)) {
-//            throw new ServiceException("发货id不能为空");
-//        }
-//
-//        //查询发货信息 获取 采购id
-//        DeliverGoodsPo deliverGoodsInfo = wdlyService.getDeliverGoodsInfo(deliverGoodsId);
-//
-//        //去申购单取入库仓库id
-//        PurchaseDetail one = purchaseDetailService.getOne(q -> q.eq(PurchaseDetail::getPurchaseId, deliverGoodsInfo.getPurchaseId()));
-//        Long subscribeDetailId = one.getSubscribeDetailId();
-//        SubscribeDetail byId = subscribeDetailService.getById(subscribeDetailId);
-//        Subscribe byId1 = subscribeService.getById(byId.getSubscribeId());
-//        String victoriatouristJson1 = byId1.getVictoriatouristJson();
-//        if (ObjectUtil.isNotEmpty(victoriatouristJson1)) {
-//            //去申购单取仓库id
-//            JSONObject json1 = JSONObject.parseObject(victoriatouristJson1);
-//            Long receiptWarehouseId = json1.getLong("receiptWarehouseId");
-//            json.put("receiptWarehouseId", receiptWarehouseId);
-//        }
-//        //赋值物流公司名称
-//        CompanyInfo logisticsCompanyCode = companyInfoService.getOne(q -> q.eq(CompanyInfo::getCode, json.getString("logisticsCompanyCode")));
-//        json.put("logisticsCompanyName", logisticsCompanyCode.getName());
-//        //修改发货记录的状态为到货
-//        wdlyService.updateDeliverGoodsStatus(deliverGoodsId);
-//
-//        //获取采购信息
-//        Purchase purchase = purchaseService.getById(deliverGoodsInfo.getPurchaseId());
-//
-//        //----------
-//        StockWait stockWait = new StockWait();
-//        stockWait.setType(1);//入库
-//        stockWait.setStatus(0);//待入库
-//        stockWait.setBusinessType(StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType());//采购到货
-//        //将业务信息设置成采购id和采购编码
-//        stockWait.setBusinessId(purchase.getId());
-//        String victoriatouristJson2 = purchase.getVictoriatouristJson();
-//        JSONObject json2 = ObjectUtil.isNotEmpty(victoriatouristJson2) ? JSONObject.parseObject(victoriatouristJson2) : new JSONObject();
-////        stockWait.setBusinessCode(purchase.getCode());
-//        stockWait.setBusinessCode(json2.getString("contractCode"));
-//
-//        json.put("arrivalId", arrival.getId());
-//        json.put("arrivalCode", arrival.getCode());
-//        stockWait.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
-//        stockWaitService.save(stockWait);
-//
-//        //取出到货明细
-//        List<ArrivalDetail> arrivalDetailList = arrival.getArrivalDetailList();
-//        if (CollectionUtils.isEmpty(arrivalDetailList)) {
-//            return;
-//        }
-//
-//        List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
-//        List<Long> arrivalDids = arrivalDetailList.stream().map(ArrivalDetail::getPurchaseDetailId).collect(Collectors.toList());
-//        List<PurchaseDetail> purchaseDetailList = purchaseDetailService.listByIds(arrivalDids);
-//        if (ObjectUtil.isNotEmpty(purchaseDetailList)) {
-//            Map<Long, PurchaseDetail> purchaseDetailMap = purchaseDetailList.stream().collect(Collectors.toMap(PurchaseDetail::getId, Function.identity()));
-//            //获取发货明细
-//            List<DeliverGoodsDetailsPo> deliverGoodsDetailsInfo = wdlyService.getDeliverGoodsDetailsInfo(deliverGoodsId);
-//            Map<Long, DeliverGoodsDetailsPo> deliverGoodsDetailsInfoMap = deliverGoodsDetailsInfo.stream().collect(Collectors.toMap(DeliverGoodsDetailsPo::getId, Function.identity()));
-//            int flag = 0;//到货数量不等于发货数量计数
-//            for (ArrivalDetail d : arrivalDetailList) {
-//                Long id = IdWorker.getId();
-//                d.setId(id);
-//                d.setArrivalId(arrival.getId());
-//
-//                Long deliverGoodsDetailsId = d.getDeliverGoodsDetailsId();
-//                DeliverGoodsDetailsPo deliverGoodsDetailsPo = deliverGoodsDetailsInfoMap.get(deliverGoodsDetailsId);
-//                if (ObjectUtil.isEmpty(deliverGoodsDetailsPo)) {
-//                    throw new ServiceException("未找到发货明细信息");
-//                }
-//
-//                //如果到货数量不等于发货数量 创建异常
-//                if (deliverGoodsDetailsPo.getDeliverGoodsQuantity().compareTo(d.getCount()) != 0) {
-//                    flag++;
-//                }
-//
-//                StockWaitDetails stockWaitDetails = new StockWaitDetails();
-//                stockWaitDetails.setStockWaitId(stockWait.getId());
-//                //业务明细id设置成到货明细id
-//                stockWaitDetails.setBusinessDetailsId(d.getId());
-//                stockWaitDetails.setProductId(d.getBussinessId());
-//                stockWaitDetails.setQuantity(d.getCount());
-//                //赋值已采购数量信息
-//                PurchaseDetail byId2 = purchaseDetailMap.get(d.getPurchaseDetailId());
-//                BigDecimal count = byId2.getCount();
-//                stockWaitDetails.setPurchaseQuantity(count);
-//                stockWaitDetailsList.add(stockWaitDetails);
-//            }
-//
-//            //存在到货数量不等于发货数量 创建异常
-//            if (flag != 0) {
-//                wdlyService.addAbnormalInfo(arrival.getId(), arrival.getCode());
-//            }
-//        }
-//        arrivalDetailService.saveBatch(arrivalDetailList);
-////        DynamicDataSourceContextHolder.push(SourceConstant.WMS);
-//        stockWaitDetailsService.saveBatch(stockWaitDetailsList);
-////        DynamicDataSourceContextHolder.poll();
-//
-//        //修改到货状态
-//        Integer flag = 0;
-//        List<PurchaseDetail> purchaseDetailsList1 = purchaseDetailService.list(q -> q.eq(PurchaseDetail::getPurchaseId, purchase.getId()));
-//        if (ObjectUtil.isNotEmpty(purchaseDetailsList1)) {
-//            List<Long> purchaseDetailsIds = purchaseDetailsList1.stream().map(PurchaseDetail::getId).collect(Collectors.toList());
-//            List<ArrivalDetail> arrivalDetailsList1 = arrivalDetailService.list(q -> q.in(ArrivalDetail::getPurchaseDetailId, purchaseDetailsIds));
-//            if (ObjectUtil.isNotEmpty(arrivalDetailsList1)) {
-//                Map<Long, List<ArrivalDetail>> arrivalDetailsMap = arrivalDetailsList1.stream().collect(Collectors.groupingBy(ArrivalDetail::getPurchaseDetailId));
-//                for (PurchaseDetail purchaseDetail : purchaseDetailsList1) {
-//                    List<ArrivalDetail> arrivalDetails = arrivalDetailsMap.get(purchaseDetail.getId());
-//                    BigDecimal count = arrivalDetails.stream()
-//                            .map(ArrivalDetail::getCount)
-//                            .reduce(BigDecimal.ZERO, BigDecimal::add);
-//                    if (count.compareTo(purchaseDetail.getCount()) >= 0) {
-//                        flag++;
-//                    }
-//                }
-//                if (purchaseDetailsList1.size() == flag) {
-//                    //完全到货
-//                    purchase.setArrivalStatus(20);
-//                } else {
-//                    //部分到货
-//                    purchase.setArrivalStatus(10);
-//                }
-//                purchaseService.updateById(purchase);
-//            }
-//        }
-//    }
-
-    @Override
-    public void edit(ArrivalDto arrivalDto) {
-        this.updateById(arrivalDto);
-    }
-
-    @Override
-    public void delete(Long id) {
-        this.removeById(id);
-    }
-
-    /**
-     * 根据发货id获取本次发货的到货信息
-     */
-    @Override
-    public ArrivalVo arrivalInfo(Long deliverGoodsId) {
-        Assert.notEmpty(deliverGoodsId, "发货id不能为空");
-        ArrivalVo arrival = baseMapper.arrivalInfo(deliverGoodsId);
-        Assert.notEmpty(arrival, "查询不到到货信息");
-        List<ArrivalDetail> arrivalDetailList = arrivalDetailService.list(q -> q.eq(ArrivalDetail::getArrivalId, arrival.getId()));
-        List<ArrivalDetailVo> arrivalDetailVos = BeanUtil.copyToList(arrivalDetailList, ArrivalDetailVo.class);
-        //赋值产品信息
-        productInfoService.attributeAssign(arrivalDetailVos, ArrivalDetailVo::getBussinessId, (item, productInfo) -> {
-            item.setProductName(productInfo.getName());
-            item.setProductCustomCode(productInfo.getCustomCode());
-        });
-        arrival.setArrivalDetailVoList(arrivalDetailVos);
-        return arrival;
-    }
-
-}

hx-purchase/src/main/java/com/fjhx/purchase/util/code/CodeEnum.java

@@ -1,110 +0,0 @@
-package com.fjhx.purchase.util.code;
-
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.purchase.service.arrival.ArrivalService;
-import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.fjhx.purchase.service.quality.QualityService;
-import com.fjhx.purchase.service.sales.SalesReturnService;
-import com.fjhx.purchase.service.subscribe.SubscribeService;
-import com.ruoyi.common.exception.ServiceException;
-import lombok.Getter;
-
-import java.util.Date;
-import java.util.Map;
-
-@Getter
-public enum CodeEnum {
-
-    //申购
-    SUBSCRIBE("PR", "yyMM-", "code", 3, SubscribeService.class),
-    //采购
-    PURCHASE("PO", "yyMM-", "code", 3, PurchaseService.class),
-    //到货
-    ARRIVAL("PA", "yyMM-", "code", 3, ArrivalService.class),
-    //质检
-    QUALITY("ZJ", "yyMM-", "code", 3, QualityService.class),
-    //退货
-    SALES_RETURN("ZJ", "yyMM-", "code", 3, SalesReturnService.class),
-    ;
-
-    CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
-        this.prefix = prefix;
-        this.dateFormat = dateFormat;
-        this.length = length;
-        this.codeFieldName = codeFieldName;
-        this.service = SpringUtil.getBean(serviceCls);
-    }
-
-    // 编码前缀
-    private final String prefix;
-    // 编码加日期规则
-    private final String dateFormat;
-    // 长度
-    private final Integer length;
-    // 编码字段名
-    private final String codeFieldName;
-    // service
-    private final IService<?> service;
-
-    /**
-     * 获取键值对
-     */
-    public String getCode() {
-        String itemPrefix;
-
-        if (ObjectUtil.isNotEmpty(dateFormat)) {
-            Date date = new Date();
-            String format = DateUtil.format(date, dateFormat);
-            itemPrefix = prefix + format;
-        } else {
-            itemPrefix = prefix;
-        }
-
-        Object obj = service.query()
-                .likeRight(codeFieldName, itemPrefix)
-                .orderByDesc(codeFieldName)
-                .last("limit 1")
-                .one();
-
-        if (obj == null) {
-            return itemPrefix + autoGenericCode(length, 0);
-        }
-
-        Map<String, Object> map = Convert.toMap(String.class, Object.class, obj);
-
-        String code = Convert.toStr(map.get(CharSequenceUtil.toCamelCase(codeFieldName)));
-        Integer codeNum = Convert.toInt(code.substring(itemPrefix.length()));
-        if (ObjectUtil.isEmpty(codeNum)) {
-            throw new ServiceException("自定义编码与系统编码生成规则冲突，暂时无法生成编码，请联系管理员");
-        }
-
-        return itemPrefix + autoGenericCode(length, codeNum);
-    }
-
-    /**
-     * 获取键值对
-     */
-    public String getCode(String code) {
-        if (ObjectUtil.isNotEmpty(code)) {
-            Long count = service.query().eq(codeFieldName, code).count();
-            if (count != 0) {
-                throw new ServiceException("编码已存在");
-            }
-            return code;
-        } else {
-            return getCode();
-        }
-    }
-    /**
-     * 不够位数的在前面补0，保留num的长度位数字
-     */
-    private static String autoGenericCode(int length, Integer codeNum) {
-        return String.format("%0" + length + "d", codeNum + 1);
-    }
-
-}

hx-purchase/src/main/resources/mapper/arrival/ArrivalDetailMapper.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.purchase.mapper.arrival.ArrivalDetailMapper">
-    <select id="getPage" resultType="com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo">
-        SELECT t1.*,
-               t2.`code`,
-               t2.supply_id,
-               IFNULL(SUM(t3.qualified_count), 0)    AS qualifiedCount,
-               IFNULL(SUM(t3.no_qualified_count), 0) AS noQualifiedCount
-        FROM arrival_detail t1
-                 LEFT JOIN arrival t2 ON t1.arrival_id = t2.id
-                 LEFT JOIN quality_detail t3 ON t1.id = t3.arrival_detail_id
-                 LEFT JOIN purchase_detail pd ON t1.purchase_detail_id = pd.id
-                 LEFT JOIN purchase p ON pd.purchase_id = p.id
-            ${ew.customSqlSegment}
-    </select>
-
-    <select id="getSumCount" resultType="java.math.BigDecimal">
-        SELECT
-            IFNULL(SUM( count ) ,0) AS sumArrivalCount
-        FROM
-            arrival_detail
-        WHERE
-            purchase_detail_id = #{purchaseDetailId}
-          AND bussiness_id = #{businessId}
-    </select>
-    <select id="getArrivalDetail" resultType="com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo">
-        SELECT
-            a.purchase_id,
-            ad.*
-        FROM
-            arrival a
-                JOIN arrival_detail ad ON ad.arrival_id = a.id
-            ${ew.customSqlSegment}
-    </select>
-</mapper>

hx-purchase/src/main/resources/mapper/arrival/ArrivalMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.purchase.mapper.arrival.ArrivalMapper">
-    <select id="getPage" resultType="com.fjhx.purchase.entity.arrival.vo.ArrivalVo">
-        select
-            a.id,
-            a.code,
-            a.supply_id,
-            a.purchase_id,
-            a.status,
-            a.create_user,
-            a.create_time,
-            a.update_user,
-            a.update_time
-        from arrival a
-            ${ew.customSqlSegment}
-    </select>
-    <select id="arrivalInfo" resultType="com.fjhx.purchase.entity.arrival.vo.ArrivalVo">
-        SELECT
-            *
-        FROM
-            arrival
-        WHERE
-                json_unquote( victoriatourist_json -> '$.deliverGoodsId' ) = #{deliverGoodsId}
-    </select>
-
-</mapper>

hx-wms/src/main/java/com/fjhx/wms/service/MyPurchaseService.java

@@ -1,20 +1,13 @@
 package com.fjhx.wms.service;
 
-import com.fjhx.wms.entity.arrival.po.ArrivalDetailPo;
 import com.fjhx.wms.entity.purchase.po.PurchaseDetailPo;
 import com.fjhx.wms.entity.purchase.po.PurchasePo;
 
-import java.util.List;
 import java.util.Map;
 
 public interface MyPurchaseService {
 
     /**
-     * 修改采购退货状态
-     */
-    void updateSalesReturnStatus(Long id, Integer status);
-
-    /**
      * 获取采购信息
      */
     PurchasePo getPurchaseInfo(Long id);
@@ -24,18 +17,4 @@ public interface MyPurchaseService {
      */
     Map<Long, PurchaseDetailPo> grtPurchaseDetail(Long id);
 
-    /**
-     * 获取到货明细信息
-     */
-    ArrivalDetailPo getArrivalDetailInfo(Long id);
-
-    /**
-     * 获取到货明细列表
-     */
-    List<ArrivalDetailPo> getArrivalDetailList(List<Long> ids);
-
-    /**
-     * 获取采购明细列表
-     */
-    List<PurchaseDetailPo> getPurchaseDetailList(List<Long> ids);
 }