巡检优化

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/check/TWarehouseCheckController.java

@@ -166,7 +166,7 @@ public class TWarehouseCheckController extends BaseController {
             tWarehouseCheckItemsDetailsQuery.setfCheckFid(checkId);
             List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList = tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
             if (tWarehouseCheckItemsDetailsList.size() > 0) {
-                return AjaxResult.error("任务编号:" + checkId.intValue() + " 已存在巡检记录,无法删除");
+                return AjaxResult.error("已存在巡检记录，无法删除");
             }
         }
         return toAjax(tWarehouseCheckService.deleteTWarehouseCheckByIds(fIds));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/check/TWarehouseCheckItemsController.java

@@ -122,7 +122,10 @@ public class TWarehouseCheckItemsController extends BaseController
             tWarehouseCheckItemsDetailsQuery.setfItemFid(itemId);
             List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList = tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
             if (tWarehouseCheckItemsDetailsList.size() > 0) {
-                return AjaxResult.error("任务编号:" + itemId.intValue() + " 已存在巡检记录,无法删除");
+                String photoUrl = tWarehouseCheckItemsDetailsList.get(0).getfPhotoUrl();
+                if (StringUtils.isNotEmpty(photoUrl) && !"[]".equals(photoUrl)) {
+                    return AjaxResult.error("单据存在图片详情，不允许删除");
+                }
             }
         }
         return toAjax(tWarehouseCheckItemsService.deleteTWarehouseCheckItemsByIds(fIds));

ruoyi-warehouse/src/main/resources/mapper/warehouse/TWarehouseCheckMapper.xml

@@ -111,6 +111,7 @@
             <if test="fUpdateTime != null ">and f_update_time = #{fUpdateTime}</if>
             <if test="fDelFlag != null ">and f_del_flag = #{fDelFlag}</if>
         </where>
+        order by a.f_create_time desc
     </select>
 
     <select id="selectTWarehouseListInCheck" parameterType="TWarehouse" resultMap="TWarehouseResult">
@@ -184,4 +185,4 @@
         </foreach>
     </delete>
 
-</mapper>
+</mapper>