问题处理

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/po/SubscribeDetail.java

@@ -56,6 +56,8 @@ public class SubscribeDetail extends BasePo {
      */
     private Integer delFlag;
 
+    private Long excessGoodsDetailsId;
+
     /**
      * 货品类型
      */

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

@@ -1,5 +1,6 @@
 package com.fjhx.purchase.flow;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -11,12 +12,16 @@ import com.fjhx.flow.core.FlowThreadLocalUtil;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeStatusEnum;
 import com.fjhx.purchase.entity.subscribe.po.Subscribe;
 import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
+import com.fjhx.purchase.service.WdlyService;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @Author:yzc
@@ -35,6 +40,8 @@ public class SubscribeFlowByWdly extends FlowDelegate {
     private SubscribeService subscribeService;
     @Autowired
     private SubscribeDetailService subscribeDetailService;
+    @Autowired
+    private WdlyService wdlyService;
 
     @Override
     public String getFlowKey() {
@@ -58,13 +65,19 @@ public class SubscribeFlowByWdly extends FlowDelegate {
         subscribe.setFlowId(flowId);
         subscribe.setSubcribeStatus(SubscribeStatusEnum.UNDER_REVIEW.getKey());
         subscribeService.save(subscribe);
-        List<SubscribeDetail> SubscribeDetails = subscribe.getSubscribeDetailList();
-        if (CollectionUtils.isNotEmpty(SubscribeDetails)) {
-            for (SubscribeDetail s : SubscribeDetails) {
-                s.setSubscribeId(subscribe.getId());
-            }
-            subscribeDetailService.saveBatch(SubscribeDetails);
+        List<SubscribeDetail> subscribeDetails = subscribe.getSubscribeDetailList();
+        if (ObjectUtil.isEmpty(subscribeDetails)) {
+            subscribeDetails = new ArrayList<>();
+        }
+        for (SubscribeDetail s : subscribeDetails) {
+            s.setSubscribeId(subscribe.getId());
         }
+        subscribeDetailService.saveBatch(subscribeDetails);
+
+        //获取多货id列表
+        List<Long> ids = subscribeDetails.stream().map(SubscribeDetail::getExcessGoodsDetailsId).filter(Objects::nonNull).collect(Collectors.toList());
+        wdlyService.toSubscribe(ids);
+
         return subscribe.getId();
     }
 

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

@@ -37,4 +37,6 @@ public interface WdlyService {
 
 
      void editContractCode(Long purchaseId,String contractCode) ;
-    }
+
+    void toSubscribe(List<Long> ids);
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/excess/ExcessGoodsDetailsController.java

@@ -77,4 +77,15 @@ public class ExcessGoodsDetailsController {
         excessGoodsDetailsService.delete(dto.getId());
     }
 
+
+    @PostMapping("/backGoods")
+    public void backGoods(@RequestBody ExcessGoodsDetailsDto dto) {
+        excessGoodsDetailsService.backGoods(dto);
+    }
+
+    @PostMapping("/inStock")
+    public void inStock(@RequestBody ExcessGoodsDetailsDto dto) {
+        excessGoodsDetailsService.inStock(dto);
+    }
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/dto/ExcessGoodsDetailsDto.java

@@ -14,4 +14,7 @@ import lombok.Setter;
 @Setter
 public class ExcessGoodsDetailsDto extends ExcessGoodsDetails {
 
+    private String logisticsCompanyCode;
+    private String logisticsCode;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/po/ExcessGoodsDetails.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * 多货登记明细
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-03-27
  */
 @Getter
@@ -55,4 +55,10 @@ public class ExcessGoodsDetails extends BasePo {
      */
     private Long logisticsInfosId;
 
+    private Long purchaseId;
+
+    private String backLogisticsCompanyCode;
+    private String backLogisticsCode;
+
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/excess/vo/ExcessGoodsDetailsVo.java

@@ -31,4 +31,6 @@ public class ExcessGoodsDetailsVo extends ExcessGoodsDetails {
     private String logisticsCode;
     private String logisticsCompanyName;
 
+    private String backLogisticsCompanyName;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/abnormal/AbnormalDetailsMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalDetails;
 import com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalDetailsVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,6 +19,7 @@ import java.util.List;
  * @author 
  * @since 2023-04-11
  */
+@Mapper
 public interface AbnormalDetailsMapper extends BaseMapper<AbnormalDetails> {
 
     /**

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/WdlyServiceImpl.java

@@ -16,12 +16,14 @@ import com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalDetailsVo;
 import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoods;
 import com.fjhx.victoriatourist.entity.deliver.po.DeliverGoodsDetails;
 import com.fjhx.victoriatourist.entity.deliver.vo.DeliverGoodsDetailsVo;
+import com.fjhx.victoriatourist.entity.excess.po.ExcessGoodsDetails;
 import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBackDetails;
 import com.fjhx.victoriatourist.mapper.abnormal.AbnormalDetailsMapper;
 import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
 import com.fjhx.victoriatourist.service.deliver.DeliverGoodsDetailsService;
 import com.fjhx.victoriatourist.service.deliver.DeliverGoodsService;
+import com.fjhx.victoriatourist.service.excess.ExcessGoodsDetailsService;
 import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
 import com.fjhx.victoriatourist.service.order.OrderInfoService;
 import com.fjhx.victoriatourist.service.purchase.PurchaseBackDetailsService;
@@ -48,6 +50,8 @@ public class WdlyServiceImpl implements WdlyService {
     private AbnormalDetailsMapper abnormalDetailsMapper;
     @Autowired
     private PurchaseBackDetailsService purchaseBackDetailsService;
+    @Autowired
+    private ExcessGoodsDetailsService excessGoodsDetailsService;
 
     /**
      * 更新发货记录的状态为到货
@@ -137,4 +141,13 @@ public class WdlyServiceImpl implements WdlyService {
     public void editContractCode(Long purchaseId, String contractCode) {
         logisticsInfosService.update(q->q.eq(LogisticsInfos::getPurchaseId,purchaseId).set(LogisticsInfos::getBusinessCode,contractCode));
     }
+
+
+    @Override
+    public void toSubscribe(List<Long> ids) {
+        if (ObjectUtil.isEmpty(ids)){
+            return;
+        }
+        excessGoodsDetailsService.update(q->q.in(ExcessGoodsDetails::getId,ids).set(ExcessGoodsDetails::getProcessingMethod,30));
+    }
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/excess/ExcessGoodsDetailsService.java

@@ -49,4 +49,7 @@ public interface ExcessGoodsDetailsService extends BaseService<ExcessGoodsDetail
      */
     void delete(Long id);
 
+    void backGoods(ExcessGoodsDetailsDto dto);
+
+    void inStock(ExcessGoodsDetailsDto dto);
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/excess/impl/ExcessGoodsDetailsServiceImpl.java

@@ -2,6 +2,7 @@ package com.fjhx.victoriatourist.service.excess.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.utils.Assert;
@@ -17,7 +18,10 @@ import com.fjhx.victoriatourist.mapper.excess.ExcessGoodsDetailsMapper;
 import com.fjhx.victoriatourist.service.excess.ExcessGoodsDetailsService;
 import com.fjhx.victoriatourist.service.excess.ExcessGoodsRegisterService;
 import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
+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.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +51,8 @@ public class ExcessGoodsDetailsServiceImpl extends ServiceImpl<ExcessGoodsDetail
     private StockWaitService stockWaitService;
     @Autowired
     private LogisticsInfosService logisticsInfosService;
+    @Autowired
+    private StockWaitDetailsService stockWaitDetailsService;
 
     private IWrapper<ExcessGoodsDetails> getWrapper(ExcessGoodsDetailsSelectDto dto) {
         IWrapper<ExcessGoodsDetails> wrapper = getWrapper();
@@ -139,6 +145,7 @@ public class ExcessGoodsDetailsServiceImpl extends ServiceImpl<ExcessGoodsDetail
         LogisticsInfos one = logisticsInfosService.getOne(q -> q.eq(LogisticsInfos::getBusinessId, stockWait.getDeliverGoodsId()));
         if (ObjectUtil.isNotEmpty(one)) {
             dto.setLogisticsInfosId(one.getId());
+            dto.setPurchaseId(one.getPurchaseId());
         }
         this.save(dto);
     }
@@ -153,4 +160,70 @@ public class ExcessGoodsDetailsServiceImpl extends ServiceImpl<ExcessGoodsDetail
         this.removeById(id);
     }
 
+    /**
+     * 退货
+     */
+    @Override
+    @DSTransactional
+    public void backGoods(ExcessGoodsDetailsDto dto) {
+        Assert.notEmpty(this.getById(dto.getId()), "查询不到多货信息！");
+        dto.setProcessingMethod(10);//退货
+        this.updateById(dto);
+
+//        long logisticsInfosId = IdWorker.getId();
+//        LogisticsInfos logisticsInfos = new LogisticsInfos();
+//        logisticsInfos.setBusinessId(dto.getId());
+//        logisticsInfos.setBusinessType(5);
+//        logisticsInfos.setId(logisticsInfosId);
+//        logisticsInfos.setIsKd100(1);
+//        logisticsInfos.setExcessGoodsId(dto.getId());
+//        logisticsInfos.setStockWaitId(excessGoodsDetails.getStockWaitId());
+//        logisticsInfos.setPurchaseId(excessGoodsDetails.getPurchaseId());
+//        //发起快递100订阅
+//        String activeProfile = SpringUtil.getActiveProfile();
+//        DynamicDataSourceContextHolder.push(SourceConstant.KD100);
+//        Integer state = !"prod".equals(activeProfile) ? -1 : KD100Util.monitor(logisticsInfos.getLogisticsCompanyCode(), logisticsInfos.getCode(), logisticsInfosId, 1, LogisticsInfos.class).getState();
+//        DynamicDataSourceContextHolder.poll();
+//        logisticsInfos.setLogisticsStatus(state);
+//        logisticsInfos.setIsKd100(1);
+//        logisticsInfosService.save(logisticsInfos);
+//        LogisticsDetails logisticsDetails = new LogisticsDetails();
+//        logisticsDetails.setLogisticsInfoId(logisticsInfos.getId());
+//        logisticsDetailsService.save(logisticsDetails);
+    }
+
+    /**
+     * 入库
+     */
+    @DSTransactional
+    @Override
+    public void inStock(ExcessGoodsDetailsDto dto) {
+        ExcessGoodsDetails byId = this.getById(dto.getId());
+        Assert.notEmpty(byId, "查询不到多货信息！");
+        dto.setProcessingMethod(20);//入库
+        this.updateById(dto);
+
+        StockWait byId1 = stockWaitService.getById(byId.getStockWaitId());
+
+        //添加一份待出库数据
+        StockWait stockWait = new StockWait();
+        stockWait.setType(1);
+        stockWait.setStatus(0);
+        stockWait.setBusinessId(byId.getId());
+        stockWait.setBusinessType(StockWaitType.EXCESS_GOODS_IN.getDetailType());//退货出库
+        stockWait.setPurchaseId(byId.getPurchaseId());
+        stockWait.setBusinessCode(byId1.getBusinessCode());
+        stockWait.setExcessGoodsId(byId.getId());
+        stockWaitService.save(stockWait);
+
+        StockWaitDetails stockWaitDetails = new StockWaitDetails();
+        stockWaitDetails.setStockWaitId(stockWait.getId());
+        stockWaitDetails.setProductId(byId.getProductId());
+        stockWaitDetails.setQuantity(byId.getQuantity());
+
+        stockWaitDetails.setBusinessDetailsId(byId.getId());
+        stockWaitDetails.setExcessGoodsDetailsId(byId.getId());
+        stockWaitDetailsService.save(stockWaitDetails);
+    }
+
 }

hx-victoriatourist/src/main/resources/mapper/excess/ExcessGoodsDetailsMapper.xml

@@ -14,7 +14,8 @@
             sw.business_code,
             lis.logistics_company_code,
             lis.`code` AS logisticsCode,
-            ( SELECT ci.`name` FROM bytesailing_kd100.company_info ci WHERE ci.`code` = lis.logistics_company_code ) AS logisticsCompanyName
+            ( SELECT ci.`name` FROM bytesailing_kd100.company_info ci WHERE ci.`code` = lis.logistics_company_code ) AS logisticsCompanyName,
+            ( SELECT ci.`name` FROM bytesailing_kd100.company_info ci WHERE ci.`code` = egd.back_logistics_company_code ) AS backLogisticsCompanyName
         FROM
             excess_goods_details egd
                 LEFT JOIN bytesailing_wms.stock_wait sw ON egd.stock_wait_id = sw.id

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

@@ -34,6 +34,7 @@ public enum JournalType {
     QUALIFIED_TO_DEFECTIVE(InOutType.IN, 21, "良品转次品", "stock"),
     DEFECTIVE_TO_QUALIFIED(InOutType.IN, 22, "次品转良品", "stock"),
 
+    EXCESS_GOODS_IN(InOutType.IN, 23, "多货入库", ""),
 
 
 

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

@@ -9,19 +9,22 @@ import java.util.HashMap;
 @Getter
 public enum StockWaitType {
 
-    BORDER_OF_LINE_IN(InOutType.IN, 1, "线边回仓", ""),
-    COMPLETION_IN(InOutType.IN, 2, "完工入库", ""),
-    PURCHASE_ARRIVAL_IN(InOutType.IN, 3, "采购到货", ""),
-    BACK_OUT(InOutType.OUT, 4, "退货出库", ""),
-    JD_ORDER_OUT(InOutType.OUT, 5, "京东订单出库", "jd_order"),
-    SALE_ORDER_OUT(InOutType.OUT, 6, "销售订单出库", "order_info"),
-    PRODUCTION_TASK_OUT(InOutType.OUT, 7, "生产任务待出库", "production_task");
+//    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, "退货出库", ""),
+    JD_ORDER_OUT(InOutType.OUT, JournalType.JD_SALES_OUT, 5, "京东订单出库", "jd_order"),
+    SALE_ORDER_OUT(InOutType.OUT,JournalType.SALES_OUT, 6, "销售订单出库", "order_info"),
+//    PRODUCTION_TASK_OUT(InOutType.OUT, 7, "生产任务待出库", "production_task"),
+    EXCESS_GOODS_IN(InOutType.IN, JournalType.EXCESS_GOODS_IN,23, "生产任务待出库", "production_task");
 
 
     /**
      * 出入库类型
      */
     private final InOutType type;
+    private final JournalType journalType;
+
 
     /**
      * 详细类型
@@ -49,4 +52,8 @@ public enum StockWaitType {
         return hashMap.get(code).getDetailTypeRemark();
     }
 
+    public static StockWaitType getEnum1(Integer detailType) {
+        return hashMap.get(detailType);
+    }
+
 }

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

@@ -55,4 +55,6 @@ public class StockWait extends BasePo {
 
     private Long arrivalId;
     private Long purchaseId;
+
+    private Long excessGoodsId;
 }

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

@@ -69,6 +69,8 @@ public class StockWaitDetails extends BasePo {
     private Long deliverGoodsId;
     private Long arrivalId;
 
+    private Long excessGoodsDetailsId;
+
 
     /**
      * 京东订单号

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

@@ -24,7 +24,6 @@ import com.fjhx.wms.entity.arrival.po.ArrivalStockRecordsDetails;
 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.InStockWaitExportExcel;
@@ -470,27 +469,32 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
      */
     @Override
     public Integer getStockJournalType(int businessType) {
-        if (StockWaitType.BORDER_OF_LINE_IN.getDetailType().equals(businessType)) {
-            //线边回仓库
-            return JournalType.BORDER_OF_LINE_IN.getDetailType();
-        } else if (StockWaitType.COMPLETION_IN.getDetailType().equals(businessType)) {
-            //完工入库
-            return JournalType.COMPLETION_IN.getDetailType();
-        } else if (StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType().equals(businessType)) {
-            //采购到货
-            return JournalType.PURCHASE_ARRIVAL_IN.getDetailType();
-        } else if (StockWaitType.BACK_OUT.getDetailType().equals(businessType)) {
-            //退货出货
-            return JournalType.BACK_OUT.getDetailType();
-        } else if (StockWaitType.SALE_ORDER_OUT.getDetailType().equals(businessType)) {
-            //销售订单出库
-            return JournalType.SALES_OUT.getDetailType();
-        } else if (StockWaitType.JD_ORDER_OUT.getDetailType().equals(businessType)) {
-            //京东销售出库
-            return JournalType.JD_SALES_OUT.getDetailType();
-        } else {
+        StockWaitType enum1 = StockWaitType.getEnum1(businessType);
+        if (ObjectUtil.isEmpty(enum1)) {
             throw new ServiceException("未知待出入库业务类型");
         }
+        return enum1.getJournalType().getDetailType();
+//        if (StockWaitType.BORDER_OF_LINE_IN.getDetailType().equals(businessType)) {
+//            //线边回仓库
+//            return JournalType.BORDER_OF_LINE_IN.getDetailType();
+//        } else if (StockWaitType.COMPLETION_IN.getDetailType().equals(businessType)) {
+//            //完工入库
+//            return JournalType.COMPLETION_IN.getDetailType();
+//        } else if (StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType().equals(businessType)) {
+//            //采购到货
+//            return JournalType.PURCHASE_ARRIVAL_IN.getDetailType();
+//        } else if (StockWaitType.BACK_OUT.getDetailType().equals(businessType)) {
+//            //退货出货
+//            return JournalType.BACK_OUT.getDetailType();
+//        } else if (StockWaitType.SALE_ORDER_OUT.getDetailType().equals(businessType)) {
+//            //销售订单出库
+//            return JournalType.SALES_OUT.getDetailType();
+//        } else if (StockWaitType.JD_ORDER_OUT.getDetailType().equals(businessType)) {
+//            //京东销售出库
+//            return JournalType.JD_SALES_OUT.getDetailType();
+//        } else {
+//            throw new ServiceException("未知待出入库业务类型");
+//        }
     }
 
     /**