待出库添加地址明细

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitVo.java

@@ -90,4 +90,9 @@ public class StockWaitVo extends StockWait {
      */
     private String logisticsCode;
 
+    /**
+     * 详细地址（采购退货）
+     */
+    private String detailedAddress;
+
 }

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

@@ -38,12 +38,15 @@
             sw.update_time,
             sw.victoriatourist_json,
             lis.logistics_company_code,
-            lis.`code` AS logisticsCode
+            lis.`code` AS logisticsCode,
+            pb.detailed_address
         FROM
             stock_wait sw
                 LEFT JOIN stock_wait_details swd ON swd.stock_wait_id = sw.id
                 LEFT JOIN bytesailing_item.product_info pi ON swd.product_id = pi.id
                 LEFT JOIN bytesailing_victoriatourist.logistics_infos lis ON lis.business_id = CAST( json_unquote( sw.victoriatourist_json -> '$.deliverGoodsId' ) AS UNSIGNED )
+                LEFT JOIN bytesailing_victoriatourist.purchase_back pb ON sw.business_id = pb.id
+                AND pb.del_flag = 0
             ${ew.customSqlSegment}
     </select>
     <select id="getStockWaitList" resultType="com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo">

pom.xml

@@ -52,7 +52,7 @@
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-base</artifactId>
-                <version>1.0.1</version>
+                <version>1.0.2</version>
             </dependency>
             <dependency>
                 <groupId>com.fjhx</groupId>