出入库流水类型调整

hx-mes/src/main/java/com/fjhx/mes/service/border/impl/BorderOfLineServiceImpl.java

@@ -16,7 +16,6 @@ import com.fjhx.mes.entity.border.vo.BorderOfLineVo;
 import com.fjhx.mes.mapper.border.BorderOfLineMapper;
 import com.fjhx.mes.service.border.BorderOfLineJournalService;
 import com.fjhx.mes.service.border.BorderOfLineService;
-import com.fjhx.wms.entity.stock.emums.StockWaitType;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
@@ -28,8 +27,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 
 /**
@@ -76,41 +73,6 @@ public class BorderOfLineServiceImpl extends ServiceImpl<BorderOfLineMapper, Bor
             item.setProductTypeName(classify.getName());
         });
 
-//        //赋值产品信息
-//        List<Long> productIds = records.stream().map(BorderOfLine::getProductId).collect(Collectors.toList());
-//        if (ObjectUtil.isEmpty(productIds)) {
-//            return page;
-//        }
-//
-//        List<ProductInfo> productInfos = productInfoService.listByIds(productIds);
-//        List<Long> productClassifyIds = productInfos.stream().map(ProductInfo::getProductClassifyId).collect(Collectors.toList());
-//        if (ObjectUtil.isEmpty(productClassifyIds)) {
-//            return page;
-//        }
-//
-//        List<ProductClassify> productClassifies = productClassifyService.listByIds(productClassifyIds);
-//        if (ObjectUtil.isNotEmpty(productClassifies)) {
-//            Map<Long, ProductInfo> productInfoMap = productInfos.stream().collect(Collectors.groupingBy(ProductInfo::getId,
-//                    Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
-//            Map<Long, ProductClassify> productClassifyMap = productClassifies.stream().collect(Collectors.groupingBy(ProductClassify::getId,
-//                    Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
-//            for (BorderOfLineVo borderOfLineVo : records) {
-//                ProductInfo productInfo = productInfoMap.get(borderOfLineVo.getProductId());
-//                if (ObjectUtil.isNotEmpty(productInfo)) {
-//
-//                    borderOfLineVo.setProductName(productInfo.getName());
-//
-//                    ProductClassify productClassify = productClassifyMap.get(productInfo.getProductClassifyId());
-//                    if (ObjectUtil.isNotEmpty(productClassify)) {
-//
-//                        borderOfLineVo.setProductTypeName(productClassify.getName());
-//
-//                    }
-//                }
-//            }
-//        }
-
-
         return page;
     }
 
@@ -164,7 +126,7 @@ public class BorderOfLineServiceImpl extends ServiceImpl<BorderOfLineMapper, Bor
         if (borderOfLineDto.getType() == 2) {
             StockWait stockWait = new StockWait();
             stockWait.setType(1);
-            stockWait.setBusinessType(StockWaitType.BORDER_OF_LINE_IN.getDetailType());
+//            stockWait.setBusinessType(StockWaitType.BORDER_OF_LINE_IN.getDetailType());
             stockWait.setBusinessId(borderOfLineJournal.getId());
             stockWait.setStatus(0);
             stockWaitService.save(stockWait);

hx-mes/src/main/java/com/fjhx/mes/service/completion/impl/CompletionInfoServiceImpl.java

@@ -19,7 +19,7 @@ import com.fjhx.mes.service.completion.CompletionInfoService;
 import com.fjhx.mes.service.production.ProductionPlanService;
 import com.fjhx.mes.service.production.ProductionTaskService;
 import com.fjhx.mes.service.work.WorkOrderService;
-import com.fjhx.wms.entity.stock.emums.StockWaitType;
+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;
@@ -114,7 +114,7 @@ public class CompletionInfoServiceImpl extends ServiceImpl<CompletionInfoMapper,
         //添加一条完工入库类型的待入库数据
         StockWait stockWait = new StockWait();
         stockWait.setType(1);
-        stockWait.setBusinessType(StockWaitType.COMPLETION_IN.getDetailType());
+        stockWait.setBusinessType(JournalType.COMPLETION_IN.getDetailType());
         stockWait.setBusinessId(completionInfoDto.getId());
         stockWait.setStatus(0);
         stockWaitService.save(stockWait);

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskDetailServiceImpl.java

@@ -21,7 +21,7 @@ import com.fjhx.mes.service.production.*;
 import com.fjhx.mes.service.technology.TechnologyService;
 import com.fjhx.mes.service.work.WorkOrderProductionProcessesService;
 import com.fjhx.mes.service.work.WorkOrderService;
-import com.fjhx.wms.entity.stock.emums.StockWaitType;
+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;
@@ -184,7 +184,7 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
         StockWait stockWait = new StockWait();
         stockWait.setType(1);//入库
         stockWait.setStatus(0);//待入库
-        stockWait.setBusinessType(StockWaitType.COMPLETION_IN.getDetailType());//
+        stockWait.setBusinessType(JournalType.COMPLETION_IN.getDetailType());//
         stockWait.setBusinessId(productionTaskDetail.getId());//生产任务明细id
         stockWait.setBusinessCode(productionTaskDetail.getProductSn());//产品sn
         stockWaitService.save(stockWait);

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskServiceImpl.java

@@ -31,7 +31,7 @@ import com.fjhx.mes.service.work.WorkOrderBomService;
 import com.fjhx.mes.service.work.WorkOrderProductionProcessesService;
 import com.fjhx.mes.service.work.WorkOrderService;
 import com.fjhx.mes.utils.code.CodeEnum;
-import com.fjhx.wms.entity.stock.emums.StockWaitType;
+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;
@@ -174,7 +174,7 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
         stockWait.setBusinessId(productionTaskDto.getId());
         stockWait.setType(2);//出库
         stockWait.setStatus(0);//待出库
-        stockWait.setBusinessType(StockWaitType.PRODUCTION_TASK_OUT.getDetailType());//生产任务出库
+        stockWait.setBusinessType(JournalType.PROD_OUT.getDetailType());//生产任务出库
         stockWaitService.save(stockWait);
         //创建待出库明细
         List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();

hx-purchase/src/main/java/com/fjhx/purchase/flow/SalesReturnFlow.java

@@ -1,127 +1,127 @@
-package com.fjhx.purchase.flow;
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.common.enums.CodingRuleEnum;
-import com.fjhx.common.service.coding.CodingRuleService;
-import com.fjhx.flow.core.FlowDelegate;
-import com.fjhx.flow.enums.FlowStatusEnum;
-import com.fjhx.purchase.entity.sales.enums.SalesReturnDetailStatusEnum;
-import com.fjhx.purchase.entity.sales.enums.SalesReturnStatusEnum;
-import com.fjhx.purchase.entity.sales.po.SalesReturn;
-import com.fjhx.purchase.entity.sales.po.SalesReturnDetail;
-import com.fjhx.purchase.service.sales.SalesReturnDetailService;
-import com.fjhx.purchase.service.sales.SalesReturnService;
-import com.fjhx.wms.entity.stock.emums.StockWaitType;
-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.exception.ServiceException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 退货流程
- *
- * @Author:caozj
- * @DATE:2023/4/3 17:38
- */
-//@DS(SourceConstant.PURCHASE)
-@Component
-public class SalesReturnFlow extends FlowDelegate {
-
-    @Autowired
-    StockWaitDetailsService stockWaitDetailsService;
-
-    @Autowired
-    private CodingRuleService codingRuleService;
-
-    @Override
-    public String getFlowKey() {
-        return "sales_return_flow";
-    }
-
-
-    /**
-     * 发起流程
-     *
-     * @param flowId     流程ID
-     * @param submitData 数据
-     * @return
-     */
-    @Override
-    public Long start(Long flowId, JSONObject submitData) {
-        SalesReturnService salesReturnService = SpringUtil.getBean(SalesReturnService.class);
-        SalesReturnDetailService salesReturnDetailService = SpringUtil.getBean(SalesReturnDetailService.class);
-        SalesReturn salesReturn = submitData.toJavaObject(SalesReturn.class);
-//        salesReturn.setCode(CodeEnum.SALES_RETURN.getCode());
-        salesReturn.setCode(codingRuleService.createCode(CodingRuleEnum.SALES_RETURN.getKey(),null));
-        salesReturnService.save(salesReturn);
-        List<SalesReturnDetail> salesReturnDetailList = salesReturn.getSalesReturnDetailList();
-        if (CollectionUtils.isNotEmpty(salesReturnDetailList)) {
-            for (SalesReturnDetail s : salesReturnDetailList) {
-                s.setSalesReturnId(salesReturn.getId());
-            }
-            salesReturnDetailService.saveBatch(salesReturnDetailList);
-        }
-        return salesReturn.getId();
-    }
-
-    /**
-     * 结束流程
-     *
-     * @param flowId     流程ID
-     * @param businessId 业务ID
-     * @param submitData 数据
-     */
-    @Override
-    public void end(Long flowId, Long businessId, JSONObject submitData) {
-        SalesReturnService salesReturnService = SpringUtil.getBean(SalesReturnService.class);
-        SalesReturnDetailService salesReturnDetailService = SpringUtil.getBean(SalesReturnDetailService.class);
-        StockWaitService stockWaitService = SpringUtil.getBean(StockWaitService.class);
-        //通过业务ID查询退货数据
-        SalesReturn salesReturn = salesReturnService.getById(businessId);
-        if (ObjectUtils.isEmpty(salesReturn)) {
-            throw new ServiceException("退货单单不存在");
-        }
-        //修改退货状态为待退货
-        salesReturn.setStatus(SalesReturnStatusEnum.PASS.getKey());
-        salesReturn.setApprovedDate(new Date());
-        salesReturnService.updateById(salesReturn);
-        //修改退货明细状态为待退货
-        SalesReturnDetail detail = new SalesReturnDetail();
-        detail.setStatus(SalesReturnDetailStatusEnum.STATUS_20.getKey());
-        salesReturnDetailService.update(detail, Wrappers.<SalesReturnDetail>query()
-                .lambda().eq(SalesReturnDetail::getSalesReturnId, salesReturn.getId()));
-        List<SalesReturnDetail> salesReturnDetailList = salesReturnDetailService.list(Wrappers.<SalesReturnDetail>query()
-                .lambda().eq(SalesReturnDetail::getSalesReturnId, salesReturn.getId()));
-        //添加一份待出库数据
-        StockWait stockWait = new StockWait();
-        stockWait.setBusinessId(businessId);
-        stockWait.setType(2);//入库
-        stockWait.setStatus(0);//待入库
-        stockWait.setBusinessType(StockWaitType.BACK_OUT.getDetailType());//退货出库
-        stockWaitService.save(stockWait);
-        List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
-        for (SalesReturnDetail s : salesReturnDetailList) {
-            StockWaitDetails stockWaitDetails = new StockWaitDetails();
-            stockWaitDetails.setStockWaitId(stockWait.getId());
-            stockWaitDetails.setProductId(s.getBussinessId());
-            stockWaitDetails.setBusinessDetailsId(s.getId());//到货明细ID
-            stockWaitDetails.setQuantity(s.getCount());
-            stockWaitDetailsList.add(stockWaitDetails);
-        }
-        stockWaitDetailsService.saveBatch(stockWaitDetailsList);
-    }
-
-}
+//package com.fjhx.purchase.flow;
+//
+//import cn.hutool.extra.spring.SpringUtil;
+//import com.alibaba.fastjson.JSONObject;
+//import com.baomidou.dynamic.datasource.annotation.DS;
+//import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+//import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+//import com.fjhx.common.constant.SourceConstant;
+//import com.fjhx.common.enums.CodingRuleEnum;
+//import com.fjhx.common.service.coding.CodingRuleService;
+//import com.fjhx.flow.core.FlowDelegate;
+//import com.fjhx.flow.enums.FlowStatusEnum;
+//import com.fjhx.purchase.entity.sales.enums.SalesReturnDetailStatusEnum;
+//import com.fjhx.purchase.entity.sales.enums.SalesReturnStatusEnum;
+//import com.fjhx.purchase.entity.sales.po.SalesReturn;
+//import com.fjhx.purchase.entity.sales.po.SalesReturnDetail;
+//import com.fjhx.purchase.service.sales.SalesReturnDetailService;
+//import com.fjhx.purchase.service.sales.SalesReturnService;
+//import com.fjhx.wms.entity.stock.emums.StockWaitType;
+//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.exception.ServiceException;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.ArrayList;
+//import java.util.Date;
+//import java.util.List;
+//
+///**
+// * 退货流程
+// *
+// * @Author:caozj
+// * @DATE:2023/4/3 17:38
+// */
+////@DS(SourceConstant.PURCHASE)
+//@Component
+//public class SalesReturnFlow extends FlowDelegate {
+//
+//    @Autowired
+//    StockWaitDetailsService stockWaitDetailsService;
+//
+//    @Autowired
+//    private CodingRuleService codingRuleService;
+//
+//    @Override
+//    public String getFlowKey() {
+//        return "sales_return_flow";
+//    }
+//
+//
+//    /**
+//     * 发起流程
+//     *
+//     * @param flowId     流程ID
+//     * @param submitData 数据
+//     * @return
+//     */
+//    @Override
+//    public Long start(Long flowId, JSONObject submitData) {
+//        SalesReturnService salesReturnService = SpringUtil.getBean(SalesReturnService.class);
+//        SalesReturnDetailService salesReturnDetailService = SpringUtil.getBean(SalesReturnDetailService.class);
+//        SalesReturn salesReturn = submitData.toJavaObject(SalesReturn.class);
+////        salesReturn.setCode(CodeEnum.SALES_RETURN.getCode());
+//        salesReturn.setCode(codingRuleService.createCode(CodingRuleEnum.SALES_RETURN.getKey(),null));
+//        salesReturnService.save(salesReturn);
+//        List<SalesReturnDetail> salesReturnDetailList = salesReturn.getSalesReturnDetailList();
+//        if (CollectionUtils.isNotEmpty(salesReturnDetailList)) {
+//            for (SalesReturnDetail s : salesReturnDetailList) {
+//                s.setSalesReturnId(salesReturn.getId());
+//            }
+//            salesReturnDetailService.saveBatch(salesReturnDetailList);
+//        }
+//        return salesReturn.getId();
+//    }
+//
+//    /**
+//     * 结束流程
+//     *
+//     * @param flowId     流程ID
+//     * @param businessId 业务ID
+//     * @param submitData 数据
+//     */
+//    @Override
+//    public void end(Long flowId, Long businessId, JSONObject submitData) {
+//        SalesReturnService salesReturnService = SpringUtil.getBean(SalesReturnService.class);
+//        SalesReturnDetailService salesReturnDetailService = SpringUtil.getBean(SalesReturnDetailService.class);
+//        StockWaitService stockWaitService = SpringUtil.getBean(StockWaitService.class);
+//        //通过业务ID查询退货数据
+//        SalesReturn salesReturn = salesReturnService.getById(businessId);
+//        if (ObjectUtils.isEmpty(salesReturn)) {
+//            throw new ServiceException("退货单单不存在");
+//        }
+//        //修改退货状态为待退货
+//        salesReturn.setStatus(SalesReturnStatusEnum.PASS.getKey());
+//        salesReturn.setApprovedDate(new Date());
+//        salesReturnService.updateById(salesReturn);
+//        //修改退货明细状态为待退货
+//        SalesReturnDetail detail = new SalesReturnDetail();
+//        detail.setStatus(SalesReturnDetailStatusEnum.STATUS_20.getKey());
+//        salesReturnDetailService.update(detail, Wrappers.<SalesReturnDetail>query()
+//                .lambda().eq(SalesReturnDetail::getSalesReturnId, salesReturn.getId()));
+//        List<SalesReturnDetail> salesReturnDetailList = salesReturnDetailService.list(Wrappers.<SalesReturnDetail>query()
+//                .lambda().eq(SalesReturnDetail::getSalesReturnId, salesReturn.getId()));
+//        //添加一份待出库数据
+//        StockWait stockWait = new StockWait();
+//        stockWait.setBusinessId(businessId);
+//        stockWait.setType(2);//入库
+//        stockWait.setStatus(0);//待入库
+//        stockWait.setBusinessType(StockWaitType.BACK_OUT.getDetailType());//退货出库
+//        stockWaitService.save(stockWait);
+//        List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
+//        for (SalesReturnDetail s : salesReturnDetailList) {
+//            StockWaitDetails stockWaitDetails = new StockWaitDetails();
+//            stockWaitDetails.setStockWaitId(stockWait.getId());
+//            stockWaitDetails.setProductId(s.getBussinessId());
+//            stockWaitDetails.setBusinessDetailsId(s.getId());//到货明细ID
+//            stockWaitDetails.setQuantity(s.getCount());
+//            stockWaitDetailsList.add(stockWaitDetails);
+//        }
+//        stockWaitDetailsService.saveBatch(stockWaitDetailsList);
+//    }
+//
+//}

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

