Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -3,13 +3,11 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
-import com.yh.saas.plugin.yiliangyiyun.entity.CostManagementInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CustomerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.WeightedDetails;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CostManagementInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.ICostManagementInfoService;
@@ -45,7 +43,8 @@ public class CostManagementInfoServiceImpl extends ServiceImpl<CostManagementInf
     @Override
     public List<CostManagementInfo> selectCostManagementInfo(CostManagementInfo costManagementInfo) {
         Wrapper<CostManagementInfo> costManagementInfoWrapper = new EntityWrapper<>();
-        costManagementInfoWrapper.eq("warehouse_type", costManagementInfo.getWarehouseType());
+        costManagementInfoWrapper.eq("warehouse_type", costManagementInfo.getWarehouseType())
+                                 .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId());
         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/PaymentManagementServiceImpl.java

@@ -382,6 +382,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         weightedDetailsService.insert(weightedDetails);
         // 修改成本信息表
         CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", weightedDetails.getWarehouseId())
+                .eq("comp_id",  paymentManagement1.getCompId())
                 .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
         List<WeightedDetails> weightedDetailsLists = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getBaseId())
                 .eq("goods_name_key", warehouseInOutInfo1.getGoodsNameKey()).orderBy("update_date", false));

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

@@ -919,6 +919,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     weightedDetailsService.insert(weightedDetails);
                     // 修改成本信息表
                     CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", weightedDetails.getWarehouseId())
+                            .eq("comp_id", weightedDetails.getCompId())
                             .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
 //                    List<WeightedDetails> weightedDetailsLists = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo.getWarehouseName())
 //                            .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()).orderBy("update_date", false));