Преглед на файлове

订单总单添加开单并出库办理标识

koushanshan преди 1 година
родител
ревизия
f5004b6766

+ 10 - 2
src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -10,7 +10,7 @@
         sum_standard, sum_amount, sale_discount, order_status, out_status, sys.f_remove_zero(outing_qty) as outing_qty, outing_amt,
         sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as return_qty, return_amt, amt_receivable,
         amt_handle, amt_residue, remarks, annex_paths, make_staff, make_time, flg_valid, cp_id,
-        fact_amt,disc_amt,discount,flg_auto_handle,flg_handle_setting
+        fact_amt,disc_amt,discount,flg_auto_handle,flg_handle_setting,outbound_processing_flag
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -56,6 +56,7 @@
         <result column="discount" property="discount"/>
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="flg_handle_setting" property="flgHandleSetting"/>
+        <result column="outbound_processing_flag" property="outboundProcessingFlag"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -115,7 +116,8 @@
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="flg_handle_setting" property="flgHandleSetting"/>
         <result column="flg_business" property="flgBusiness"/>
-<!--            <collection property="orderItemResponseList" resultMap="orderItemListMap"  />-->
+        <result column="outbound_processing_flag" property="outboundProcessingFlag"/>
+        <!--            <collection property="orderItemResponseList" resultMap="orderItemListMap"  />-->
     </resultMap>
 
     <resultMap id="orderItemListMap" type="java.util.Map">
@@ -209,6 +211,7 @@
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="flg_handle_setting" property="flgHandleSetting"/>
         <result column="channelName" property="channelName"/>
+        <result column="outbound_processing_flag" property="outboundProcessingFlag"/>
         <collection property="orderItemResponseList" resultMap="itemListMap" columnPrefix="list_"/>
 
     </resultMap>
@@ -860,6 +863,7 @@
             discount,
             flg_auto_handle,
             flg_handle_setting,
+            outbound_processing_flag,
         </trim>
         )
         values
@@ -906,6 +910,7 @@
                 #{item.discount},
                 #{item.flgAutoHandle},
                 #{item.flgHandleSetting},
+                #{item.outboundProcessingFlag},
             </trim>
             )
         </foreach>
@@ -1032,6 +1037,9 @@
             <if test=" et!=null and et.flgHandleSetting != null">
                 flg_handle_setting =#{et.flgHandleSetting,jdbcType=BOOLEAN},
             </if>
+            <if test=" et!=null and et.outboundProcessingFlag != null">
+                outbound_processing_flag =#{et.outboundProcessingFlag,jdbcType=BOOLEAN},
+            </if>
         </set>
         where order_id =#{et.orderId,typeHandler=UuidTypeHandler}
         and sum_quantity >= (out_qty + outing_qty)

+ 3 - 0
src/main/java/com/dk/mdm/model/pojo/sale/Order.java

@@ -366,6 +366,9 @@ public class Order extends PageInfo<Order> implements Serializable {
     @ApiModelProperty(value = "自动办理参数")
     private Boolean flgHandleSetting;
 
+    @ApiModelProperty(value = "开单并出库办理标识")
+    private Boolean outboundProcessingFlag;
+
     private static final long serialVersionUID = 1L;
 
 }

+ 3 - 0
src/main/java/com/dk/mdm/model/response/sale/OrderResponse.java

@@ -426,6 +426,9 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
 
     private Boolean flgBusiness;
 
+    @ApiModelProperty(value = "开单并出库办理标识")
+    private Boolean outboundProcessingFlag;
+
 
     private static final long serialVersionUID = 1L;