sql修改

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -114,6 +114,8 @@
         <result column="from_no" property="fromNo"/>
         <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
         <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
+        <result column="staffName" property="staffName" />
+        <result column="orgName" property="orgName" />
         <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
         <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
         <result column="out_status" property="outStatus"/>
@@ -186,6 +188,7 @@
         <result column="brand_name" property="brandName"/>
         <result column="price_purchase" property="pricePurchase"/>
         <result column="price_standard" property="priceStandard"/>
+        <result column="sku_images" property="skuImages"/>
         <result column="wh_id" property="whId"/>
         <result column="wh_name" property="whName"/>
 
@@ -1080,6 +1083,7 @@
         tmgb.short_name AS list_short_name,
         tmgs.price_purchase AS list_price_purchase,
         tmgs.price_standard AS list_price_standard,
+        tmgs.sku_images AS list_sku_images,
                       tpity.wh_id AS list_wh_id,
                       tmw.wh_name AS list_wh_name
     </sql>

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -172,6 +172,9 @@
             <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
             <result column="flg_valid" property="flgValid"/>
             <result column="cp_id" property="cpId"/>
+            <result column="org_name" property="orgName"/>
+            <result column="staff_name" property="staffName"/>
+
             <collection property="orderItemResponseList" resultMap="itemListMap" columnPrefix="list_"/>
     </resultMap>
     <!--小程序用 关联映射-->
@@ -203,6 +206,7 @@
             <result column="sku_name" property="skuName"/>
             <result column="brand_name" property="brandName"/>
             <result column="short_name" property="shortName"/>
+            <result column="sku_images" property="skuImages"/>
             <result column="price_purchase" property="pricePurchase"/>
             <result column="price_standard" property="priceStandard"/>
             <result column="order_qty" property="orderQty"/>
@@ -242,7 +246,9 @@
         t.out_amt, t.return_qty, t.return_amt,
         t.amt_receivable, amt_handle, amt_residue,
         t.remarks, t.annex_paths, t.make_staff, t.make_time,
-        t.flg_valid, t.cp_id
+        t.flg_valid, t.cp_id,
+        tmo.org_name,
+        tms.staff_name
     </sql>
     <!--小程序用 明细-->
     <sql id="Base_Column_List_Item_Response_Detail_Join">
@@ -275,6 +281,7 @@
         tmgs.sku_name AS list_sku_name,
         tmgb.brand_name AS list_brand_name,
         tmgb.short_name AS list_short_name,
+        tmgs.sku_images AS list_sku_images,
         tmgs.price_purchase AS list_price_purchase,
         tmgs.price_standard AS list_price_standard,
         i.inv_id  as list_inv_id,
@@ -952,6 +959,8 @@
         left join dkic_b.t_psi_order_item toi on toi.order_id  = t.order_id
         inner join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = toi.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id  = tmgs.brand_id
+        left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
+        left join dkic_b.t_mst_staff tms on t.staff_id = tms.staff_id
         left join(SELECT T.*
         FROM (select tpi.inv_id,
         tpi.wh_id,