提交代码

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderMaterialServiceImpl.java

@@ -366,9 +366,11 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
      * @Description:修改装货
     */
     public int updateContinueStaus(Map<String, Object> map){
-        Integer orderId = (Integer) map.get("orderId");
         int result=0;
-        result+=omstruckOrderMaterialMapper.updateContinueStaus(orderId);
+        if (!("".equals(map.get("orderId")))&&map.get("orderId")!=null){
+            Integer orderId = (Integer) map.get("orderId");
+            result+=omstruckOrderMaterialMapper.updateContinueStaus(orderId);
+        }
         return result;
     }
 }

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

@@ -3956,12 +3956,14 @@
         from OMSTRUCK_ORDER OO
         left join OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID=OOM.ORDER_ID
         left join RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
-        where OO.ORDER_STATUS=5 and
+        where OO.ORDER_STATUS in (4,5)
+        and
         RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
         ) TEMP ON TEMP."orderId"=OO.ORDER_ID
         WHERE
         OO.ORDER_ID = #{orderId}
         AND ASO.DELETED = 0
+        AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>