修改

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

@@ -45,6 +45,7 @@ public class CostManagementInfoServiceImpl extends ServiceImpl<CostManagementInf
     public Page<CostManagementInfo> selectCostManagementInfo(CostManagementInfo costManagementInfo) {
         Wrapper<CostManagementInfo> costManagementInfoWrapper = new EntityWrapper<>();
         costManagementInfoWrapper.eq("warehouse_type", costManagementInfo.getWarehouseType());
+        costManagementInfoWrapper.orderBy("warehouse_name");
         if (costManagementInfo.getWarehouseId()!=null&&!costManagementInfo.getWarehouseId().isEmpty()){
             costManagementInfoWrapper.eq("warehouse_id", costManagementInfo.getWarehouseId());
         }

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

@@ -97,214 +97,213 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             warehouseBaseInfoWrapper.like(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, "%" + warehouseName + "%");
         }
         //PC端用
-        if(!StringUtils.isEmpty(warehouseType)){
-            if(!personCharge.equals("13333333333")){
-                warehouseBaseInfoWrapper.andNew().eq("person_phone", personCharge).or()
-                        .like("other_person_charge", personCharge);
-
-            }
+        if(!StringUtils.isEmpty(warehouseType)) {
             warehouseBaseInfoWrapper.eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_TYPE, warehouseType);
-            // 查出所有仓库
-            List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(warehouseBaseInfoWrapper);
-            if (NumberConstant.CONSTANT1.equals(warehouseType)) {
-                if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
-                    for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
-                        // 以库位为维度查询
-                        List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                                .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()));
-                                warehouseView.setRemark(warehousePositionInfo.getRemark());
-                                // 定义待完成数量
-                                int count = 0;
-                                // 定义应余量
-                                String storage = "";
-                                //定义入库
-                                String inNetWeight = "";
-                                // 子集合
-                                List<WarehouseNumView> warehouseNumViewList = new ArrayList<>();
-                                // 查询入库数量
-                                List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                        .eq("position_id", warehousePositionInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
-                                if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
-                                    for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                                        WarehouseNumView warehouseNumView = new WarehouseNumView();
-                                        // 查询入库数量
-                                        List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                                .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "2")
-                                                .eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+        }
+        if(!personCharge.equals("13333333333")){
+            warehouseBaseInfoWrapper.andNew().eq("person_phone", personCharge).or()
+                    .like("other_person_charge", personCharge);
+
+        }
+        // 查出所有仓库
+        List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(warehouseBaseInfoWrapper);
+        if (NumberConstant.CONSTANT1.equals(warehouseType)) {
+            if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+                for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                    // 以库位为维度查询
+                    List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+                            .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()));
+                            warehouseView.setRemark(warehousePositionInfo.getRemark());
+                            // 定义待完成数量
+                            int count = 0;
+                            // 定义应余量
+                            String storage = "";
+                            //定义入库
+                            String inNetWeight = "";
+                            // 子集合
+                            List<WarehouseNumView> warehouseNumViewList = new ArrayList<>();
+                            // 查询入库数量
+                            List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                    .eq("position_id", warehousePositionInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
+                            if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                                for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                                    WarehouseNumView warehouseNumView = new WarehouseNumView();
+                                    // 查询入库数量
+                                    List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                            .eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "2")
+                                            .eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
 
-                                        if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
-                                            Float netWeight = 0f;
-                                            for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                                                //潮粮累计纯重，干粮累计净重
-                                                netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
-                                            }
-                                            warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
-                                            warehouseNumView.setInNetWeight(String.valueOf(netWeight));
-                                            if (StringUtils.isEmpty(inNetWeight)) {
-                                                inNetWeight = "0";
-                                            }
-                                            inNetWeight = String.valueOf(Float.valueOf(inNetWeight) + netWeight);
+                                    if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                        Float netWeight = 0f;
+                                        for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                            //潮粮累计纯重，干粮累计净重
+                                            netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
                                         }
-                                        // 查询应余量
-                                        WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
-                                                .eq("position_id", warehouseInOutInfo.getPositionId()).eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
-                                        if (warehousePositionStorageInfo != null) {
-                                            storage = String.valueOf(warehousePositionStorageInfo.getStorage());
-                                        } else {
-                                            storage = "";
+                                        warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
+                                        warehouseNumView.setInNetWeight(String.valueOf(netWeight));
+                                        if (StringUtils.isEmpty(inNetWeight)) {
+                                            inNetWeight = "0";
                                         }
-                                        warehouseNumView.setStorage(storage);
-                                        warehouseNumViewList.add(warehouseNumView);
+                                        inNetWeight = String.valueOf(Float.valueOf(inNetWeight) + netWeight);
                                     }
