APP查询库存总账 查询巡检信息

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

@@ -54,7 +54,7 @@ public class TWarehouseCheckController extends BaseController
     /**
      * 查询巡检check列表
      */
-    @PreAuthorize("@ss.hasPermi('warehouse:check:list')")
+    //@PreAuthorize("@ss.hasPermi('warehouse:check:list')")
     @GetMapping("/selectTWarehouseListInCheck")
     public TableDataInfo list()
     {

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

@@ -130,4 +130,14 @@ public class TWarehouseCheckItemsController extends BaseController
         }
         return toAjax(tWarehouseCheckItemsService.deleteTWarehouseCheckItemsByIds(fIds));
     }
+    /**
+     * 查询巡检check-item列表
+     */
+    @GetMapping("/appListByUser")
+    public TableDataInfo appListByUser(TWarehouseCheckItems tWarehouseCheckItems)
+    {
+        startPage();
+        List<TWarehouseCheckItems> list = tWarehouseCheckItemsService.appListByUser(tWarehouseCheckItems);
+        return getDataTable(list);
+    }
 }

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

@@ -118,4 +118,14 @@ public class TWarehouseCheckItemsDetailsController extends BaseController
     {
         return toAjax(tWarehouseCheckItemsDetailsService.deleteTWarehouseCheckItemsDetailsByIds(fIds));
     }
+    /**
+     * APP查询巡检check-items-details列表
+     */
+    @GetMapping("/appList")
+    public TableDataInfo appList(TWarehouseCheckItemsDetails tWarehouseCheckItemsDetails)
+    {
+        startPage();
+        List<TWarehouseCheckItemsDetails> list = tWarehouseCheckItemsDetailsService.selectTWarehouseCheckItemsDetailsList(tWarehouseCheckItemsDetails);
+        return getDataTable(list);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/reportManagement/TWhgenlegController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.warehouse.reportManagement;
 
+import com.ruoyi.basicData.service.ITCorpsService;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -248,6 +249,16 @@ public class TWhgenlegController extends BaseController {
         List<Map<String, Object>> list = tWhgenlegService.selectInventoryMapList(tWhgenleg);
         return getDataTable(list);
     }
+    /**
+     * app查询库存总账列表
+     */
+    //@DataScope(deptAlias = "d", userAlias = "u")
+    @GetMapping("/appWhGenLegList")
+    public TableDataInfo appWhGenLegList(TWhgenleg tWhgenleg) {
+        startPage();
+        List<Map<String, Object>> list = tWhgenlegService.appWhGenLegList(tWhgenleg);
+        return getDataTable(list);
+    }
 
 
 

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/ITWhgenlegService.java

@@ -132,4 +132,11 @@ public interface ITWhgenlegService {
      * @return
      */
     public List<Map<String, Object>> getWarehouse(TWhgenleg tWhgenleg);
+
+    /**
+     * app查询库存总账
+     * @param tWhgenleg
+     * @return
+     */
+    public  List<Map<String, Object>> appWhGenLegList(TWhgenleg tWhgenleg);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -1,9 +1,14 @@
 package com.ruoyi.reportManagement.service.impl;
 
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.ruoyi.basicData.domain.TCustomerContact;
+import com.ruoyi.basicData.mapper.TCorpsMapper;
+import com.ruoyi.basicData.mapper.TCustomerContactMapper;
 import com.ruoyi.basicData.mapper.TWarehouseMapper;
 import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.reportManagement.domain.SingleAnalysisExcel;
 import com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel;
@@ -38,6 +43,8 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
 
     @Autowired
     private TWarehouseMapper  tWarehouseMapper;
+    @Autowired
+    private TCustomerContactMapper customerContactMapper;
 
     /**
      * 查询库存总账
@@ -417,6 +424,28 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
         return tWhgenlegMapper.getWarehouse(tWhgenleg);
     }
 
+    @Override
+    public List<Map<String, Object>> appWhGenLegList(TWhgenleg tWhgenleg) {
+        List<Map<String,Object>> list = new ArrayList<>();
+        TCustomerContact customerContact = new TCustomerContact();
+        customerContact.setfTel(SecurityUtils.getLoginUser().getUser().getPhonenumber());
+        List<TCustomerContact> tCustomerContacts = customerContactMapper.selectTCustomerContactList(customerContact);
+        if (CollectionUtils.isNotEmpty(tCustomerContacts)){
+            tWhgenleg.setfCorpid(tCustomerContacts.get(0).getfPid());
+            if(StringUtils.isNotNull(tWhgenleg.getfWarehouseLocationid())){
+                // 获取仓库信息
+                TWarehouse tWarehouse =  tWarehouseMapper.selectTWarehouseById(tWhgenleg.getfWarehouseLocationid());
+                if(tWarehouse.getfLocation()==1){
+                    tWhgenleg.setfLocation(1L);
+                }else {
+                    tWhgenleg.setfLocation(0L);
+                }
+            }
+            list = tWhgenlegMapper.selectInventoryMapList(tWhgenleg);
+        }
+        return list;
+    }
+
     /**
      *
      * @param fOriginalbilldate 根据该字段进行合并

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/service/ITWarehouseCheckItemsService.java

@@ -58,4 +58,11 @@ public interface ITWarehouseCheckItemsService
      * @return 结果
      */
     public int deleteTWarehouseCheckItemsById(Long fId);
+
+    /**
+     * app查询巡检模块
+     * @param tWarehouseCheckItems
+     * @return
+     */
+    public List<TWarehouseCheckItems> appListByUser(TWarehouseCheckItems tWarehouseCheckItems);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouse/check/service/impl/TWarehouseCheckItemsServiceImpl.java

@@ -97,4 +97,9 @@ public class TWarehouseCheckItemsServiceImpl implements ITWarehouseCheckItemsSer
     {
         return tWarehouseCheckItemsMapper.deleteTWarehouseCheckItemsById(fId);
     }
+
+    @Override
+    public List<TWarehouseCheckItems> appListByUser(TWarehouseCheckItems tWarehouseCheckItems) {
+        return tWarehouseCheckItemsMapper.selectTWarehouseCheckItemsList(tWarehouseCheckItems);
+    }
 }