Merge remote-tracking branch 'origin/master'

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

@@ -18,7 +18,7 @@
         t.out_status, sys.f_remove_zero(t.outing_qty) as outing_qty, t.outing_amt, sys.f_remove_zero(t.out_qty) as out_qty, t.out_amt,
         sys.f_remove_zero(t.return_qty) as return_qty, t.return_amt, t.remarks, t.flg_valid, t.cp_id, t.wh_id
         ,t.box,t.piece,t.sub_unit_id,t.unit_id,t.pack_box,
-        t.fact_price,t.fact_amt,t,use_place,t.discount
+        t.fact_price,t.fact_amt,t.use_place,t.discount
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -100,6 +100,15 @@
         <result column="sup_id" property="supId"/>
         <result column="canOutingQty" property="canOutingQty"/>
         <result column="canReturnQty" property="canReturnQty"/>
+        <result column="cus_code" property="cusCode"/>
+        <result column="cus_name" property="cusName"/>
+        <result column="cus_phone" property="cusPhone"/>
+        <result column="address_full" property="addressFull"/>
+        <result column="channel_name" property="channelName"/>
+        <result column="sku_code" property="skuCode"/>
+        <result column="sku_model" property="skuModel"/>
+        <result column="sku_name" property="skuName"/>
+        <result column="can_out_qty" property="canOutQty"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -703,17 +712,18 @@
     <select id="selectBySaleOut" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>,
-        tpo.ordeer_no  as "orderNo",
-        tmc.cus_code as "cusCode",
-        tmc.cus_name as "cusName",
-        tmc.cus_phone as "cusPhone",
-        tmc.address_full as "addressFull",
-        tmsc.channel_name as "channelName",
-        tmgs.sku_code AS "skuCode",
-        tmgs.sku_model AS "skuModel",
-        tmgs.sku_name AS "skuName",
-        tmgb.brand_name AS "brandName",
-        tmgb.short_name AS "shortName"
+        tpo.order_no  ,
+        tmc.cus_code ,
+        tmc.cus_name ,
+        tmc.cus_phone ,
+        tmc.address_full ,
+        tmsc.channel_name ,
+        tmgs.sku_code ,
+        tmgs.sku_model ,
+        tmgs.sku_name ,
+        tmgb.brand_name ,
+        tmgb.short_name,
+        t.item_qty - (t.outing_qty + t.out_qty) as can_out_qty
         FROM dkic_b.t_psi_order_item t
         LEFT JOIN dkic_b.t_psi_order as tpo ON t.order_id = tpo.order_id
         LEFT JOIN dkic_b.t_mst_customer tmc ON tmc.cus_id = tpo.cus_id

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -417,6 +417,24 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
 
+    @ApiModelProperty(value = "客户编码")
+    private String cusCode;
+
+    @ApiModelProperty(value = "客户名称")
+    private String cusName;
+
+    @ApiModelProperty(value = "客户电话")
+    private String cusPhone;
+
+    @ApiModelProperty(value = "详细地址")
+    private String addressFull;
+
+    @ApiModelProperty(value = "渠道")
+    private String channelName;
+
+    @ApiModelProperty(value = "能出库数量")
+    private BigDecimal canOutQty;
+
     private static final long serialVersionUID = 1L;
 
 }