入库业务单添加查询条件;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java

@@ -472,4 +472,6 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date pushTimeEnd;
+
+    private String xfStatus;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java

@@ -553,4 +553,6 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date pushTimeEnd;
+
+    private String xfStatus;
 }

mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml

@@ -450,6 +450,12 @@
         <if test="expectTimeEnd != null and expectTimeEnd != ''">
             and date_format(a.expect_time,'%Y-%m-%d') &lt;= #{expectTimeEnd}
         </if>
+        <if test="xfStatus != null  and xfStatus != '' and xfStatus == '已下发'">
+            and b.in_order_number is not null
+        </if>
+        <if test="xfStatus != null  and xfStatus != '' and xfStatus == '未下发'">
+            and b.in_order_number is null
+        </if>
         <!-- 入库明细：物料名称、物料编码（同一明细行同时满足；与计划数量汇总口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
         <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">
             and exists (
@@ -481,7 +487,7 @@
     <select id="queryList" parameterType="com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO" resultMap="StockInOrderResult">
         select
         <include refid="selectStockInOrderPo"/>
-        from reservation_stock_in_order a
+        from reservation_stock_in_order a left join NGWL_TEST_WMS.stock_in_order b on a.in_order_number = b.in_order_number
         <where>
             <include refid="selectStockInOrderPo1"/>
         </where>

mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml

@@ -352,6 +352,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderTypeName != null  and orderTypeName != ''">
             and a.order_type_name like concat('%', #{orderTypeName}, '%')
         </if>
+        <if test="xfStatus != null  and xfStatus != '' and xfStatus == '已下发'">
+            and b.out_order_number is not null
+        </if>
+        <if test="xfStatus != null  and xfStatus != '' and xfStatus == '未下发'">
+            and b.out_order_number is null
+        </if>
         <!-- 出库明细：物料名称、物料编码（同一明细行同时满足；与出库明细口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
 <!--        <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">-->
 <!--            and exists (-->
@@ -383,7 +389,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryList" parameterType="com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDO" resultMap="StockOutOrderResult">
         select
             <include refid="selectStockOutOrderPo"/>
-        from reservation_stock_out_order a
+        from reservation_stock_out_order a left join NGWL_TEST_WMS.stock_out_order b on a.out_order_number = b.out_order_number
         <where>
             <include refid="selectStockOutOrderPo1"/>
         </where>