修改

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

@@ -3,6 +3,7 @@ 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.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;
@@ -10,11 +11,16 @@ 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.mapper.CostManagementInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.ICostManagementInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.IWeightedDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+
 /**
  * <p>
  * 成本管理信息 服务实现类
@@ -25,7 +31,8 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 public class CostManagementInfoServiceImpl extends ServiceImpl<CostManagementInfoMapper, CostManagementInfo> implements ICostManagementInfoService {
-
+    @Autowired
+    private IWeightedDetailsService weightedDetailsService;
 
 
     /**
@@ -58,6 +65,13 @@ public class CostManagementInfoServiceImpl extends ServiceImpl<CostManagementInf
     @Transactional(rollbackFor = Exception.class)
     public String editCostManagementInfo(CostManagementInfo costManagementInfo) {
         boolean one = this.updateById(costManagementInfo);
+        WeightedDetails weightedDetails=new WeightedDetails();
+        //新增主键id
+        weightedDetails.setId(IdGenerator.generateUUID());
+        weightedDetails.setCostAfter(costManagementInfo.getCost());
+        weightedDetails.setGoodsName(costManagementInfo.getGoodsName());
+        weightedDetails.setGoodsNameKey(costManagementInfo.getGoodsNameKey());
+        weightedDetailsService.insert(weightedDetails);
         if (one) {
             return "OK";
         } else {

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

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.winsea.svc.base.base.util.DateUtils;
 import com.yh.saas.common.support.util.IdGenerator;
-import com.yh.saas.plugin.yiliangyiyun.entity.CustomerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.InventoryCostInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.InventoryCostInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IInventoryCostInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -44,13 +41,14 @@ public class InventoryCostInfoServiceImpl extends ServiceImpl<InventoryCostInfoM
         Date end=simpleDateFormat.parse(inventoryCostInfo.getYear()+1);
         Page<InventoryCostInfo> inventoryCostInfoPage = this.selectPage(inventoryCostInfo.getQueryPage(), new EntityWrapper<InventoryCostInfo>()
                 .eq("warehouse_id", inventoryCostInfo.getWarehouseId())
-        .gt("cost_date",start)
-        .lt("cost_date",end)
-        .orderBy("cost_date",false));
+                .gt("cost_date",start)
+                .lt("cost_date",end)
+                .orderBy("cost_date",false));
         int count = this.selectCount( new EntityWrapper<InventoryCostInfo>()
                 .eq("warehouse_id", inventoryCostInfo.getWarehouseId())
                 .gt("cost_date",start)
-                .lt("cost_date",end).orderBy("cost_date",false));
+                .lt("cost_date",end)
+                .orderBy("cost_date",false));
         inventoryCostInfoPage.setSize(count);
         return inventoryCostInfoPage;
     }

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

@@ -283,7 +283,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         weightedDetails.setFreight(warehouseInOutInfo1.getFreight());
         weightedDetails.setOriginalStock(original);
         // 查询入库全加权成本
-        List<WeightedDetails> weightedDetailsList = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getWarehouseName())
+        List<WeightedDetails> weightedDetailsList = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getBaseId())
                 .eq("goods_name_key", warehouseInOutInfo1.getGoodsNameKey()).orderBy("update_date", false));
         if (CollectionUtils.isEmpty(weightedDetailsList)) {
             weightedDetails.setCostBefore(0f);
@@ -299,7 +299,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         // 修改成本信息表
         CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", weightedDetails.getWarehouseId())
                 .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
-        List<WeightedDetails> weightedDetailsLists = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getWarehouseName())
+        List<WeightedDetails> weightedDetailsLists = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getBaseId())
                 .eq("goods_name_key", warehouseInOutInfo1.getGoodsNameKey()).orderBy("update_date", false));
         Float net = 0f;
         List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()

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

@@ -419,6 +419,28 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     public List<WarehouseBaseInfo> selectWarehouse(String compId, String warehouseType) {
         List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
                 .eq("comp_id", compId).eq("warehouse_type", warehouseType).eq("delete_flag", "0"));
+        if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+            for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                List<WarehousePositionStorageInfo> temp = new ArrayList();
+                // 以库位为维度查询
+                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+                        .eq("base_id", warehouseBaseInfo.getId()));
+                if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+                    for (WarehousePositionInfo warehousePositionInfo:warehousePositionInfos) {
+                        //查询仓库内的货名
+                        List<WarehousePositionStorageInfo> warehousePositionStorageInfos = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
+                                .eq("position_id", warehousePositionInfo.getId()));
+                        if (!CollectionUtils.isEmpty(warehousePositionStorageInfos)){
+                            for (WarehousePositionStorageInfo warehousePositionStorageInfo:warehousePositionStorageInfos){
+                                temp.add(warehousePositionStorageInfo);
+                            }
+                        }
+                    }
+                    warehouseBaseInfo.setGoodsNameInfos(temp);
+                }
+            }
+
+        }
         return warehouseBaseInfoList;
     }
 

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

@@ -729,7 +729,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     weightedDetails.setFreight(warehouseInOutInfo.getFreight());
                     weightedDetails.setOriginalStock(original);
                     // 查询入库全加权成本
-                    List<WeightedDetails> weightedDetailsList = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo.getWarehouseName())
+                    List<WeightedDetails> weightedDetailsList = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo.getBaseId())
                             .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()).orderBy("update_date", false));
                     if (CollectionUtils.isEmpty(weightedDetailsList)) {
                         weightedDetails.setCostBefore(0f);

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

@@ -40,12 +40,14 @@ public class WeightedDetailsServiceImpl extends ServiceImpl<WeightedDetailsMappe
                 .eq("warehouse_id", weightedDetails.getWarehouseId())
                 .gt("update_date",start)
                 .lt("update_date",end)
-                .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
+                .eq("goods_name_key", weightedDetails.getGoodsNameKey())
+                .orderBy("update_date",false));
         int count = this.selectCount(new EntityWrapper<WeightedDetails>()
                 .eq("warehouse_id", weightedDetails.getWarehouseId())
                 .gt("update_date",start)
                 .lt("update_date",end)
-                .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
+                .eq("goods_name_key", weightedDetails.getGoodsNameKey())
+                .orderBy("update_date",false));
         weightedDetailsPage.setSize(count);
         return weightedDetailsPage;
     }