出入库流水关联单号

hx-admin/src/main/resources/application-prod.yml

@@ -71,11 +71,11 @@ spring:
         # 地址
         host: 127.0.0.1
         # 端口，默认为6379
-        port: 23784
+        port: 9673
         # 数据库索引
         database: 1
         # 密码
-        password: w3G_11h4YjrsO_6P5Oi
+        password: ss34dsA3DdsF
         # 连接超时时间
         timeout: 10s
         lettuce:

hx-admin/src/main/resources/application-test.yml

@@ -100,6 +100,8 @@ spring:
 server:
     servlet:
         context-path: /test-api
+    # 服务器的HTTP端口，默认为8080
+    port: 9899
 
 mail:
     # 调用邮箱服务url前缀

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

@@ -9,7 +9,7 @@ public enum JournalType {
     MANUAL_IN(InOutType.IN, 1, "手动入库", ""),
     MANUAL_OUT(InOutType.OUT, 2, "手动出库", ""),
     ADJUSTING_IN(InOutType.IN, 3, "调仓入库", ""),
-//    STOCK_WAIT_IN(InOutType.IN, 4, "待入库入库", "stock_wait"),
+    //    STOCK_WAIT_IN(InOutType.IN, 4, "待入库入库", "stock_wait"),
 //    STOCK_WAIT_OUT(InOutType.OUT, 5, "待出库出库", "stock_wait"),
     COMBINATION_IN(InOutType.IN, 6, "组合入库", "group_record_details"),
     COMBINATION_OUT(InOutType.OUT, 7, "组合出库", "group_record_details"),
@@ -27,8 +27,7 @@ public enum JournalType {
     COMPLETION_IN(InOutType.IN, 17, "待入库 完工入库", ""),
     PURCHASE_ARRIVAL_IN(InOutType.IN, 18, "待入库 采购到货", ""),
     ARRIVAL_QUALITY(InOutType.IN, 19, "到货质检", "quality_info"),
-    PRODUCTION_TASK_OUT(InOutType.OUT, 20, "生产任务待出库出库", "production_task")
-    ;
+    PRODUCTION_TASK_OUT(InOutType.OUT, 20, "生产任务待出库出库", "production_task");
 
 
     /**

hx-wms/src/main/java/com/fjhx/wms/mapper/stock/StockJournalDetailsMapper.java

@@ -3,11 +3,15 @@ package com.fjhx.wms.mapper.stock;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo;
 import com.fjhx.wms.entity.stock.vo.StockJournalVo;
+import com.fjhx.wms.entity.stock.vo.StockWaitVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -24,4 +28,9 @@ public interface StockJournalDetailsMapper extends BaseMapper<StockJournalDetail
      */
     Page<StockJournalDetailsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<StockJournalDetails> wrapper);
 
+    /**
+     * 根据质检id 获取带出入库信息
+     */
+    List<StockWaitVo> getStockWaitInfo(@Param("ew") IWrapper<StockWait> wrapper);
+
 }

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

@@ -2,7 +2,6 @@ package com.fjhx.wms.service.stock.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.item.service.product.ProductInfoService;
@@ -12,6 +11,7 @@ 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.vo.StockJournalDetailsVo;
+import com.fjhx.wms.entity.stock.vo.StockWaitVo;
 import com.fjhx.wms.mapper.stock.StockJournalDetailsMapper;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
 import com.fjhx.wms.service.stock.StockWaitService;
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -83,18 +84,31 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
         if (ObjectUtil.isEmpty(records)) {
             return page;
         }
-        //给采购退货的数据赋值关联单号
-        List<Long> swIds = records.stream().filter(x -> x.getType() == 13).map(StockJournalDetailsVo::getBusinessId).collect(Collectors.toList());
+        //给 采购退货 采购到货 的数据赋值关联单号
+        List<Long> swIds = records.stream().map(StockJournalDetailsVo::getBusinessId).collect(Collectors.toList());
         if (ObjectUtil.isNotEmpty(swIds)) {
             Map<Long, StockWait> stockWaitMap = stockWaitService.mapKEntity(StockWait::getId, q -> q.in(StockWait::getId, swIds));
             for (StockJournalDetailsVo record : records) {
                 StockWait stockWait = stockWaitMap.get(record.getBusinessId());
-                if(ObjectUtil.isEmpty(stockWait)){
+                if (ObjectUtil.isEmpty(stockWait)) {
                     continue;
                 }
                 record.setLinkCode(stockWait.getBusinessCode());
             }
         }
+        //给 到货质检 赋值关联单号
+        List<Long> qIds = records.stream().map(StockJournalDetailsVo::getBusinessId).distinct().filter(Objects::nonNull).collect(Collectors.toList());
+        IWrapper<StockWait> wrapper = IWrapper.getWrapper();
+        wrapper.in("qi", StockWait::getId, qIds);
+        List<StockWaitVo> stockWaitInfo = baseMapper.getStockWaitInfo(wrapper);
+        Map<Long, String> stockWaitInfoMap = stockWaitInfo.stream().collect(Collectors.toMap(StockWait::getId, StockWait::getBusinessCode));
+        for (StockJournalDetailsVo record : records) {
+            String linkCode = stockWaitInfoMap.get(record.getBusinessId());
+            if (ObjectUtil.isEmpty(linkCode)) {
+                continue;
+            }
+            record.setLinkCode(linkCode);
+        }
         return page;
     }
 

hx-wms/src/main/resources/mapper/stock/StockJournalDetailsMapper.xml

@@ -20,5 +20,15 @@
                 JOIN warehouse w ON sj.warehouse_id = w.id
             ${ew.customSqlSegment}
     </select>
+    <select id="getStockWaitInfo" resultType="com.fjhx.wms.entity.stock.vo.StockWaitVo">
+        SELECT
+            qi.id,
+            sw.business_code
+        FROM
+            bytesailing_victoriatourist.quality_info qi
+                JOIN arrival_stock_records asr ON asr.id = qi.bussiness_id
+                JOIN stock_wait sw ON asr.stock_wait_id = sw.id
+            ${ew.customSqlSegment}
+    </select>
 
 </mapper>