@@ -10,7 +10,6 @@ import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.kd100.service.company.CompanyInfoService;
 import com.fjhx.purchase.entity.arrival.dto.ArrivalDto;
 import com.fjhx.purchase.entity.arrival.dto.ArrivalSelectDto;
 import com.fjhx.purchase.entity.arrival.po.Arrival;
@@ -21,12 +20,8 @@ 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.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
-import com.fjhx.purchase.service.subscribe.SubscribeService;
-import com.fjhx.supply.service.supplier.SupplierInfoService;
-import com.fjhx.wms.entity.stock.emums.StockWaitType;
+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;
@@ -65,20 +60,6 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
 
     @Autowired
     private StockWaitDetailsService stockWaitDetailsService;
-
-    @Autowired
-    private SubscribeDetailService subscribeDetailService;
-
-    @Autowired
-    private SubscribeService subscribeService;
-
-    @Autowired
-    private PurchaseDetailService purchaseDetailService;
-
-    @Autowired
-    private CompanyInfoService companyInfoService;
-    @Autowired
-    private SupplierInfoService supplierInfoService;
     @Autowired
     private ProductInfoService productInfoService;
 
@@ -131,7 +112,7 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
             stockWait.setBusinessCode(purchase.getCode());// 采购编码
             stockWait.setType(1);// 入库
             stockWait.setStatus(0);// 待入库
