钢材订单取消装货和八点继续装显示优化

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

@@ -2939,7 +2939,12 @@
             end
         )
         <if test="steelJudge != null">
-            || '   ' || RW.WAREHOUSE_NAME
+            || '   ' || (
+            CASE WHEN ams.DELETED IS NOT NULL
+            THEN '取消装货'
+            ELSE decode(OOM.MATERIAL_PRIORITY, 71, '', RW.WAREHOUSE_NAME)
+            end
+            )
         </if>
         "materialName",
         RM.MATERIAL_ID   "materialId",
@@ -2971,6 +2976,8 @@
         <if test="steelJudge != null">
             LEFT JOIN RMS_WAREHOUSE RW
             ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+            LEFT JOIN AMS_SALE_MATERIAL ams
+            ON ams.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID
         </if>
         WHERE ORDER_ID = #{orderId}
         ORDER BY RM.MATERIAL_NAME
@@ -4505,7 +4512,12 @@
         SELECT
         RM.MATERIAL_NAME
         <if test="steelJudge != null">
-            || '   ' || RW.WAREHOUSE_NAME
+            || '   ' ||  (
+            CASE WHEN ams.DELETED IS NOT NULL
+            THEN '取消装货'
+            ELSE decode(oom.MATERIAL_PRIORITY, 71, '', RW.WAREHOUSE_NAME)
+            end
+            )
         </if>
         "materialName",
         RM.MATERIAL_ID   "materialId",
@@ -4544,6 +4556,8 @@
         <if test="steelJudge != null">
             LEFT JOIN RMS_WAREHOUSE RW
             ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+            LEFT JOIN AMS_SALE_MATERIAL ams
+            ON ams.SALE_MATERIAL_ID = oom.SALE_MATERIAL_ID
         </if>
         WHERE
         OO.ORDER_STATUS = 2
@@ -4557,6 +4571,7 @@
         OO.ORDER_STATUS = 2
         AND OO.ORDER_NUMBER = (SELECT OO.ORDER_NUMBER FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_ID = #{orderId})
+          AND OO.ORDER_ID != #{orderId}
     </select>
     <update id="clsoePlanByPlan">
         UPDATE AMSTRUCK_INWARD_PLAN AIP