2024年10月11日17:24:45

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

@@ -7,11 +7,9 @@ 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;
-import com.ruoyi.warehouse.check.domain.TWarehouseCheckItemsDetails;
 import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsDetailsService;
 import com.ruoyi.warehouse.check.service.ITWarehouseCheckItemsService;
 import com.ruoyi.warehouse.check.service.ITWarehouseCheckService;
@@ -188,14 +186,11 @@ public class TWarehouseCheckController extends BaseController {
     @DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds) {
         for (Long checkId : fIds) {
-            TWarehouseCheckItemsDetails tWarehouseCheckItemsDetailsQuery = new TWarehouseCheckItemsDetails();
+            TWarehouseCheckItems tWarehouseCheckItemsDetailsQuery = new TWarehouseCheckItems();
             tWarehouseCheckItemsDetailsQuery.setfCheckFid(checkId);
-            List<TWarehouseCheckItemsDetails> tWarehouseCheckItemsDetailsList = tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetailsQuery);
-            if (tWarehouseCheckItemsDetailsList.size() > 0) {
-                String photoUrl = tWarehouseCheckItemsDetailsList.get(0).getfPhotoUrl();
-                if (StringUtils.isNotEmpty(photoUrl) && !"[]".equals(photoUrl)) {
-                    return AjaxResult.error("单据存在图片详情，不允许删除");
-                }
+            List<TWarehouseCheckItems> tWarehouseCheckItemsList = itWarehouseCheckItemsService.selectTWarehouseCheckItemsList(tWarehouseCheckItemsDetailsQuery);
+            if (!tWarehouseCheckItemsList.isEmpty()) {
+                return AjaxResult.error("存在明细，不允许删除");
             }
         }
         return toAjax(tWarehouseCheckService.deleteTWarehouseCheckByIds(fIds));

ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseMapper.xml

@@ -87,6 +87,7 @@
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
             <if test="landNature != null  and landNature != ''">and land_nature = #{landNature}</if>
             <if test="supervise != null and supervise != ''">and supervise = #{supervise}</if>
+            <if test="approvalStatus != null and approvalStatus != ''">and approval_status = #{approvalStatus}</if>
             <if test="fProperties != null and fProperties != ''">and f_properties like concat('%', #{fProperties},
                 '%')
             </if>
@@ -143,6 +144,7 @@
         <include refid="selectTWarehouseVo"/>
         <where>
             parent_id = 100
+            <if test="approvalStatus != null and approvalStatus != ''">and approval_status = #{approvalStatus}</if>
         </where>
     </select>
     <select id="appGetWarehouseList" resultType="map">