Merge remote-tracking branch 'origin/master'

src/main/java/com/zg/project/wisdom/domain/vo/DeliveryBillVO.java

@@ -1,6 +1,7 @@
 package com.zg.project.wisdom.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zg.framework.aspectj.lang.annotation.Excel;
 import com.zg.project.wisdom.domain.RkRecord;
 import lombok.Data;
 
@@ -33,7 +34,10 @@ public class DeliveryBillVO implements Serializable {
 
     /** 配送状态：0否 1是 2待接单 3配送中 4配送完成 */
     private String isDelivery;
+    /** 出入库类型名称（联表） */
+    private String operationTypeName;
 
     /** 该单据下的货物明细 */
     private List<RkRecord> recordList;
+
 }

src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java

@@ -717,10 +717,11 @@ public class RkBillServiceImpl implements IRkBillService
                     rkRecordMapper.selectByBillNo(bill.getBillNo());
 
             vo.setRecordList(records);
+            System.out.println("单据详情=="+records);
 
             result.add(vo);
         }
-
+        System.out.println("反序列化前的list=="+result);
         return result;
     }
 

src/main/resources/mybatis/wisdom/RkBillMapper.xml

@@ -104,7 +104,7 @@
     <select id="selectRkBillList" parameterType="RkBill" resultMap="RkBillResult">
         <include refid="selectRkBillVo"/>
         <where>
-
+            AND rb.is_delivery ='1'
             <if test="wlType != null and wlType != ''">
                 AND rb.wl_type = #{wlType}
             </if>

src/main/resources/mybatis/wisdom/RkRecordMapper.xml

@@ -81,7 +81,11 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
-        <result property="isDelete" column="is_delete"/>
+        <result property="operationTypeName" column="operationTypeName"/>
+        <result property="wlTypeName" column="wlTypeName"/>
+        <result property="operatorName" column="operatorName"/>
+        <result property="parentWarehouseName" column="parentWarehouseName"/>
+        <result property="warehouseName" column="warehouseName"/>
     </resultMap>
 
     <!-- ===================== 查询字段（统一视图） ===================== -->
@@ -730,10 +734,24 @@
 
     <select id="selectByBillNo"
             resultMap="RkRecordResult">
-        SELECT *
+        SELECT
-        FROM rk_record
+            rr.*,
-        WHERE bill_no = #{billNo}
+            sit.type_name AS operationTypeName,
-        AND is_delete = '0'
+            mt.type_name  AS wlTypeName,
+            su.user_name  AS operatorName,
+            IFNULL(wh.parent_warehouse_name, '') AS parentWarehouseName,
+            IFNULL(wh.warehouse_name, '') AS warehouseName
+        FROM rk_record rr
+                 LEFT JOIN stock_out_type sit
+                           ON rr.operation_type = sit.type_code
+                 LEFT JOIN material_type mt
+                           ON rr.wl_type = mt.type_code
+                 LEFT JOIN sys_user su
+                           ON rr.operator = su.user_id
+                 LEFT JOIN warehouse_info wh
+                           ON rr.cangku = wh.warehouse_code
+        WHERE rr.bill_no = #{billNo}
+        AND rr.is_delete = '0'
     </select>