查询库存

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

@@ -137,6 +137,8 @@
         <result column="sPurItemIntoAmt" property="sPurItemIntoAmt"/>
         <result column="sPurItemReturnQty" property="sPurItemReturnQty"/>
         <result column="sPurItemReturnAmt" property="sPurItemReturnAmt"/>
+        <result column="usableQty" property="usableQty"/>
+        <result column="nonStdCode" property="nonStdCode"/>
 
     </resultMap>
 
@@ -476,7 +478,8 @@
         ,tppi.return_qty as "sPurItemReturnQty"
         ,tppi.return_amt as "sPurItemReturnAmt"
 
-
+        ,tpi.usable_qty AS "usableQty"
+        ,tpi.non_std_code AS "nonStdCode"
         FROM dkic_b.t_psi_inbound_item tpii
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpii.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id

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

@@ -190,8 +190,11 @@
         <result column="outing_qty" property="outingQty"/>
         <result column="price_std" property="priceStd"/>
         <result column="into_item_id" property="intoItemId"/>
+        <result column="inv_id" property="invId"/>
+        <result column="wh_id" property="whId"/>
+        <result column="inv_qty" property="invQty"/>
+        <result column="usable_qty" property="usableQty"/>
         <result column="wh_name" property="whName"/>
-        <result column="wh_code" property="whCode"/>
 
     </resultMap>
 
@@ -520,8 +523,12 @@
 --         tpit.outing_qty AS list_outing_qty
 --         ,
         tmgs.price_standard AS list_price_std,
-        tmw.wh_name AS list_wh_name,
-        tmw.wh_code AS list_wh_code
+
+        i.inv_id  as list_inv_id,
+        i.wh_id as list_wh_id,
+        i.inv_qty    as list_inv_qty,
+        i.usable_qty  as list_usable_qty,
+        i.wh_name     as list_wh_name
     </sql>
 
 
@@ -533,8 +540,22 @@
         FROM dkic_b.t_psi_inbound  tpi
         left  join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id
         left  join  dkic_b.t_mst_warehouse tmw on  tmw.wh_id =   tpii.wh_id
-        left join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tpii.sku_id
---         left join  dkic_b.t_psi_inventory  tpit on tpit.sku_id = tpii.sku_id
+        inner join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tpii.sku_id
+        left join(SELECT T.*
+        FROM (select tpi.inv_id,
+        tpi.wh_id,
+        tpi.inv_qty,
+        tpi.usable_qty,
+        tpi.sku_id,
+        tpi.non_std_code,
+        tpi.cp_id,
+        tmw.wh_name,
+        rank()
+        over (partition by tpi.cp_id,tpi.sku_id,tpi.non_std_code order by tpi.inv_id) as RK
+        from dkic_b.t_psi_inventory as tpi
+        left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id) T
+        WHERE T.RK = 1) as i
+        on i.sku_id = tpii.sku_id and i.non_std_code = tpii.non_std_code and i.cp_id = tpii.cp_id
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}

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

@@ -103,6 +103,10 @@
         <result column="op_app_code" property="opAppCode"/>
         <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
         <result column="op_db_user" property="opDbUser"/>
+        <result column="inv_id" property="invId"/>
+        <result column="inv_qty" property="invQty"/>
+        <result column="usable_qty" property="usableQty"/>
+
     </resultMap>
 
 
@@ -304,11 +308,32 @@
         ,tmgs.price_purchase  as "pricePurchase"
         ,tmgs.price_standard  as "priceStandard"
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName"
+        ,
+        i.inv_id,
+        i.inv_qty,
+        i.usable_qty
         FROM dkic_b.t_psi_purchase_item tppi