-
+                                    // 查询应余量
+                                    WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
+                                            .eq("position_id", warehouseInOutInfo.getPositionId()).eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                    if (warehousePositionStorageInfo != null) {
+                                        storage = String.valueOf(warehousePositionStorageInfo.getStorage());
+                                    } else {
+                                        storage = "";
+                                    }
+                                    warehouseNumView.setStorage(storage);
+                                    warehouseNumViewList.add(warehouseNumView);
                                 }
 
-                                //定义出库
-                                String outNetWeight = "";
-                                // 查询出库数量
-                                List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                        .eq("position_id", warehousePositionInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
-                                if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
-                                    for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
-                                        Float netWeight = 0f;
-                                        outNetWeight = "0";
-                                        List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                                .eq("status_flag", "3").eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
-                                        if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
-                                            for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                                                //潮粮累计纯重，干粮累计净重
-                                                netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
-                                            }
-                                            if (StringUtils.isEmpty(outNetWeight)) {
-                                                outNetWeight = "0";
-                                            }
-                                            outNetWeight = String.valueOf(Float.valueOf(outNetWeight) + netWeight);
-                                        }
-                                        for (WarehouseNumView warehouseNumView : warehouseNumViewList) {
-                                            if (warehouseNumView.getGoodsName().equals(warehouseInOutInfo.getGoodsName())) {
-                                                warehouseNumView.setOutNetWeight(outNetWeight);
-                                            }
+                            }
 
+                            //定义出库
+                            String outNetWeight = "";
+                            // 查询出库数量
+                            List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                    .eq("position_id", warehousePositionInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
+                            if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
+                                for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
+                                    Float netWeight = 0f;
+                                    outNetWeight = "0";
+                                    List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                            .eq("status_flag", "3").eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                    if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                        for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                            //潮粮累计纯重，干粮累计净重
+                                            netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
                                         }
+                                        if (StringUtils.isEmpty(outNetWeight)) {
+                                            outNetWeight = "0";
+                                        }
+                                        outNetWeight = String.valueOf(Float.valueOf(outNetWeight) + netWeight);
                                     }
+                                    for (WarehouseNumView warehouseNumView : warehouseNumViewList) {
+                                        if (warehouseNumView.getGoodsName().equals(warehouseInOutInfo.getGoodsName())) {
+                                            warehouseNumView.setOutNetWeight(outNetWeight);
+                                        }
 
+                                    }
                                 }
-                                // 查询入库数量
-                                count = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
-                                        .eq("position_id", warehousePositionInfo.getId())
-                                        .eq("status_flag", "1"));
-                                warehouseView.setNumber(count);
-                                warehouseView.setWarehouseNumViewList(warehouseNumViewList);
-                                warehouseViews.add(warehouseView);
 
                             }
+                            // 查询入库数量
+                            count = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
+                                    .eq("position_id", warehousePositionInfo.getId())
+                                    .eq("status_flag", "1"));
+                            warehouseView.setNumber(count);
+                            warehouseView.setWarehouseNumViewList(warehouseNumViewList);
+                            warehouseViews.add(warehouseView);
+
                         }
                     }
-
                 }
 
-            } else {
-                if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
-                    for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
-                        WarehouseView warehouseView = new WarehouseView();
-                        warehouseView.setWarehouseId(warehouseBaseInfo.getId());
-                        warehouseView.setCreateType(warehouseBaseInfo.getCreateType());
-                        warehouseView.setClearStatus(warehouseBaseInfo.getClearStatus());
-                        warehouseView.setClearStatusFlag(warehouseBaseInfo.getClearStatusFlag());
-                        warehouseView.setWarehouseName(warehouseBaseInfo.getWarehouseName());
-                        warehouseView.setUpdateDate(warehouseBaseInfo.getUpdateDate());
-                        warehouseView.setAddress(warehouseBaseInfo.getWarehousePrivate() + warehouseBaseInfo.getWarehouseCity() + warehouseBaseInfo.getWarehouseArea() + warehouseBaseInfo.getDetailedAddress());
-                        // 定义待完成数量
-                        int count = 0;
-                        //定义入库
-                        String inNetWeight = "";
-                        // 子集合
-                        List<WarehouseNumView> warehouseNumViewList = new ArrayList<>();
-                        // 查询入库数量
-                        List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                .eq("base_id", warehouseBaseInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
-                        if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
-                            for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                                WarehouseNumView warehouseNumView = new WarehouseNumView();
-                                // 查询入库数量
-                                List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                        .eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "2")
-                                        .eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+            }
 
