异常合并问题处理

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

@@ -74,6 +74,7 @@ public class WdlyServiceImpl implements WdlyService {
             AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q
                     .in(AbnormalInfo::getLogisticsInfosId, ids)
                     .eq(AbnormalInfo::getType,40)
+                    .eq(AbnormalInfo::getLinkId,linkId)
             );
             if (ObjectUtil.isNotEmpty(oldAbnormalInfo)) {
                 abnormalInfo = oldAbnormalInfo;

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

@@ -79,6 +79,7 @@ public class WmsServiceImpl implements WmsService {
             AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q
                     .in(AbnormalInfo::getLogisticsInfosId, ids)
                     .eq(AbnormalInfo::getType,50)
+                    .eq(AbnormalInfo::getPurchaseId,purchaseId)
             );
             if (ObjectUtil.isNotEmpty(oldAbnormalInfo)) {
                 abnormalInfo = oldAbnormalInfo;

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

@@ -504,6 +504,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
                     AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q
                             .in(AbnormalInfo::getLogisticsInfosId, liIds)
                             .eq(AbnormalInfo::getType,30)
+                            .eq(AbnormalInfo::getLinkId,stockTransfer.getId())
                     );
                     if (ObjectUtil.isNotEmpty(oldAbnormalInfo)) {
                         abnormalInfo = oldAbnormalInfo;

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

@@ -264,6 +264,9 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
             Long deliverGoodsId = stockWaitJson.getLong("deliverGoodsId");
             LogisticsInfos logisticsInfos = logisticsInfosService.getOne(q -> q.eq(LogisticsInfos::getBusinessId, deliverGoodsId));
 
+            Purchase purchase = purchaseService.getById(stockWait.getBusinessId());
+            Assert.notEmpty(purchase, "查询不到采购信息");
+
             AbnormalInfo abnormalInfo = new AbnormalInfo();
 
             //搜索物流单号是否已经存在 异常信息
@@ -273,6 +276,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
                 AbnormalInfo oldAbnormalInfo = abnormalInfoService.getOne(q -> q
                         .in(AbnormalInfo::getLogisticsInfosId, ids)
                         .eq(AbnormalInfo::getType,10)
+                        .eq(AbnormalInfo::getPurchaseId,purchase.getId())
                 );
                 if (ObjectUtil.isNotEmpty(oldAbnormalInfo)) {
                     abnormalInfo = oldAbnormalInfo;
@@ -283,8 +287,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
             abnormalInfo.setStatus(0);
             abnormalInfo.setType(10);
             //将异常关联详细设置成采购id和采购单号
-            Purchase purchase = purchaseService.getById(stockWait.getBusinessId());
-            Assert.notEmpty(purchase, "查询不到采购信息");
+
             String victoriatouristJson = purchase.getVictoriatouristJson();
             JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
             //赋值关联信息