查询添加报关

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java

@@ -159,4 +159,7 @@ public class PickingOrderPO extends StockOutOrderBasePO {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+
+    @ApiModelProperty("是否报关")
+    private String needDeclareFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java

@@ -206,4 +206,7 @@ public class PickingOrderDO extends BaseVOEntity {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+
+    @ApiModelProperty("是否报关")
+    private String needDeclareFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java

@@ -174,4 +174,7 @@ public class PickingOrderDTO extends BaseVOEntity {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+
+    @ApiModelProperty("是否报关")
+    private String needDeclareFlag;
 }

mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderTypeName"    column="order_type_name"    />
         <result property="priorityLevelCode"    column="priority_level_code"    />
         <result property="priorityLevelName"    column="priority_level_name"    />
+        <result property="needDeclareFlag"    column="need_declare_flag"    />
     </resultMap>
 
 
@@ -108,12 +109,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
             <otherwise> and a.del_flag = 1 </otherwise>
         </choose>
+        <if test="needDeclareFlag != null  and needDeclareFlag != ''">
+            and b.need_declare_flag = #{needDeclareFlag}
+        </if>
     </sql>
 
     <select id="queryList" parameterType="com.mhd.wms.domain.pickingOrder.repository.todo.PickingOrderDO" resultMap="PickingOrderResult">
         select
             <include refid="selectPickingOrderPo"/>
+        ,b.need_Declare_Flag
         from picking_order a
+         left join STOCK_OUT_ORDER b ON a.order_number = b.out_Order_number
         <where>
             <include refid="selectPickingOrderPo1"/>
         </where>