订单明细增加wh_id

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

@@ -6,12 +6,12 @@
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
         item_id
-        , order_id, item_index, sku_id, item_qty, price_std, amt_std, price_sale, item_amt, price_discount, non_std_code, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks, flg_valid, cp_id
+        , order_id, item_index, sku_id, item_qty, price_std, amt_std, price_sale, item_amt, price_discount, non_std_code, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks, flg_valid, cp_id, wh_id
     </sql>
 
     <sql id="Base_Column_List_Response">
         t.item_id, t.order_id, t.item_index, t.sku_id, t.item_qty, t.price_std, t.amt_std, t.price_sale, t.item_amt, t.price_discount, t.non_std_code,
-        t.out_status, t.outing_qty, t.outing_amt, t.out_qty, t.out_amt, t.return_qty, t.return_amt, t.remarks, t.flg_valid, t.cp_id
+        t.out_status, t.outing_qty, t.outing_amt, t.out_qty, t.out_amt, t.return_qty, t.return_amt, t.remarks, t.flg_valid, t.cp_id, t.wh_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -37,6 +37,7 @@
                 <result column="remarks" property="remarks"/>
                 <result column="flg_valid" property="flgValid"/>
                 <result column="cp_id" property="cpId"/>
+                <result column="wh_id" property="whId"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -62,6 +63,7 @@
                 <result column="remarks" property="remarks"/>
                 <result column="flg_valid" property="flgValid"/>
                 <result column="cp_id" property="cpId"/>
+                <result column="wh_id" property="whId"/>
                 <result column="order_no" property="orderNo"/>
                 <result column="transferableQuantity" property="transferableQuantity"/>
     </resultMap>
@@ -163,7 +165,8 @@
                t.out_amt,
                t.return_qty,
                t.return_amt,
-               t.remarks
+               t.remarks,
+               t.wh_id
         FROM dkic_b.t_psi_order_item as t
                  inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
         <include refid="Condition"/>
@@ -239,6 +242,7 @@
             return_amt,
             remarks,
             cp_id,
+            wh_id,
         </trim>
         )
         values
@@ -264,6 +268,7 @@
                 #{item.returnAmt},
                 #{item.remarks},
                 #{item.cpId},
+                #{item.whId},
             </trim>
             )
         </foreach>
@@ -291,7 +296,7 @@
                t.non_std_code,
                t.remarks,
                i.inv_id                                   as "invId",
-               i.wh_id                                    as "whId",
+               i.wh_id,
                i.inv_qty                                  as "invQty",
                i.usable_qty                               as "usableQty",
                i.wh_name                                  as "whName"

src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -209,6 +209,9 @@ public class OrderItem extends PageInfo<OrderItem> implements Serializable {
     @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/query/sale/OrderItemQuery.java

@@ -212,6 +212,11 @@ public class OrderItemQuery extends PageInfo<OrderItemQuery> implements Serializ
     @ApiModelProperty(value = "订单单号")
     private String orderNo;
 
+
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -237,9 +237,6 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @ApiModelProperty(value = "库存ID")
     private String invId;
 
-    @ApiModelProperty(value = "仓库ID")
-    private String whId;
-
     @ApiModelProperty(value = "库存数量")
     private BigDecimal invQty;
 
@@ -287,6 +284,9 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @ApiModelProperty(value = "可转采购数量")
     private BigDecimal transferableQuantity;
 
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/vo/sale/OrderItemVO.java

@@ -209,6 +209,9 @@ public class OrderItemVO extends PageInfo<OrderItemVO> implements Serializable {
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
 
     private static final long serialVersionUID = 1L;