出库单执行生成拣货单及取消执行删除拣货单;

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

@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ,a.push_status,a.push_time,a.push_by,a.push_by_name,
         (SELECT m.goods_type FROM PICKING_MATERIAL_DETAIL d
          JOIN material_base_info m ON d.material_base_info_id = m.material_base_info_id
-         WHERE d.PICKING_ORDER_NUMBER = a.PICKING_ORDER_NUMBER
+         WHERE d.PICKING_ORDER_NUMBER = a.PICKING_ORDER_NUMBER and d.del_flag = 1
          LIMIT 1) AS goods_type
     </sql>
 
@@ -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 and b.del_flag = 1
+         left join STOCK_OUT_ORDER b ON a.order_number = b.out_Order_number and b.del_flag = 1 and a.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 and b.del_flag = 1
+        left join stock_out_order b on a.order_number = b.out_order_number and b.del_flag = 1 and a.del_flag = 1
         WHERE a.picking_order_id = #{pickingOrderId}
     </select>
 
@@ -165,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectPickingOrderPo"/>
         <include refid="com.mhd.wms.domain.waveOrder.repository.mapper.WaveOrderMapper.joinWaveOrderPo"/>
         from picking_order a
-        left join wave_order b on a.order_number = b.wave_order_number
+        left join wave_order b on a.order_number = b.wave_order_number and a.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 and b.del_flag = 1
+        left join stock_out_order b on a.order_number = b.out_order_number and b.del_flag = 1 and a.del_flag = 1
         WHERE a.order_number = #{orderNumber}
     </select>
 
@@ -183,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectPickingOrderPo"/>
         <include refid="com.mhd.wms.domain.waveOrder.repository.mapper.WaveOrderMapper.joinWaveOrderPo"/>
         from picking_order a
-        left join wave_order b on a.order_number = b.wave_order_number
+        left join wave_order b on a.order_number = b.wave_order_number and a.del_flag = 1
         WHERE a.order_number = #{orderNumber}
     </select>