+        left join(SELECT T.*
+        FROM (select tpi.inv_id,
+        tpi.wh_id,
+        tpi.inv_qty,
+        tpi.usable_qty,
+        tpi.sku_id,
+        tpi.non_std_code,
+        tpi.cp_id,
+        tmw.wh_name,
+        rank()
+        over (partition by tpi.cp_id,tpi.sku_id,tpi.non_std_code order by tpi.inv_id) as RK
+        from dkic_b.t_psi_inventory as tpi
+        left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id) T
+        WHERE T.RK = 1) as i on i.sku_id = tppi.sku_id and i.non_std_code = tppi.non_std_code and i.cp_id = tppi.cp_id
         left join dkic_b.t_psi_order tpo on tpo.order_id = tppi.from_id
         left join dkic_b.t_mst_goods_sku tmgs on tppi.sku_id = tmgs.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
         left join sys.t_data_kind tdk1 on tdk1.kind_code = tppi.into_status
+
+
+
         <include refid="Condition_1"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}

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

@@ -204,6 +204,14 @@
             <result column="short_name" property="shortName"/>
             <result column="price_purchase" property="pricePurchase"/>
             <result column="price_standard" property="priceStandard"/>
+            <result column="order_qty" property="orderQty"/>
+            <result column="price_out" property="priceOut"/>
+            <result column="inv_id" property="invId"/>
+            <result column="wh_id" property="whId"/>
+            <result column="inv_qty" property="invQty"/>
+            <result column="usable_qty" property="usableQty"/>
+            <result column="wh_name" property="whName"/>
+
     </resultMap>
     <!--小程序用 总单-->
     <sql id="Base_Column_List_Detail_Join">
@@ -243,9 +251,11 @@
         toi.item_index AS list_item_index,
         toi.sku_id AS list_sku_id,
         toi.item_qty AS list_item_qty,
+        toi.item_qty AS list_order_qty,
         toi.price_std AS list_price_std,
         toi.amt_std AS list_amt_std,
         toi.price_sale AS list_price_sale,
+        toi.price_sale AS list_price_out,
         toi.item_amt AS list_item_amt,
         toi.price_discount AS list_price_discount,
         toi.non_std_code AS list_non_std_code,
@@ -265,7 +275,12 @@
         tmgb.brand_name AS list_brand_name,
         tmgb.short_name AS list_short_name,
         tmgs.price_purchase AS list_price_purchase,
-        tmgs.price_standard AS list_price_standard
+        tmgs.price_standard AS list_price_standard,
+        i.inv_id  as list_inv_id,
+        i.wh_id as list_wh_id,
+        i.inv_qty    as list_inv_qty,
+        i.usable_qty  as list_usable_qty,
+        i.wh_name     as list_wh_name
     </sql>
 
 
@@ -870,8 +885,23 @@
         <include refid="Base_Column_List_Item_Response_Detail_Join"/>
         FROM dkic_b.t_psi_order as t
         left join dkic_b.t_psi_order_item toi on toi.order_id  = t.order_id
-        left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = toi.sku_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(SELECT T.*
+        FROM (select tpi.inv_id,
+        tpi.wh_id,
+        tpi.inv_qty,
+        tpi.usable_qty,
+        tpi.sku_id,
+        tpi.non_std_code,
+        tpi.cp_id,
+        tmw.wh_name,
+        rank()
+        over (partition by tpi.cp_id,tpi.sku_id,tpi.non_std_code order by tpi.inv_id) as RK
+        from dkic_b.t_psi_inventory as tpi
+        left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id) T
+        WHERE T.RK = 1) as i
+        on i.sku_id = toi.sku_id and i.non_std_code = toi.non_std_code and i.cp_id = toi.cp_id
         <include refid="Condition"/>
         order by t.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

src/main/java/com/dk/mdm/model/response/ivt/InboundItemResponse.java

@@ -355,6 +355,10 @@ public class InboundItemResponse  {
     @ApiModelProperty(value = "源采购单明细已入库退货金额")
     private BigDecimal sPurItemReturnAmt;
 
+    @ApiModelProperty(value = "可售量")
+    private BigDecimal usableQty;
+
+
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/dk/mdm/model/response/pur/PurchaseItemResponse.java

@@ -366,6 +366,14 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
      * @TableField(exist = false)
      */
 
+    private String invId;
+
+    private BigDecimal invQty;
+
+    private BigDecimal usableQty;
+
+
+
 
     private static final long serialVersionUID = 1L;