-            stockWait.setBusinessType(StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType());// 采购到货
+            stockWait.setBusinessType(JournalType.PURCHASE_IN.getDetailType());// 采购到货
             stockWaitService.save(stockWait);
 
             List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();

hx-sale/src/main/java/com/fjhx/sale/flow/EhsdPurchaseFlow.java

@@ -20,8 +20,6 @@ import com.fjhx.item.enums.ProductAvailableRecordType;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
-import com.fjhx.purchase.mapper.subscribe.SubscribeDetailMapper;
-import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseDto;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
@@ -35,7 +33,7 @@ import com.fjhx.sale.service.purchase.EhsdPurchaseProjectService;
 import com.fjhx.sale.service.purchase.EhsdPurchaseService;
 import com.fjhx.sale.service.sample.SampleProductService;
 import com.fjhx.sale.service.sample.SampleService;
-import com.fjhx.wms.entity.stock.emums.StockWaitType;
+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;
@@ -76,8 +74,6 @@ public class EhsdPurchaseFlow extends FlowDelegate {
     @Autowired
     private CodingRuleService codingRuleService;
     @Autowired
-    private SubscribeDetailService subscribeDetailService;
-    @Autowired
     private ContractService contractService;
     @Autowired
     private SampleService sampleService;
@@ -87,8 +83,6 @@ public class EhsdPurchaseFlow extends FlowDelegate {
     private StockWaitService stockWaitService;
     @Autowired
     private StockWaitDetailsService stockWaitDetailsService;
-    @Autowired
-    private SubscribeDetailMapper subscribeDetailMapper;
 
     @Override
     public String getFlowKey() {
@@ -250,7 +244,7 @@ public class EhsdPurchaseFlow extends FlowDelegate {
         //采购审批通过 生成待入库数据
         StockWait stockWait = new StockWait();
         stockWait.setType(1);
-        stockWait.setBusinessType(StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType());
+        stockWait.setBusinessType(JournalType.PURCHASE_IN.getDetailType());
         stockWait.setBusinessId(purchase.getId());
         stockWait.setBusinessCode(purchase.getCode());
         stockWait.setStatus(0);

hx-wms/src/main/java/com/fjhx/wms/entity/stock/emums/JournalType.java

@@ -1,41 +1,56 @@
 package com.fjhx.wms.entity.stock.emums;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fjhx.common.enums.InOutType;
+import com.ruoyi.common.exception.ServiceException;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @AllArgsConstructor
 @Getter
 public enum JournalType {
-    MANUAL_IN(InOutType.IN, 1, "手动入库", ""),
-    MANUAL_OUT(InOutType.OUT, 2, "手动出库", ""),
-    ADJUSTING_IN(InOutType.IN, 3, "调仓入库", ""),
-    COMBINATION_IN(InOutType.IN, 6, "组合入库", "group_record_details"),
-    COMBINATION_OUT(InOutType.OUT, 7, "组合出库", "group_record_details"),
-    SPLIT_IN(InOutType.IN, 8, "组合拆分入库", "group_record_details"),
-    SPLIT_OUT(InOutType.OUT, 9, "组合拆分出库", "group_record_details"),
-    JD_SALES_OUT(InOutType.OUT, 10, "京东销售出库", "sales_record"),
-    ADJUSTING_OUT(InOutType.OUT, 11, "调仓出库", ""),
-    SALES_OUT(InOutType.OUT, 12, "销售订单出库", ""),
-    BACK_OUT(InOutType.OUT, 13, "待出库 退货出库", ""),
-    ARRIVAL_IN(InOutType.IN, 14, "到货入库", ""),
-    JD_BACK_IN(InOutType.IN, 15, "京东退货入库", ""),
-
-
-    //待出入库类型
-    BORDER_OF_LINE_IN(InOutType.IN, 16, "待入库 线边回仓", ""),
-    COMPLETION_IN(InOutType.IN, 17, "待入库 完工入库", ""),
-    PURCHASE_ARRIVAL_IN(InOutType.IN, 18, "待入库 采购到货", ""),
-    ARRIVAL_QUALITY(InOutType.IN, 19, "到货质检", "quality_info"),
-    PRODUCTION_TASK_OUT(InOutType.OUT, 20, "生产任务待出库出库", "production_task"),
-
-    WORD_ORDER_OUT(InOutType.OUT, 21, "工单出库待出库出库", "work_order"),
-    STOCK_CHECK_IN(InOutType.IN, 22, "库存盘点修正入库", "stock_check"),
-    STOCK_CHECK_OUT(InOutType.OUT, 23, "库存盘点修正出库", "stock_check"),
-    CONTRACT_SALE_OUT(InOutType.OUT, 24, "合同销售出库", ""),
-    AFTER_SALES_MATERIAL_OUT(InOutType.OUT, 25, "售后物料出库", "after_sales_record"),
-    ;
 
+    //出库
+    PROD_PROOFING_OUT(InOutType.OUT, 0, "生产打样", ""),//手动出库
+    PROD_EXCEED_OUT(InOutType.OUT, 1, "生产超领", ""),//手动出库
+    SALE_OUT(InOutType.OUT, 2, "销售出库", ""),//手动出库
+    BORROW_OUT(InOutType.OUT, 3, "借用出库", ""),//手动出库
+    REPAIR_EXCEED_OUT(InOutType.OUT, 4, "补单超领", ""),//待出库-APP补单
+    LOSE_EXCEED_OUT(InOutType.OUT, 5, "丢件超领", ""),//待出库-APP丢单
+    PURCHASE_RETURN_OUT(InOutType.OUT, 6, "采购退货", ""),//待出库-采购退货
+    TRANSFER_OUT(InOutType.OUT, 7, "调拨出库", ""),//调仓
+    STOCK_CHECK_OUT(InOutType.OUT, 8, "盘亏出库", ""),//库存盘点
+    PROD_OUT(InOutType.OUT, 9, "生产出库", ""),//待出库-生产出库
+
+
+    //入库
+    RESTITUTION_IN(InOutType.IN, 100, "归还入库", ""),//手动入库
+    MATERIAL_RETURN_IN(InOutType.IN, 101, "退料入库", ""),//手动入库
+    DISCARD_MATERIAL_IN(InOutType.IN, 102, "废料入库", ""),//手动入库
+    LOSE_IN(InOutType.IN, 103, "丢件寻回", ""),//手动入库
+    PURCHASE_IN(InOutType.IN, 104, "采购入库", ""),//待入库-采购入库
+    TRANSFER_IN(InOutType.IN, 105, "调拨入库", ""),//调仓
+    STOCK_CHECK_IN(InOutType.IN, 106, "盘盈入库", ""),//库存盘点
+    COMPLETION_IN(InOutType.IN, 107, "完工入库", "");//待入库-完工入库
+
+    private final static Map<Integer, JournalType> map = new HashMap<>();
+
+    static {
+        for (JournalType value : JournalType.values()) {
+            map.put(value.detailType, value);
+        }
+    }
+
+    public static JournalType getByDetailType(Integer detailType) {
+        JournalType journalType = map.get(detailType);
+        if (ObjectUtil.isEmpty(journalType)) {
+            throw new ServiceException("未知流水类型");
+        }
+        return journalType;
+    }
 
     /**
      * 出入库类型

hx-wms/src/main/java/com/fjhx/wms/entity/stock/emums/StockWaitType.java

@@ -1,61 +1,64 @@
-package com.fjhx.wms.entity.stock.emums;
-
-import com.fjhx.common.enums.InOutType;
-import com.ruoyi.common.exception.ServiceException;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@AllArgsConstructor
-@Getter
-public enum StockWaitType {
-
-    BORDER_OF_LINE_IN(InOutType.IN, JournalType.BORDER_OF_LINE_IN, 1, "线边回仓", ""),
-    COMPLETION_IN(InOutType.IN, JournalType.COMPLETION_IN, 2, "完工入库", ""),
-    PURCHASE_ARRIVAL_IN(InOutType.IN, JournalType.PURCHASE_ARRIVAL_IN, 3, "采购到货", ""),
-    BACK_OUT(InOutType.OUT, JournalType.BACK_OUT, 4, "退货出库", ""),
-    SALE_ORDER_OUT(InOutType.OUT, JournalType.SALES_OUT, 6, "销售订单出库", "order_info"),
-    PRODUCTION_TASK_OUT(InOutType.OUT, JournalType.PRODUCTION_TASK_OUT, 7, "生产任务待出库", "production_task");
-
-
-    private final static Map<Integer, StockWaitType> map = new HashMap<>();
-
-    static {
-        for (StockWaitType value : StockWaitType.values()) {
-            map.put(value.detailType, value);
-        }
-    }
-
-    /**
-     * 出入库类型
-     */
-    private final InOutType type;
-    /**
-     * 出入库流水类型
-     */
-    private final JournalType journalType;
-    /**
-     * 详细类型
-     */
-    private final Integer detailType;
-
-    /**
-     * 信息类型说明
-     */
-    private final String detailTypeRemark;
-
-    /**
-     * 关联业务表名
-     */
-    private final String linkBusinessTableName;
-
-
-    public static StockWaitType getEnum(Integer key) {
-        return map.computeIfAbsent(key, item -> {
-            throw new ServiceException("未知待出/入库类型");
-        });
-    }
-
-}
+//package com.fjhx.wms.entity.stock.emums;
+//
+//import com.fjhx.common.enums.InOutType;
+//import com.ruoyi.common.exception.ServiceException;
+//import lombok.AllArgsConstructor;
+//import lombok.Getter;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//@AllArgsConstructor
+//@Getter
+//public enum StockWaitType {
+//
+//    //待出库
+//    REPAIR_EXCEED_OUT(InOutType.OUT, JournalType.REPAIR_EXCEED_OUT, 1, "补单超领", ""),//待出库-APP补单
+//    LOSE_EXCEED_OUT(InOutType.OUT, JournalType.LOSE_EXCEED_OUT, 2, "丢件超领", ""),//待出库-APP丢单
+//    PURCHASE_RETURN_OUT(InOutType.OUT, JournalType.PURCHASE_RETURN_OUT, 3, "采购退货", ""),//待出库-采购退货
+//    PROD_OUT(InOutType.OUT, JournalType.PROD_OUT, 4, "生产任务待出库", ""),
+//
+//    //待入库
+//    COMPLETION_IN(InOutType.IN, JournalType.COMPLETION_IN, 100, "完工入库", ""),
+//    PURCHASE_ARRIVAL_IN(InOutType.IN, JournalType.PURCHASE_IN, 101, "采购入库", "");
+//
+//
+//    private final static Map<Integer, StockWaitType> map = new HashMap<>();
+//
+//    static {
+//        for (StockWaitType value : StockWaitType.values()) {
+//            map.put(value.detailType, value);
+//        }
+//    }
+//
+//    /**
+//     * 出入库类型
+//     */
+//    private final InOutType type;
+//    /**
+//     * 出入库流水类型
+//     */
+//    private final JournalType journalType;
+//    /**
+//     * 详细类型
+//     */
+//    private final Integer detailType;
+//
+//    /**
+//     * 信息类型说明
+//     */
+//    private final String detailTypeRemark;
+//
+//    /**
+//     * 关联业务表名
+//     */
+//    private final String linkBusinessTableName;
+//
+//
+//    public static StockWaitType getEnum(Integer key) {
+//        return map.computeIfAbsent(key, item -> {
+//            throw new ServiceException("未知待出/入库类型");
+//        });
+//    }
+//
+//}

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/Stock.java

@@ -35,16 +35,6 @@ public class Stock extends BasePo {
      */
     private BigDecimal quantity;
 
-//    /**
-//     * 维多利亚扩展
-//     */
-//    private String victoriatouristJson;
-//
-//    /**
-//     * 结存单价
-//     */
-//    private BigDecimal unitPrice;
-
     /**
      * 归属公司id
      */

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

@@ -118,7 +118,7 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
         stockJournalVo.setList(stockJournalDetailsVos);
 
         //流水打印数据赋值
-        if (JournalType.PURCHASE_ARRIVAL_IN.getDetailType().equals(stockJournalVo.getType())) {
+        if (JournalType.PURCHASE_IN.getDetailType().equals(stockJournalVo.getType())) {
             StockWait stockWait = stockWaitService.getById(stockJournalVo.getBusinessId());
             Assert.notEmpty(stockWait, "查询不到待出入库信息");
             PurchasePo purchase = myPurchaseService.getPurchaseInfo(stockWait.getBusinessId());

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

@@ -148,7 +148,9 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
     @DSTransactional
     public void add(StockDto stockDto) {
-        JournalType journalType = Objects.equals(stockDto.getType(), 1) ? JournalType.MANUAL_IN : JournalType.MANUAL_OUT;
+        //根据前端传的类型获取出入库流水类型
+        JournalType journalType = JournalType.getByDetailType(stockDto.getType());
+
         InOutType inOutType = journalType.getType();
 
         Long warehouseId = stockDto.getWarehouseId();
@@ -160,7 +162,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
         //创建出入库记录
         StockJournal stockJournal = new StockJournal();
-        stockJournal.setOpType(stockDto.getType());
+        stockJournal.setOpType(inOutType == InOutType.IN ? 1 : 2);
         stockJournal.setType(journalType.getDetailType());
         stockJournal.setCode(stockDto.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setWarehouseId(warehouseId);

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

@@ -14,15 +14,12 @@ import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
 import com.fjhx.wms.entity.stock.emums.JournalType;
-import com.fjhx.wms.entity.stock.emums.StockWaitType;
 import com.fjhx.wms.entity.stock.po.*;
 import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
 import com.fjhx.wms.entity.stock.vo.StockWaitVo;
 import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.mapper.stock.StockWaitMapper;
 import com.fjhx.wms.service.MyPurchaseService;
-import com.fjhx.wms.service.arrival.ArrivalStockRecordsDetailsService;
-import com.fjhx.wms.service.arrival.ArrivalStockRecordsService;
 import com.fjhx.wms.service.stock.*;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.fjhx.wms.utils.CodeEnum;
@@ -62,12 +59,6 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     @Autowired
     private WarehouseService warehouseService;
     @Autowired
-    private ArrivalStockRecordsService arrivalStockRecordsService;
-    @Autowired
-    private ArrivalStockRecordsDetailsService arrivalStockRecordsDetailsService;
-    @Autowired
-    private StockFrozenService stockFrozenService;
-    @Autowired
     private MyPurchaseService myPurchaseService;
 
     @Override
@@ -200,7 +191,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
 
         //创建出入库记录
         Integer businessType = stockWait.getBusinessType();
-        JournalType journalType = StockWaitType.getEnum(businessType).getJournalType();
+        JournalType journalType = JournalType.getByDetailType(businessType);
         StockJournal stockJournal = new StockJournal();
         stockJournal.setOpType(stockWait.getType());//根据待入库类型赋值操作类型 1入库 2出库
         stockJournal.setType(journalType.getDetailType());