-                                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
-                                    Float netWeight = 0f;
-                                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                                        //潮粮累计纯重，干粮累计净重
-                                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
-                                    }
-                                    warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
-                                    warehouseNumView.setInNetWeight(String.valueOf(netWeight));
-                                    if (StringUtils.isEmpty(inNetWeight)) {
-                                        inNetWeight = "0";
-                                    }
-                                    inNetWeight = String.valueOf(Float.valueOf(inNetWeight) + netWeight);
+        } else {
+            if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+                for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                    WarehouseView warehouseView = new WarehouseView();
+                    warehouseView.setWarehouseId(warehouseBaseInfo.getId());
+                    warehouseView.setCreateType(warehouseBaseInfo.getCreateType());
+                    warehouseView.setClearStatus(warehouseBaseInfo.getClearStatus());
+                    warehouseView.setClearStatusFlag(warehouseBaseInfo.getClearStatusFlag());
+                    warehouseView.setWarehouseName(warehouseBaseInfo.getWarehouseName());
+                    warehouseView.setUpdateDate(warehouseBaseInfo.getUpdateDate());
+                    warehouseView.setAddress(warehouseBaseInfo.getWarehousePrivate() + warehouseBaseInfo.getWarehouseCity() + warehouseBaseInfo.getWarehouseArea() + warehouseBaseInfo.getDetailedAddress());
+                    // 定义待完成数量
+                    int count = 0;
+                    //定义入库
+                    String inNetWeight = "";
+                    // 子集合
+                    List<WarehouseNumView> warehouseNumViewList = new ArrayList<>();
+                    // 查询入库数量
+                    List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                            .eq("base_id", warehouseBaseInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "2").groupBy("goods_name_key").orderBy("goods_name_key"));
+                    if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
+                        for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
+                            WarehouseNumView warehouseNumView = new WarehouseNumView();
+                            // 查询入库数量
+                            List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                    .eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "2")
+                                    .eq("status_flag", "3").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+
+                            if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                Float netWeight = 0f;
+                                for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                    //潮粮累计纯重，干粮累计净重
+                                    netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
+                                }
+                                warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
+                                warehouseNumView.setInNetWeight(String.valueOf(netWeight));
+                                if (StringUtils.isEmpty(inNetWeight)) {
+                                    inNetWeight = "0";
                                 }
-                                warehouseNumViewList.add(warehouseNumView);
+                                inNetWeight = String.valueOf(Float.valueOf(inNetWeight) + netWeight);
                             }
-
+                            warehouseNumViewList.add(warehouseNumView);
                         }
 
-                        //定义出库
-                        String outNetWeight = "";
-                        // 查询出库数量
-                        List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                .eq("base_id", warehouseBaseInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
-                        if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
-                            for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
-                                Float netWeight = 0f;
-                                outNetWeight = "0";
-                                List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                        .eq("status_flag", "3").eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
-                                if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
-                                    for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                                        //潮粮累计纯重，干粮累计净重
-                                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
-                                    }
-                                    if (StringUtils.isEmpty(outNetWeight)) {
-                                        outNetWeight = "0";
-                                    }
-                                    outNetWeight = String.valueOf(Float.valueOf(outNetWeight) + netWeight);
-                                }
-                                for (WarehouseNumView warehouseNumView : warehouseNumViewList) {
-                                    if (warehouseNumView.getGoodsName().equals(warehouseInOutInfo.getGoodsName())) {
-                                        warehouseNumView.setOutNetWeight(outNetWeight);
-                                    }
+                    }
 
+                    //定义出库
+                    String outNetWeight = "";
+                    // 查询出库数量
+                    List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                            .eq("base_id", warehouseBaseInfo.getId()).eq("status_flag", "3").eq("in_out_flag", "1").groupBy("goods_name_key").orderBy("goods_name_key"));
+                    if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
+                        for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
+                            Float netWeight = 0f;
+                            outNetWeight = "0";
+                            List<WarehouseInOutInfo> warehouseInOutInfoAllList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                    .eq("status_flag", "3").eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                            if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
+                                for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
+                                    //潮粮累计纯重，干粮累计净重
+                                    netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
                                 }
+                                if (StringUtils.isEmpty(outNetWeight)) {
+                                    outNetWeight = "0";
+                                }
+                                outNetWeight = String.valueOf(Float.valueOf(outNetWeight) + netWeight);
                             }
+                            for (WarehouseNumView warehouseNumView : warehouseNumViewList) {
+                                if (warehouseNumView.getGoodsName().equals(warehouseInOutInfo.getGoodsName())) {
+                                    warehouseNumView.setOutNetWeight(outNetWeight);
+                                }
 
+                            }
                         }
-                        // 查询入库数量
-                        count = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
-                                .eq("base_id", warehouseBaseInfo.getId())
-                                .eq("status_flag", "1"));
-                        warehouseView.setNumber(count);
-                        // 定义待完成数量
-                        int outCount = 0;
-                        outCount = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
-                                .eq("base_id", warehouseBaseInfo.getId())
-                                .eq("in_out_flag", "1")
-                                .eq("status_flag", "1"));
-                        warehouseView.setOutNumber(outCount);
-                        warehouseView.setWarehouseNumViewList(warehouseNumViewList);
-                        warehouseViews.add(warehouseView);
-                       
+
                     }
