提交

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehouseBaseInfoController.java

@@ -4,6 +4,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehousePositionInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehousePositionInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,5 +56,16 @@ public class WarehouseBaseInfoController {
         return warehouseBaseInfoService.getWarehouse(id);
     }
 
+    /**
+     * 仓库管理页面列表
+     *
+     * @param compId
+     * @return
+     */
+    @GetMapping("/selectWarehouseViewinfo")
+    public List<WarehouseView> selectWarehouseViewinfo(String compId){
+        return warehouseBaseInfoService.selectWarehouseViewinfo(compId);
+    }
+
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWarehouseBaseInfoService.java

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
 import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
 
 import java.util.List;
 
@@ -39,5 +40,13 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
      */
     WarehouseBaseInfo getWarehouse(String id);
 
+    /**
+     * 仓库管理页面列表
+     *
+     * @param compId
+     * @return
+     */
+    List<WarehouseView> selectWarehouseViewinfo(String compId);
+
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehousePositionInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehousePositionStorageInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseView;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
@@ -33,6 +34,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     private IWarehousePositionInfoService warehousePositionInfoService;
     @Autowired
     private IWarehouseInOutInfoService warehouseInOutInfoService;
+    @Autowired
+    private IWarehousePositionStorageInfoService warehousePositionStorageInfoService;
 
     /**
      * 仓库管理页面列表
@@ -40,36 +43,82 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
      * @param compId
      * @return
      */
-//    @Override
-//    public List<WarehouseView> selectWarehouseViewinfo(String compId) {
-//        List<WarehouseView> warehouseViews = new ArrayList<>();
-//        // 查出所有仓库
-//        List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(new EntityWrapper<WarehouseBaseInfo>().eq("comp_id", compId));
-//        if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
-//            for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
-//                // 以库位为维度查询
-//                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-//                        .eq("comp_id", compId).eq("base_id", warehouseBaseInfo.getId()));
-//                if(!CollectionUtils.isEmpty(warehousePositionInfos)){
-//                    for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
-//                        WarehouseView warehouseView = new WarehouseView();
-//                        warehouseView.setWarehouseId(warehouseBaseInfo.getId());
-//                        warehouseView.setWarehouseName(warehouseBaseInfo.getWarehouseName());
-//                        warehouseView.setBinNumberId(warehousePositionInfo.getId());
-//                        warehouseView.setBinNumber(warehousePositionInfo.getBinNumber());
-//                        warehouseView.setCapacity(String.valueOf(warehousePositionInfo.getMaxStorage()));
-//                        // 查询出入库数量
-//                        List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-//                        .eq("position_id",warehousePositionInfo.getId()).eq("in_out_flag",));
-//
-//                    }
-//                }
-//            }
-//
-//        }
-//
-//
-//    }
+    @Override
+    public List<WarehouseView> selectWarehouseViewinfo(String compId) {
+        List<WarehouseView> warehouseViews = new ArrayList<>();
+        // 查出所有仓库
+        List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(new EntityWrapper<WarehouseBaseInfo>().eq("comp_id", compId));
+        if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+            for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                // 以库位为维度查询
+                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+                        .eq("comp_id", compId).eq("base_id", warehouseBaseInfo.getId()));
+                if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+                    for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
+                        WarehouseView warehouseView = new WarehouseView();
+                        warehouseView.setWarehouseId(warehouseBaseInfo.getId());
+                        warehouseView.setWarehouseName(warehouseBaseInfo.getWarehouseName());
+                        warehouseView.setBinNumberId(warehousePositionInfo.getId());
+                        warehouseView.setBinNumber(warehousePositionInfo.getBinNumber());
+                        warehouseView.setCapacity(String.valueOf(warehousePositionInfo.getMaxStorage()));
+                        // 定义应余量
+                        String storage = "";
+                        //定义入库
+                        String inNetWeight = "";
+                        // 查询入库数量
+                        List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
+                        if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                            for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                                // 查询入库数量
+                                List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                        .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "2")
+                                        .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                    Float netWeight = 0f;
+                                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                        netWeight = netWeight + warehouse.getNetWeight();
+                                    }
+                                    inNetWeight = inNetWeight + warehouseInOutInfo.getGoodsName() + "(" + netWeight + ")  ";
+                                }
+                                // 查询应余量
+                                WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
+                                        .eq("position_id", warehouseInOutInfo.getPositionId()).eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                storage = storage + warehousePositionStorageInfo.getGoodsName() + "(" + warehousePositionStorageInfo.getStorage() + ")";
+
+                            }
+                        }
+                        warehouseView.setStorage(storage);
+                        warehouseView.setInNetWeight(inNetWeight);
+                        //定义出库
+                        String outNetWeight = "";
+                        // 查询出库数量
+                        List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
+                        if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                            for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                                List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                        .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                    Float netWeight = 0f;
+                                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                        netWeight = netWeight + warehouse.getNetWeight();
+                                    }
+                                    outNetWeight = outNetWeight + warehouseInOutInfo.getGoodsName() + "(" + netWeight + ")  ";
+                                }
+                            }
+
+                        }
+                        warehouseView.setOutNetWeight(outNetWeight);
+                        warehouseViews.add(warehouseView);
+                    }
+                }
+            }
+
+        }
+
+        return warehouseViews;
+    }
 
     /**
      * 添加仓库

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -10,6 +10,7 @@
         left join contract_process_info p on m.id=p.contract_id
         WHERE
         m.comp_id = #{compId}
+        and m.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
                 AND m.status_flag != '3'
@@ -56,6 +57,7 @@
         left join contract_process_info p on m.id=p.contract_id
         WHERE
         m.comp_id = #{compId}
+        and m.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
                 AND m.status_flag != '3'