Merge remote-tracking branch 'origin/dev' into dev

hx-common/src/main/java/com/fjhx/common/enums/PushBusinessTypeEnum.java

@@ -36,7 +36,12 @@ public enum PushBusinessTypeEnum {
     /**
      * 异常处理
      */
-    EXCEPTION_HANDLING(6);
+    EXCEPTION_HANDLING(6),
+
+    /**
+     * 单证被删除
+     */
+    DOCUMENTS_DEL(7);
 
     private final int type;
 

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

@@ -7,11 +7,13 @@ import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.sale.entity.claim.po.ClaimContract;
 import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProject;
 import com.fjhx.sale.entity.contract.po.ContractShipment;
+import com.fjhx.sale.service.claim.ClaimContractService;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractService;
 import com.ruoyi.common.core.domain.BaseIdPo;
@@ -44,6 +46,8 @@ public class ContractUpdateFlow extends FlowDelegate {
 
     @Autowired
     private ContractProductService contractProductService;
+    @Autowired
+    private ClaimContractService claimContractService;
 
     @Override
     public String getFlowKey() {
@@ -125,6 +129,9 @@ public class ContractUpdateFlow extends FlowDelegate {
         oldContract.setStatus(FlowStatusEnum1.UPDATE.getKey());
         oldContract.setIsChange("1");
         contractService.updateById(oldContract);
+
+        //删除到账认领数据
+        claimContractService.remove(q -> q.eq(ClaimContract::getContractId, oldContractId));
     }
 
     @Override

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackDetailServiceImpl.java

@@ -55,11 +55,8 @@ public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDet
             wrapper.eq("pd", PackDetailVo::getShipmentStatus, dto.getShipmentStatus());
         }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
-//            wrapper.keyword(dto.getKeyword(), new SqlField("t3.`code`"), new SqlField("t2.`product_name`"));
             wrapper.like("pd.codeAPName", dto.getKeyword());
         }
-//        wrapper.groupBy("t1.pack_id");
-//        wrapper.orderByDesc("t1.create_time");
         Page<PackDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackServiceImpl.java

@@ -1,15 +1,17 @@
 package com.fjhx.sale.service.pack.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 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.core.toolkit.ObjectUtils;
-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.enums.CodingRuleEnum;
+import com.fjhx.common.enums.PushBusinessTypeEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
+import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.documents.po.Documents;
 import com.fjhx.sale.entity.documents.po.DocumentsPdf;
 import com.fjhx.sale.entity.documents.po.DocumentsProduct;
@@ -19,21 +21,24 @@ import com.fjhx.sale.entity.pack.dto.PackSelectDto;
 import com.fjhx.sale.entity.pack.po.*;
 import com.fjhx.sale.entity.pack.vo.PackVo;
 import com.fjhx.sale.mapper.pack.PackMapper;
+import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.documents.DocumentsPdfService;
 import com.fjhx.sale.service.documents.DocumentsProductService;
 import com.fjhx.sale.service.documents.DocumentsService;
 import com.fjhx.sale.service.documents.DocumentsTransportService;
 import com.fjhx.sale.service.pack.*;
+import com.fjhx.socket.core.PushTypeEnum;
+import com.fjhx.socket.core.WebSocketPush;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import javax.swing.text.Document;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -42,7 +47,7 @@ import java.util.stream.Collectors;
  * 装箱出货表 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 @Service
@@ -58,22 +63,19 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements Pa
     private PackDetailGoodsService packDetailGoodsService;
 
     @Autowired
+    private CodingRuleService codingRuleService;
+    @Autowired
     private PackShipmentService packShipmentService;
-
     @Autowired
     private DocumentsService documentsService;
-
-    @Autowired
-    private DocumentsProductService documentsProductService;
-
     @Autowired
     private DocumentsPdfService documentsPdfService;
-
+    @Autowired
+    private DocumentsProductService documentsProductService;
     @Autowired
     private DocumentsTransportService documentsTransportService;
-
     @Autowired
-    private CodingRuleService codingRuleService;
+    private ContractService contractService;
 
     @Override
     public Page<PackVo> getPage(PackSelectDto dto) {
@@ -92,28 +94,29 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements Pa
 
     /**
      * 新增
+     *
      * @param pack
      */
     @Override
     @DSTransactional
     public void add(Pack pack) {
-        if(StringUtils.isEmpty(pack.getContractIds())){
+        if (StringUtils.isEmpty(pack.getContractIds())) {
             throw new ServiceException("参数异常");
         }
 //        pack.setCode(CodeEnum.PACK.getCode());
-        pack.setCode(codingRuleService.createCode(CodingRuleEnum.PACK.getKey(),null));
+        pack.setCode(codingRuleService.createCode(CodingRuleEnum.PACK.getKey(), null));
         this.save(pack);
         List<PackDetail> packDetailList = pack.getPackDetailList();
-        if(CollectionUtils.isNotEmpty(packDetailList)){
+        if (CollectionUtils.isNotEmpty(packDetailList)) {
             List<PackDetailProduct> packDetailProductList = new ArrayList<>();
             List<PackDetailGoods> packDetailGoodsList = new ArrayList<>();
-            for(PackDetail p:packDetailList){
+            for (PackDetail p : packDetailList) {
                 p.setPackId(pack.getId());
                 p.setId(IdWorker.getId());
                 //处理装箱产品明细
-                setPackDetailProducts(p,packDetailProductList);
+                setPackDetailProducts(p, packDetailProductList);
                 //处理自定义装箱货物
-                setPackDetailGoods(p,packDetailGoodsList);
+                setPackDetailGoods(p, packDetailGoodsList);
             }
             packDetailService.saveBatch(packDetailList);
             packDetailGoodsService.saveBatch(packDetailGoodsList);
@@ -123,27 +126,30 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements Pa
 
     /**
      * 处理装箱产品明细
+     *
      * @param packDetail
      * @param packDetailProductList
      */
-    private void setPackDetailProducts(PackDetail packDetail,List<PackDetailProduct> packDetailProductList){
+    private void setPackDetailProducts(PackDetail packDetail, List<PackDetailProduct> packDetailProductList) {
         List<PackDetailProduct> list = packDetail.getPackDetailProductList();
-        if(CollectionUtils.isNotEmpty(list)){
-            for(PackDetailProduct p:list){
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (PackDetailProduct p : list) {
                 p.setPackDetailId(packDetail.getId());
                 packDetailProductList.add(p);
             }
         }
     }
+
     /**
      * 处理装箱产品明细
+     *
      * @param packDetail
      * @param packDetailGoodsList
      */
-    private void setPackDetailGoods(PackDetail packDetail,List<PackDetailGoods> packDetailGoodsList){
+    private void setPackDetailGoods(PackDetail packDetail, List<PackDetailGoods> packDetailGoodsList) {
         List<PackDetailGoods> list = packDetail.getPackDetailGoodsList();
-        if(CollectionUtils.isNotEmpty(list)){
-            for(PackDetailGoods p:list){
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (PackDetailGoods p : list) {
                 p.setPackDetailId(packDetail.getId());
                 packDetailGoodsList.add(p);
             }
@@ -157,32 +163,86 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements Pa
 
     /**
      * 删除装箱
+     *
      * @param id
      */
+    @DSTransactional
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void delete(Long id) {
-        this.removeById(id);//删除装箱
-        List<PackDetail> packDetailList = packDetailService.list(Wrappers.<PackDetail>query().lambda().eq(PackDetail::getPackId,id));
-        if(CollectionUtils.isEmpty(packDetailList)){
-            throw new ServiceException("删除失败,装箱明细数据异常");
+//        this.removeById(id);//删除装箱
+//        List<PackDetail> packDetailList = packDetailService.list(Wrappers.<PackDetail>query().lambda().eq(PackDetail::getPackId,id));
+//        if(CollectionUtils.isEmpty(packDetailList)){
+//            throw new ServiceException("删除失败,装箱明细数据异常");
+//        }
+//        List<Long> detailIds = packDetailList.stream().map(PackDetail::getId).collect(Collectors.toList());
+//        packDetailService.remove(Wrappers.<PackDetail>query().lambda().in(PackDetail::getId,detailIds));
+//        packDetailProductService.remove(Wrappers.<PackDetailProduct>query().lambda().in(PackDetailProduct::getPackDetailId,detailIds));
+//        packDetailGoodsService.remove(Wrappers.<PackDetailGoods>query().lambda().in(PackDetailGoods::getPackDetailId,detailIds));
+//        PackShipment packShipment = packShipmentService.getOne(Wrappers.<PackShipment>query().lambda().eq(PackShipment::getPackDetailIds,StringUtils.join(detailIds,",")).last("limit 1"));
+//        if(ObjectUtils.isNotEmpty(packShipment)){//已出货
+//            packShipmentService.removeById(packShipment.getId());
+//            //查询是否单证
+//            Documents documents = documentsService.getOne(Wrappers.<Documents>query().lambda().eq(Documents::getPackShipmentId,packShipment.getId()).last("limit 1"));
+//            if(ObjectUtils.isNotEmpty(documents)){
+//                //删除单证相关数据
+//                documentsService.removeById(documents.getId());
+//                documentsProductService.remove(Wrappers.<DocumentsProduct>query().lambda().eq(DocumentsProduct::getDocumentsId,documents.getId()));
+//                documentsPdfService.remove(Wrappers.<DocumentsPdf>query().lambda().eq(DocumentsPdf::getDocumentId,documents.getId()));
+//                documentsTransportService.remove(Wrappers.<DocumentsTransport>query().lambda().eq(DocumentsTransport::getDocumentsId,documents.getId()));
+//            }
+//        }
+        //删除主表信息
+        this.removeById(id);
+
+        List<PackDetail> packDetailList = packDetailService.list(q -> q.eq(PackDetail::getPackId, id));
+        if (ObjectUtil.isEmpty(packDetailList)) {
+            return;
         }
-        List<Long> detailIds = packDetailList.stream().map(PackDetail::getId).collect(Collectors.toList());
-        packDetailService.remove(Wrappers.<PackDetail>query().lambda().in(PackDetail::getId,detailIds));
-        packDetailProductService.remove(Wrappers.<PackDetailProduct>query().lambda().in(PackDetailProduct::getPackDetailId,detailIds));
-        packDetailGoodsService.remove(Wrappers.<PackDetailGoods>query().lambda().in(PackDetailGoods::getPackDetailId,detailIds));
-        PackShipment packShipment = packShipmentService.getOne(Wrappers.<PackShipment>query().lambda().eq(PackShipment::getPackDetailIds,StringUtils.join(detailIds,",")).last("limit 1"));
-        if(ObjectUtils.isNotEmpty(packShipment)){//已出货
-            packShipmentService.removeById(packShipment.getId());
-            //查询是否单证
-            Documents documents = documentsService.getOne(Wrappers.<Documents>query().lambda().eq(Documents::getPackShipmentId,packShipment.getId()).last("limit 1"));
-            if(ObjectUtils.isNotEmpty(documents)){
-                //删除单证相关数据
-                documentsService.removeById(documents.getId());
-                documentsProductService.remove(Wrappers.<DocumentsProduct>query().lambda().eq(DocumentsProduct::getDocumentsId,documents.getId()));
-                documentsPdfService.remove(Wrappers.<DocumentsPdf>query().lambda().eq(DocumentsPdf::getDocumentId,documents.getId()));
-                documentsTransportService.remove(Wrappers.<DocumentsTransport>query().lambda().eq(DocumentsTransport::getDocumentsId,documents.getId()));
-            }
+        List<Long> packDetailIds = packDetailList.stream().map(PackDetail::getId).distinct().collect(Collectors.toList());
+
+        //删除装箱明细
+        packDetailService.remove(q -> q.eq(PackDetail::getPackId, id));
+        //删除自定义装箱出货
+        packDetailGoodsService.remove(q -> q.in(PackDetailGoods::getPackDetailId, packDetailIds));
+        //删除装箱出货产品明细
+        packDetailProductService.remove(q -> q.in(PackDetailProduct::getPackDetailId, packDetailIds));
+        //删除装箱绑定主合同信息
+        IWrapper<PackShipment> wrapper = IWrapper.getWrapper();
+        packDetailIds.forEach(item -> wrapper.like(PackShipment::getPackDetailIds, item).or());
+        List<PackShipment> packShipmentList = packShipmentService.list(wrapper);
+        if (ObjectUtil.isEmpty(packShipmentList)) {
+            return;
+        }
+        packShipmentService.remove(wrapper);
+
+        List<Long> packShipmentIds = packShipmentList.stream().map(PackShipment::getId).distinct().collect(Collectors.toList());
+        //删除单证信息
+        List<Documents> documentsList = documentsService.list(q -> q.in(Documents::getPackShipmentId, packShipmentIds));
+        if (ObjectUtil.isEmpty(documentsList)) {
+            return;
+        }
+        documentsService.remove(q -> q.in(Documents::getPackShipmentId, packShipmentIds));
+        List<Long> documentsIds = documentsList.stream().map(Documents::getId).distinct().collect(Collectors.toList());
+        //删除单证PDF信息
+        documentsPdfService.remove(q -> q.in(DocumentsPdf::getDocumentId, documentsIds));
+        //删除单证产品信息
+        documentsProductService.remove(q -> q.in(DocumentsProduct::getDocumentsId, documentsIds));
+        //删除单证货运信息
+        documentsTransportService.remove(q -> q.in(DocumentsTransport::getDocumentsId, documentsIds));
+
+        //发送消息告诉单证创建人 单证被删除
+        List<Long> cIds = documentsList.stream().map(Documents::getContractId).distinct().collect(Collectors.toList());
+        Map<Long, Contract> contractMap = contractService.mapKEntity(Contract::getId, q -> q.in(Contract::getId, cIds));
+        for (Documents documents : documentsList) {
+            Contract contract = contractMap.get(documents.getContractId());
+            String contractCode = ObjectUtil.isNotEmpty(contract) ? contract.getCode() : String.valueOf(documents.getContractId());
+            String userName = SecurityUtils.getLoginUser().getUser().getNickName();
+            String msg = "您创建的单证，主合同号：（{}）被（{}）删除，原因：装箱信息被（{}）删除";
+            WebSocketPush.byTenant(
+                    PushTypeEnum.MESSAGE,
+                    StrUtil.format(msg, contractCode, userName, userName),
+                    PushBusinessTypeEnum.DOCUMENTS_DEL.getType()
+            );
         }
     }