问题处理

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

@@ -2,7 +2,6 @@ package com.fjhx.victoriatourist.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fjhx.purchase.entity.deliver.DeliverGoodsDetailsPo;
 import com.fjhx.purchase.entity.deliver.DeliverGoodsPo;
 import com.fjhx.purchase.service.WdlyService;
@@ -66,13 +65,15 @@ public class WdlyServiceImpl implements WdlyService {
         LogisticsInfos logisticsInfos = logisticsInfosService.getOne(q -> q.eq(LogisticsInfos::getBusinessId, deliverGoodsId));
 
         AbnormalInfo abnormalInfo = new AbnormalInfo();
-        abnormalInfo.setId(IdWorker.getId());
 
         //搜索物流单号是否已经存在 异常信息
         List<LogisticsInfos> logisticsInfosList = logisticsInfosService.list(q -> q.eq(LogisticsInfos::getCode, logisticsInfos.getCode()));
         if (ObjectUtil.isNotEmpty(logisticsInfosList)) {
             List<Long> ids = logisticsInfosList.stream().map(LogisticsInfos::getId).collect(Collectors.toList());
-            AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q.in(AbnormalInfo::getLogisticsInfosId, ids));
+            AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q
+                    .in(AbnormalInfo::getLogisticsInfosId, ids)
+                    .eq(AbnormalInfo::getType,40)
+            );
             if (ObjectUtil.isNotEmpty(oldAbnormalInfo)) {
                 abnormalInfo = oldAbnormalInfo;
             }
@@ -84,6 +85,6 @@ public class WdlyServiceImpl implements WdlyService {
         abnormalInfo.setLinkCode(linkCode);
         abnormalInfo.setTitle("到货数量与发货数量不一致");
         abnormalInfo.setLogisticsInfosId(logisticsInfos.getId());
-        abnormalInfoService.save(abnormalInfo);
+        abnormalInfoService.saveOrUpdate(abnormalInfo);
     }
 }

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

@@ -3,7 +3,6 @@ package com.fjhx.victoriatourist.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
 import com.fjhx.victoriatourist.entity.group.dto.GroupRecordDto;
@@ -72,13 +71,15 @@ public class WmsServiceImpl implements WmsService {
         LogisticsInfos logisticsInfos = logisticsInfosService.getOne(q -> q.eq(LogisticsInfos::getBusinessId, deliverGoodsId));
 
         AbnormalInfo abnormalInfo = new AbnormalInfo();
-        abnormalInfo.setId(IdWorker.getId());
 
         //搜索物流单号是否已经存在 异常信息
         List<LogisticsInfos> logisticsInfosList = logisticsInfosService.list(q -> q.eq(LogisticsInfos::getCode, logisticsInfos.getCode()));
         if (ObjectUtil.isNotEmpty(logisticsInfosList)) {
             List<Long> ids = logisticsInfosList.stream().map(LogisticsInfos::getId).collect(Collectors.toList());
-            AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q.in(AbnormalInfo::getLogisticsInfosId, ids));
+            AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q
+                    .in(AbnormalInfo::getLogisticsInfosId, ids)
+                    .eq(AbnormalInfo::getType,50)
+            );
             if (ObjectUtil.isNotEmpty(oldAbnormalInfo)) {
                 abnormalInfo = oldAbnormalInfo;
             }
@@ -90,7 +91,7 @@ public class WmsServiceImpl implements WmsService {
         abnormalInfo.setLinkCode(stockWait.getBusinessCode());
         abnormalInfo.setTitle("入库数量差异");
         abnormalInfo.setPurchaseId(purchaseId);
-        abnormalInfoService.save(abnormalInfo);
+        abnormalInfoService.saveOrUpdate(abnormalInfo);
     }
 
     @Override

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -495,14 +495,16 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
 
             if (abnormalFlag == 1) {
                 AbnormalInfo abnormalInfo = new AbnormalInfo();
-                abnormalInfo.setId(IdWorker.getId());
 
                 LogisticsInfos logisticsInfos = logisticsInfosService.getOne(q -> q.eq(LogisticsInfos::getBusinessId, stockTransfer.getBusinessId()));
                 //搜索物流单号是否已经存在 异常信息
                 List<LogisticsInfos> logisticsInfosList = logisticsInfosService.list(q -> q.eq(LogisticsInfos::getCode, logisticsInfos.getCode()));
                 if (ObjectUtil.isNotEmpty(logisticsInfosList)) {
                     List<Long> liIds = logisticsInfosList.stream().map(LogisticsInfos::getId).collect(Collectors.toList());
-                    AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q.in(AbnormalInfo::getLogisticsInfosId, liIds));
+                    AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q
+                            .in(AbnormalInfo::getLogisticsInfosId, liIds)
+                            .eq(AbnormalInfo::getType,30)
+                    );
                     if (ObjectUtil.isNotEmpty(oldAbnormalInfo)) {
                         abnormalInfo = oldAbnormalInfo;
                     }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -265,13 +265,15 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
             LogisticsInfos logisticsInfos = logisticsInfosService.getOne(q -> q.eq(LogisticsInfos::getBusinessId, deliverGoodsId));
 
             AbnormalInfo abnormalInfo = new AbnormalInfo();
-            abnormalInfo.setId(IdWorker.getId());
 
             //搜索物流单号是否已经存在 异常信息
             List<LogisticsInfos> logisticsInfosList = logisticsInfosService.list(q -> q.eq(LogisticsInfos::getCode, logisticsInfos.getCode()));
             if (ObjectUtil.isNotEmpty(logisticsInfosList)) {
                 List<Long> ids = logisticsInfosList.stream().map(LogisticsInfos::getId).collect(Collectors.toList());
-                AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q.in(AbnormalInfo::getLogisticsInfosId, ids));
+                AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q
+                        .in(AbnormalInfo::getLogisticsInfosId, ids)
+                        .eq(AbnormalInfo::getType,10)
+                );
                 if (ObjectUtil.isNotEmpty(oldAbnormalInfo)) {
                     abnormalInfo = oldAbnormalInfo;
                 }