Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -778,7 +778,7 @@
     <!-- 采购跟踪-->
     <select id="selectTrackReport" resultType="java.util.Map">
         SELECT *
-        FROM dkic_b.f_query_pur_for_track(#{purId}::uuid)
+        FROM dkic_b.f_query_pur_for_track(#{purId}::uuid,#{cpId})
     </select>
     <select id="selectPurOrderAndDeatil" resultType="java.util.Map">
         SELECT

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

@@ -524,7 +524,7 @@
         FROM dkic_b.t_psi_order_item as t
         left join dkic_b.t_psi_order as tpo on tpo.order_id = t.order_id
         inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
-        left join(select from_item_id,sum(item_qty) as sumQty from t_psi_purchase_item
+        left join(select from_item_id,sum(item_qty) as sumQty from dkic_b.t_psi_purchase_item
             group by from_item_id) as pi on pi.from_item_id = t.item_id
         <where>
             t.item_qty - coalesce(sumQty,0) > 0
@@ -544,7 +544,7 @@
         FROM dkic_b.t_psi_order_item as t
         left join dkic_b.t_psi_order as tpo on tpo.order_id = t.order_id
         inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
-        left join(select from_item_id,sum(item_qty) as sumQty from t_psi_purchase_item
+        left join(select from_item_id,sum(item_qty) as sumQty from dkic_b.t_psi_purchase_item
         group by from_item_id) as pi on pi.from_item_id = t.item_id
         <where>
             t.item_qty - coalesce(sumQty,0) > 0