修改统计报表

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -1321,96 +1321,6 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultGrossWeight != null">
-                and
-                <foreach collection="resultGrossWeight" item="item" open="(" separator="or" close=")">
-                    "resultGrossWeight" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultGrossWeightTime!= null">
-                and
-                <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
-                    "resultGrossWeightTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="truckCalculateNumber1 != null">
-                and
-                <foreach collection="truckCalculateNumber1" item="item" open="(" separator="or" close=")">
-                    "truckCalculateNumber1" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="resultTareWeight != null">
-                and
-                <foreach collection="resultTareWeight" item="item" open="(" separator="or" close=")">
-                    "resultTareWeight" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultTareWeightTime != null">
-                and
-                <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
-                    "resultTareWeightTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="truckCalculateNumber2 != null">
-                and
-                <foreach collection="truckCalculateNumber2" item="item" open="(" separator="or" close=")">
-                    "truckCalculateNumber2" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultNetWeight!= null">
-                and
-                <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
-                    "resultNetWeight" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultEntryGateTime!= null">
-                and
-                <foreach collection="resultEntryGateTime" item="item" open="(" separator="or" close=")">
-                    "resultEntryGateTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" gatepostName1!= null">
-                and
-                <foreach collection="gatepostName1" item="item" open="(" separator="or" close=")">
-                    "gatepostName1" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultOutGateTime!= null">
-                and
-                <foreach collection="resultOutGateTime" item="item" open="(" separator="or" close=")">
-                    "resultOutGateTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" gatepostName2 != null">
-                and
-                <foreach collection="gatepostName2" item="item" open="(" separator="or" close=")">
-                    "gatepostName2" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultLoadEndTime != null">
-                and
-                <foreach collection="resultLoadEndTime" item="item" open="(" separator="or" close=")">
-                    "resultLoadEndTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" warehouseName1 != null">
-                and
-                <foreach collection="warehouseName1" item="item" open="(" separator="or" close=")">
-                    "warehouseName1" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultEndTime != null">
-                and
-                <foreach collection="resultEndTime" item="item" open="(" separator="or" close=")">
-                    "resultEndTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" warehouseName2 != null">
-                and
-                <foreach collection="warehouseName2" item="item" open="(" separator="or" close=")">
-                    "warehouseName2" like '%${item}%'
-                </foreach>
-            </if>
         </where>
     </select>
     <select id="getInwardReportForAssemble" resultType="java.util.Map" parameterType="java.util.Map">
@@ -1429,7 +1339,8 @@
         twr.result_net_weight        "resultNetWeight",
         RC.CARRIER_NAME "carrierName",
         RL.LINE_NAME "lineName",
-        db.RESULT_FOREIGN_SHIP_NAME "shipName"
+        db.RESULT_FOREIGN_SHIP_NAME "shipName",
+        rw2.WAREHOUSE_NAME  "warehouseName"
         from omstruck_order oo
         left join omstruck_order_material oom
         on oom.order_id = oo.order_id
@@ -1874,7 +1785,8 @@
         twr.result_net_weight        "resultNetWeight",
         RC.CARRIER_NAME "carrierName",
         RL.LINE_NAME "lineName",
-        DB.RESULT_FOREIGN_SHIP_NAME "shipName"
+        DB.RESULT_FOREIGN_SHIP_NAME "shipName",
+        rw2.WAREHOUSE_NAME  "warehouseName"
         from omstruck_order oo
         left join omstruck_order_material oom
         on oom.order_id = oo.order_id