luobang 2 سال پیش
والد
کامیت
9543a8e969
1فایلهای تغییر یافته به همراه4 افزوده شده و 1 حذف شده
  1. 4 1
      src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardRequirementMapper.xml

+ 4 - 1
src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardRequirementMapper.xml

@@ -1519,7 +1519,7 @@
         AND ARM.MATERIAL_LUNO IS NOT NULL
         AND OO.ORDER_STATUS IN (2,4,5)
         AND OO.ORDER_TYPE = 11
-        <if test="oneDate != null">
+        <if test="oneDate != null and queryHeatNo == null">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
         </if>
         <if test="startDate != null">
@@ -1532,6 +1532,9 @@
         <if test="clazz != null">
             and AIR.REQUIREMENT_CLASS like #{clazz}
         </if>
+        <if test="queryHeatNo != null">
+            and ARM.MATERIAL_LUNO like #{queryHeatNo}
+        </if>
         Order by air.insert_time desc
         )
     </select>