预约单改造;

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

@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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
+         left join STOCK_OUT_ORDER b ON a.order_number = b.out_Order_number and b.del_flag = 1
         <where>
             <include refid="selectPickingOrderPo1"/>
         </where>
@@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectPickingOrderPo"/>
         <include refid="com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper.joinStockOutOrderPo"/>
         from picking_order a
-        left join stock_out_order b on a.order_number = b.out_order_number
+        left join stock_out_order b on a.order_number = b.out_order_number and b.del_flag = 1
         WHERE a.picking_order_id = #{pickingOrderId}
     </select>
 
@@ -174,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectPickingOrderPo"/>
         <include refid="com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper.joinStockOutOrderPo"/>
         from picking_order a
-        left join stock_out_order b on a.order_number = b.out_order_number
+        left join stock_out_order b on a.order_number = b.out_order_number and b.del_flag = 1
         WHERE a.order_number = #{orderNumber}
     </select>