-                }
+                    // 查询入库数量
+                    count = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
+                            .eq("base_id", warehouseBaseInfo.getId())
+                            .eq("status_flag", "1"));
+                    warehouseView.setNumber(count);
+                    // 定义待完成数量
+                    int outCount = 0;
+                    outCount = warehouseInOutInfoService.selectCount(new EntityWrapper<WarehouseInOutInfo>()
+                            .eq("base_id", warehouseBaseInfo.getId())
+                            .eq("in_out_flag", "1")
+                            .eq("status_flag", "1"));
+                    warehouseView.setOutNumber(outCount);
+                    warehouseView.setWarehouseNumViewList(warehouseNumViewList);
+                    warehouseViews.add(warehouseView);
 
+                }
             }
         }
         return warehouseViews;

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

@@ -780,7 +780,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             // 查询货物库存量
                             WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
                                     .eq("position_id", warehouseInOutInfo.getPositionId())
-                                    .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey())
+                                    .eq("goods_name", warehouseInOutInfo.getGoodsName())
                                     .eq("delete_flag", "0"));
                             // 判断是否有货
                             if (warehousePositionStorageInfo != null) {
@@ -855,7 +855,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         for (int i = 0; i < warehousePositionInfos.size(); i++) {
                             List<WarehousePositionStorageInfo> warehousePositionStorageInfos = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
                                     .eq("position_id", warehousePositionInfos.get(i).getId())
-                                    .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                    .eq("goods_name", warehouseInOutInfo.getGoodsName()));
                             for (int j = 0; j < warehousePositionStorageInfos.size(); j++) {
                                 net = net + warehousePositionStorageInfos.get(j).getStorage();
                             }
@@ -892,7 +892,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             // 查询货物库存量
                             WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
                                     .eq("position_id", warehouseInOutInfo.getPositionId())
-                                    .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey())
+                                    .eq("goods_name", warehouseInOutInfo.getGoodsName())
                                     .eq("delete_flag", "0"));
                             // 判断是否有货
                             if (warehousePositionStorageInfo != null) {
@@ -997,7 +997,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             // 查询货物库存量
                             WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
                                     .eq("position_id", warehouseInOutInfo.getPositionId())
-                                    .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey())
+                                    .eq("goods_name", warehouseInOutInfo.getGoodsName())
                                     .eq("delete_flag", "0"));
                             // 判断是否有货
                             if (warehousePositionStorageInfo != null) {
@@ -1166,7 +1166,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         String inNetWeight = "";
                         // 查询入库量
                         List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
-                                .eq("base_id", warehouseInOutInfo.getBaseId()).eq("in_out_flag", "2").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                .eq("base_id", warehouseInOutInfo.getBaseId()).eq("in_out_flag", "2").eq("goods_name", warehouseInOutInfo.getGoodsName()));
                         if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                             for (WarehouseInOutInfo warehouseInOutInfos : warehouseInOutInfoList) {
                                 if (StringUtils.isEmpty(inNetWeight)) {
@@ -1180,7 +1180,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         // 查询出库量
                         List<WarehouseInOutInfo> warehouseInOutInfo1 = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                                 .eq("base_id", warehouseInOutInfo.getBaseId()).eq("in_out_flag", "1")
-                                .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                .eq("goods_name", warehouseInOutInfo.getGoodsName()));
                         //有出库记录
                         if (!CollectionUtils.isEmpty(warehouseInOutInfo1)) {
                             for (WarehouseInOutInfo warehouseInOutInfos : warehouseInOutInfo1) {

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

@@ -25,6 +25,10 @@
             <if test="searchType == 6">
                 AND amount_ed_payable=amount_ing_payable
             </if>
+            <if test="searchType == 7">
+                AND status='已通过'
+                or status='部分付款'
+            </if>
         </if>
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
@@ -64,7 +68,7 @@
             )
         </if>
     </select>
-    <!-- 获得采购入库统计列表 -->
+    <!-- 获得付款管理列表 -->
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement">
         SELECT
@@ -117,10 +121,14 @@
                 AND actual_collectionment-amount_ed_collectionable=0
             </if>
             <if test="searchType == 5">
-                AND status != '全部付款'
+                AND amount_ing_payable-amount_ed_payable>0
             </if>
             <if test="searchType == 6">
-                AND status = '全部付款'
+                AND amount_ed_payable=amount_ing_payable
+            </if>
+            <if test="searchType == 7">
+                AND status='已通过'
+                or status='部分付款'
             </if>
         </if>
         <if test="managementType != null and managementType != ''">