物流数据、异常管理页面增加 采购id

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/po/AbnormalInfo.java

@@ -1,11 +1,12 @@
 package com.fjhx.victoriatourist.entity.abnormal.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * <p>
  * 异常记录
@@ -59,4 +60,9 @@ public class AbnormalInfo extends BasePo {
      */
     private String remark;
 
+    /**
+     * 采购id
+     */
+    private Long purchaseId;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/logistics/po/LogisticsInfos.java

@@ -1,13 +1,10 @@
 package com.fjhx.victoriatourist.entity.logistics.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * <p>
  * 物流信息
@@ -96,4 +93,9 @@ public class LogisticsInfos extends BasePo {
      */
     private String address;
 
+    /**
+     * 采购id
+     */
+    private Long purchaseId;
+
 }

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

@@ -37,7 +37,7 @@ public class WmsServiceImpl implements WmsService {
     }
 
     @Override
-    public void addEndInStockAbnormal(Long linkId, String linkCode) {
+    public void addEndInStockAbnormal(Long linkId, String linkCode, Long purchaseId) {
         AbnormalInfo abnormalInfo = new AbnormalInfo();
         abnormalInfo.setStatus(0);
         abnormalInfo.setId(IdWorker.getId());
@@ -45,6 +45,7 @@ public class WmsServiceImpl implements WmsService {
         abnormalInfo.setLinkId(linkId);
         abnormalInfo.setLinkCode(linkCode);
         abnormalInfo.setTitle("入库数量差异");
+        abnormalInfo.setPurchaseId(purchaseId);
         abnormalInfoService.save(abnormalInfo);
     }
 

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -42,7 +42,6 @@ import com.fjhx.victoriatourist.service.purchase.PurchaseBackDetailsService;
 import com.fjhx.victoriatourist.service.purchase.PurchaseBackService;
 import com.fjhx.wms.entity.stock.po.StockJournal;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
-import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
@@ -187,6 +186,7 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
         logisticsInfos.setCode(deliverGoodsDto.getCode());
         logisticsInfos.setLogisticsCompanyCode(deliverGoodsDto.getLogisticsCompanyCode());
         logisticsInfos.setIsKd100(0);
+        logisticsInfos.setPurchaseId(purchase.getId());
         logisticsInfosService.save(logisticsInfos);
 
         List<DeliverGoodsDetails> deliverGoodsDetailsList = deliverGoodsDto.getDeliverGoodsDetailsList();

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/purchase/impl/PurchaseBackServiceImpl.java

@@ -1,6 +1,5 @@
 package com.fjhx.victoriatourist.service.purchase.impl;
 
-import ch.qos.logback.core.net.AbstractSSLSocketAppender;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -191,8 +190,10 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
     public void backOuts(StockWaitDto stockWaitDto) {
         StockWait byId = stockWaitService.getById(stockWaitDto.getId());
         Assert.notEmpty(byId,"无法查询到待出库信息");
+        PurchaseBack purchaseBack = getById(byId.getBusinessId());
         //创建物流数据
         LogisticsInfos logisticsInfos = new LogisticsInfos();
+        logisticsInfos.setPurchaseId(purchaseBack.getPurchaseId());
         logisticsInfos.setBusinessId(byId.getId());
         logisticsInfos.setBusinessCode(byId.getBusinessCode());
         logisticsInfos.setBusinessType(5);//采购退货

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

@@ -217,6 +217,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
             //赋值关联信息
             abnormalInfo.setLinkId(purchase.getId());
             abnormalInfo.setLinkCode(json.getString("contractCode"));
+            abnormalInfo.setPurchaseId(purchase.getId());
 
             abnormalInfo.setTitle("质检存在不合格");
             abnormalInfoService.save(abnormalInfo);

hx-victoriatourist/src/main/resources/mapper/abnormal/AbnormalInfoMapper.xml

@@ -16,9 +16,10 @@
             ai.create_time,
             ai.update_user,
             ai.update_time,
-            p.create_user purchaseUserId
+            p.create_user purchaseUserId,
+            ai.purchase_id
         from abnormal_info ai
-            left JOIN bytesailing_purchase.purchase p ON ai.link_id = p.id
+                 left JOIN bytesailing_purchase.purchase p ON ai.link_id = p.id
             ${ew.customSqlSegment}
     </select>
 

hx-victoriatourist/src/main/resources/mapper/logistics/LogisticsInfosMapper.xml

@@ -21,7 +21,8 @@
             li.country_id,
             li.province_id,
             li.city_id,
-            li.address
+            li.address,
+            li.purchase_id
         from logistics_infos li
             ${ew.customSqlSegment}
     </select>

hx-wms/src/main/java/com/fjhx/wms/service/WmsService.java

@@ -17,7 +17,7 @@ public interface WmsService {
     /**
      * 添加结束入库异常
      */
-    void addEndInStockAbnormal(Long linkId, String linkCode);
+    void addEndInStockAbnormal(Long linkId, String linkCode, Long purchaseId);
 
     /**
      * 获取采购退货信息

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

@@ -374,7 +374,11 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         Assert.notEmpty(stockWait, "无法查询到待入库信息");
         stockWait.setStatus(3);//设置状态为结束
         updateById(stockWait);
-        wmsService.addEndInStockAbnormal(stockWait.getId(), stockWait.getBusinessCode());
+        Long purchaseId = null;
+        if (stockWait.getBusinessType() == 3) {
+            purchaseId = stockWait.getBusinessId();
+        }
+        wmsService.addEndInStockAbnormal(stockWait.getId(), stockWait.getBusinessCode(), purchaseId);
     }
 
 }