巡检优化

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.warehouse.check.domain.TWarehouseCheck;
 import com.ruoyi.warehouse.check.domain.TWarehouseCheckItems;
@@ -123,17 +124,19 @@ public class TWarehouseCheckController extends BaseController {
         }
 
         if (fId > 0) {
-            List<TWarehouseCheckItems> tWarehouseCheckItemsList = tWarehouseCheck.gettWarehouseCheckItemsList();
-            if (tWarehouseCheckItemsList.size() > 0) {
-                //有数据情况下
-                for (TWarehouseCheckItems tWarehouseCheckItems : tWarehouseCheckItemsList) {
-                    if (tWarehouseCheckItems.getfId() != null) {
-                        //更新数据
-                        itWarehouseCheckItemsService.updateTWarehouseCheckItems(tWarehouseCheckItems);
-                    } else {
-                        //新增数据
-                        tWarehouseCheckItems.setfCheckFid(fId);
-                        itWarehouseCheckItemsService.insertTWarehouseCheckItems(tWarehouseCheckItems);
+            if (tWarehouseCheck.gettWarehouseCheckItemsList() != null) {
+                List<TWarehouseCheckItems> tWarehouseCheckItemsList = tWarehouseCheck.gettWarehouseCheckItemsList();
+                if (tWarehouseCheckItemsList.size() > 0) {
+                    //有数据情况下
+                    for (TWarehouseCheckItems tWarehouseCheckItems : tWarehouseCheckItemsList) {
+                        if (tWarehouseCheckItems.getfId() != null) {
+                            //更新数据
+                            itWarehouseCheckItemsService.updateTWarehouseCheckItems(tWarehouseCheckItems);
+                        } else {
+                            //新增数据
+                            tWarehouseCheckItems.setfCheckFid(fId);
+                            itWarehouseCheckItemsService.insertTWarehouseCheckItems(tWarehouseCheckItems);
+                        }
                     }
                 }
             }
@@ -166,7 +169,10 @@ public class TWarehouseCheckController extends BaseController {
             tWarehouseCheckItemsDetailsQuery.setfCheckFid(checkId);
             List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList = tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
             if (tWarehouseCheckItemsDetailsList.size() > 0) {
-                return AjaxResult.error("已存在巡检记录，无法删除");
+                String photoUrl = tWarehouseCheckItemsDetailsList.get(0).getfPhotoUrl();
+                if (StringUtils.isNotEmpty(photoUrl) && !"[]".equals(photoUrl)) {
+                    return AjaxResult.error("单据存在图片详情，不允许删除");
+                }
             }
         }
         return toAjax(tWarehouseCheckService.deleteTWarehouseCheckByIds(fIds));