解决优化入库、出库、货转、调拨、通关确认

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

@@ -11,7 +11,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.reportManagement.domain.SingleAnalysisExcel;
 import com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel;
 import com.ruoyi.reportManagement.domain.TWhgenleg;
-import com.ruoyi.reportManagement.domain.vo.WhgenlegVO;
 import com.ruoyi.reportManagement.dto.TWarehousebill;
 import com.ruoyi.reportManagement.excel.Whgenleg;
 import com.ruoyi.reportManagement.service.ITWhgenlegService;
@@ -52,10 +51,8 @@ public class TWhgenlegController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:whgenleg:list')")
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/detailsList")
-    public TableDataInfo detailsList(TWhgenleg tWhgenleg) {
-        startPage();
-        List<WhgenlegVO> list = tWhgenlegService.selectWhgenlegDetailsList(tWhgenleg);
-        return getDataTable(list);
+    public AjaxResult detailsList(TWhgenleg tWhgenleg) {
+        return tWhgenlegService.selectWhgenlegDetailsList(tWhgenleg);
     }
 
     /**
@@ -173,7 +170,7 @@ public class TWhgenlegController extends BaseController {
     }
 
     /**
-     *  统计图  商品 库存 结余 毛重 / 总库容
+     * 统计图  商品 库存 结余 毛重 / 总库容
      */
     // @PreAuthorize("@ss.hasPermi('warehouseBusiness:whgenleg:list')")
     @GetMapping("/goodsList/{fId}")
@@ -182,19 +179,19 @@ public class TWhgenlegController extends BaseController {
     }
 
     /**
-     *  统计图  仓库 毛重 / 库容
+     * 统计图  仓库 毛重 / 库容
      */
     // @PreAuthorize("@ss.hasPermi('warehouseBusiness:whgenleg:list')")
     @GetMapping("/wareHouseList")
     public TableDataInfo wareHouseList() {
         startPage();
-       // List<Map<String, Object>> list = tWhgenlegService.selectWareHouseList();
+        // List<Map<String, Object>> list = tWhgenlegService.selectWareHouseList();
         List<Map<String, Object>> list = tWhgenlegService.selectWareHouseLists();
         return getDataTable(list);
     }
 
     /**
-     *  统计图  客户   毛重 / 库容
+     * 统计图  客户   毛重 / 库容
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:whgenleg:list')")
     @GetMapping("/corpsList/{fId}")
@@ -203,7 +200,7 @@ public class TWhgenlegController extends BaseController {
     }
 
     /**
-     *  当天 往前推一周  每日入库数量
+     * 当天 往前推一周  每日入库数量
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:whgenleg:list')")
     @GetMapping("/dateFQtyblcList")
@@ -214,7 +211,7 @@ public class TWhgenlegController extends BaseController {
     }
 
     /**
-     *  明细帐
+     * 明细帐
      */
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/detailed/list")
@@ -223,21 +220,23 @@ public class TWhgenlegController extends BaseController {
         List<Map<String, Object>> list = tWhgenlegService.selectdetailedList(tWarehousebill);
         return getDataTable(list);
     }
+
     /**
-     *  根据客户id或者提单号查询库存不为0的仓库
+     * 根据客户id或者提单号查询库存不为0的仓库
      */
     //@PreAuthorize("@ss.hasPermi('warehouseBusiness:whgenleg:list')")
     @GetMapping("/getWarehouse")
     public AjaxResult getWarehouse(TWhgenleg tWhgenleg) {
-        if (tWhgenleg.getfCorpid() == null){
+        if (tWhgenleg.getfCorpid() == null) {
             return AjaxResult.error("请选择客户后再选择仓库");
         }
-        if (StringUtils.isNull(tWhgenleg.getfMblno())){
+        if (StringUtils.isNull(tWhgenleg.getfMblno())) {
             return AjaxResult.error("请输入提单号后再选择仓库");
         }
         List<Map<String, Object>> list = tWhgenlegService.getWarehouse(tWhgenleg);
         return AjaxResult.success(list);
     }
+
     /**
      * 网站查询库存总账列表
      */
@@ -248,6 +247,7 @@ public class TWhgenlegController extends BaseController {
         List<Map<String, Object>> list = tWhgenlegService.selectInventoryMapList(tWhgenleg);
         return getDataTable(list);
     }
+
     /**
      * app查询库存总账列表
      */
@@ -259,6 +259,4 @@ public class TWhgenlegController extends BaseController {
         return getDataTable(list);
     }
 
-
-
 }

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

@@ -1,10 +1,10 @@
 package com.ruoyi.reportManagement.service;
 
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.reportManagement.domain.SingleAnalysisExcel;
 import com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel;
 import com.ruoyi.reportManagement.domain.TWhgenleg;
-import com.ruoyi.reportManagement.domain.vo.WhgenlegVO;
 import com.ruoyi.reportManagement.dto.TWarehousebill;
 import com.ruoyi.reportManagement.excel.Whgenleg;
 
@@ -83,13 +83,15 @@ public interface ITWhgenlegService {
     public int deleteTWhgenlegById(Long fAccyear);
 
     /**
-     *   商品 库存总量
+     * 商品 库存总量
+     *
      * @return
      */
     Map<String, Object> selectGoodsList(Long fId);
 
     /**
-     *  仓库 库存总量
+     * 仓库 库存总量
+     *
      * @return
      */
     List<Map<String, Object>> selectWareHouseList();
@@ -97,13 +99,15 @@ public interface ITWhgenlegService {
     List<Map<String, Object>> selectWareHouseLists();
 
     /**
-     *  客户 库存总量
+     * 客户 库存总量
+     *
      * @return
      */
     Map<String, Object> selectCorpsList(Long fId);
 
     /**
-     *  一周库存总量
+     * 一周库存总量
+     *
      * @return
      */
     List<Map<String, Object>> selectDateFQtyblcListList();
@@ -115,20 +119,24 @@ public interface ITWhgenlegService {
     List<Map<String, Object>> selectdetailedList(TWarehousebill tWarehousebill);
 
     /**
-     *  查询单票分析信息
+     * 查询单票分析信息
+     *
      * @param singleAnalysisExcel
      * @return
      */
     public List<SingleAnalysisExcel> selectSingleAnalysis(SingleAnalysisExcel singleAnalysisExcel);
 
     /**
-     *  查询单票分析费用信息
+     * 查询单票分析费用信息
+     *
      * @param singleAnalysisExcel
      * @return
      */
     public List<SingleAnalysisFeesExcel> selectSingleAnalysisFees(SingleAnalysisExcel singleAnalysisExcel);
+
     /**
      * 根据客户id或者提单号查询库存不为0的仓库
+     *
      * @param tWhgenleg
      * @return
      */
@@ -136,15 +144,17 @@ public interface ITWhgenlegService {
 
     /**
      * app查询库存总账
+     *
      * @param tWhgenleg
      * @return
      */
-    public  List<Map<String, Object>> appWhGenLegList(TWhgenleg tWhgenleg);
+    public List<Map<String, Object>> appWhGenLegList(TWhgenleg tWhgenleg);
 
     /**
-     *  查询库存总帐详细信息
+     * 查询库存总帐详细信息
+     *
      * @param tWhgenleg
      * @return
      */
-    List<WhgenlegVO> selectWhgenlegDetailsList(TWhgenleg tWhgenleg);
+    AjaxResult selectWhgenlegDetailsList(TWhgenleg tWhgenleg);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.ruoyi.basicData.domain.TCustomerContact;
 import com.ruoyi.basicData.mapper.TCustomerContactMapper;
 import com.ruoyi.basicData.mapper.TWarehouseMapper;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.common.exception.WarehouseException;
@@ -107,7 +108,7 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
      * @return 库存总账集合
      */
     @Override
-    public List<WhgenlegVO> selectWhgenlegDetailsList(TWhgenleg tWhgenleg) {
+    public AjaxResult selectWhgenlegDetailsList(TWhgenleg tWhgenleg) {
         if (StringUtils.isNotNull(tWhgenleg.getfWarehouseLocationid())) {
             // 获取仓库信息
             TWarehouse tWarehouse = tWarehouseMapper.selectTWarehouseById(tWhgenleg.getfWarehouseLocationid());
@@ -135,9 +136,9 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
                 whgenlegVO.setGrossweight(value.stream().map(WhgenlegVO::getGrossweight).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
                 legVoList.add(whgenlegVO);
             });
-            return legVoList;
+            return AjaxResult.success(legVoList);
         }
-        return whgenlegVOList;
+        return AjaxResult.success(whgenlegVOList);
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/component/impl/QueryWhgenlegServiceImpl.java

@@ -46,6 +46,8 @@ public class QueryWhgenlegServiceImpl implements QueryWhgenlegService {
         if (WarehouseTypeEnum.JUDGE_BOX.getType().equals(ifCntrno)) {
             whgenleg.setfCntrno(item.getfCntrno());
         }
+        // 业务类型详情
+        whgenleg.setfMarks(item.getfMarks());
         // 货物品名
         whgenleg.setfGoodsid(item.getfGoodsid());
         if (WarehouseTypeEnum.SJRK.getType().equals(warehouseBills.getfBilltype())) {
@@ -63,10 +65,7 @@ public class QueryWhgenlegServiceImpl implements QueryWhgenlegService {
         if (WarehouseTypeEnum.HWTG.getType().equals(warehouseBills.getfBilltype())) {
             cargoClearance(whgenleg, warehouseBills, item, operate, FIRST);
         }
-
-        TWhgenleg tWhgenleg = tWhgenlegMapper.selectTWhgenleg(whgenleg);
-
-        return tWhgenleg;
+        return tWhgenlegMapper.selectTWhgenleg(whgenleg);
     }
 
     /**
@@ -122,8 +121,6 @@ public class QueryWhgenlegServiceImpl implements QueryWhgenlegService {
         whgenleg.setfTrademodeid(warehouseBills.getfTrademodeid());
         // 业务日期
         whgenleg.setfBsdate(DateUtils.dateConversionMin(item.getfOriginalbilldate()));
-        // 业务类型详情
-        whgenleg.setfMarks(item.getfMarks());
         // 库区
         whgenleg.setfWarehouseLocationid(item.getfWarehouselocid());
     }