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,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

@@ -274,16 +274,16 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         weightedDetails.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
         weightedDetails.setGoodsName(warehouseInOutInfo1.getGoodsName());
         weightedDetails.setGrainType(warehouseInOutInfo1.getType());
-        weightedDetails.setInTypeKey(warehouseInOutInfo1.getTaskTypeKey());
-        weightedDetails.setInType(warehouseInOutInfo1.getTaskType());
+        weightedDetails.setInTypeKey(warehouseInOutInfo1.getInOutTypeKey());
+        weightedDetails.setInType(warehouseInOutInfo1.getInOutType());
         weightedDetails.setNetWeight(warehouseInOutInfo1.getNetWeight());
         weightedDetails.setPureWeight(warehouseInOutInfo1.getPureWeight());
-        weightedDetails.setUnitPrice(warehouseInOutInfo1.getUnitPrice());
+        weightedDetails.setUnitPrice(warehouseInOutInfo1.getCost());
         weightedDetails.setDeductionAmount(warehouseInOutInfo1.getDeductionAmount());
         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/StockPurchaseReceiptReportServiceImpl.java

@@ -64,7 +64,7 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                 * stockPurchaseReceiptReport.getPageSize());
         List<String> businessKeys = null;
         if ("1".equals(stockPurchaseReceiptReport.getSearchType())) {
-            businessKeys = workflowService.getTaskBusinessKeysByCode("STOCK-PROCUREMENT-RECEIPT-REPORT");
+            businessKeys = workflowService.getTaskBusinessKeysByCode("PROCUREMENT-RECEIPT-REPORT");
         }
         List<String> statusSet = new ArrayList<>();
         List<String> resourceIdList = this.getResourceIdList();

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

@@ -61,7 +61,7 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
                 * stockSaleReceiptReport.getPageSize());
         List<String> businessKeys = null;
         if ("1".equals(stockSaleReceiptReport.getSearchType())) {
-            businessKeys = workflowService.getTaskBusinessKeysByCode("STOCK-PROCUREMENT-RECEIPT-REPORT");
+            businessKeys = workflowService.getTaskBusinessKeysByCode("SALE-RECEIPT-REPORT");
         }
         List<String> statusSet = new ArrayList<>();
         List<String> resourceIdList = this.getResourceIdList();

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

@@ -417,8 +417,35 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
      */
     @Override
     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"));
+        Wrapper<WarehouseBaseInfo> warehouseBaseInfoWrapper = new EntityWrapper<>();
+        warehouseBaseInfoWrapper.eq("comp_id", compId)
+                                .eq("delete_flag", "0");
+        if (warehouseType!=null&&!warehouseType.isEmpty()){
+            warehouseBaseInfoWrapper.eq("warehouse_type", warehouseType);
+        }
+        List<WarehouseBaseInfo> warehouseBaseInfoList = this.selectList(warehouseBaseInfoWrapper);
+        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

@@ -632,6 +632,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
 
                         stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
+                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+                        // 不是退回的单子
+                        if (isStartWorkflow) {
+                            Workflow workflow = workflowService
+                                    .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
+                            // 没配置审核流程，直接结束并处理信息
+                            if (workflow == null) {
+                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                            }
+                            // 开启审核流
+                            else {
+                                // 设置状态 已提交审核
+                                stockPurchaseReceiptReport.setWorkflowId(workflow.getId());
+                                stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                                workflowService.startInstance(workflow.getId(), stockPurchaseReceiptReport.getId());
+                            }
+                        }
+                        // 退回的单子 再启用
+                        else {
+                            stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                            workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
+                        }
                     }
                     //常用库移库入库类型
                     else if ("3".equals(warehouseInOutInfo.getInOutTypeKey())) {
@@ -675,6 +697,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                                 stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                                 stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
+                                boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+                                // 不是退回的单子
+                                if (isStartWorkflow) {
+                                    Workflow workflow = workflowService
+                                            .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
+                                    // 没配置审核流程，直接结束并处理信息
+                                    if (workflow == null) {
+                                        throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                                    }
+                                    // 开启审核流
+                                    else {
+                                        // 设置状态 已提交审核
+                                        stockPurchaseReceiptReport.setWorkflowId(workflow.getId());
+                                        stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                                        workflowService.startInstance(workflow.getId(), stockPurchaseReceiptReport.getId());
+                                    }
+                                }
+                                // 退回的单子 再启用
+                                else {
+                                    stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                                    workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
+                                }
                             }
                         }
                     }
@@ -720,16 +764,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     weightedDetails.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
                     weightedDetails.setGoodsName(warehouseInOutInfo.getGoodsName());
                     weightedDetails.setGrainType(warehouseInOutInfo.getType());
-                    weightedDetails.setInTypeKey(warehouseInOutInfo.getTaskTypeKey());
-                    weightedDetails.setInType(warehouseInOutInfo.getTaskType());
+                    weightedDetails.setInTypeKey(warehouseInOutInfo.getInOutTypeKey());
+                    weightedDetails.setInType(warehouseInOutInfo.getInOutType());
                     weightedDetails.setNetWeight(warehouseInOutInfo.getNetWeight());
                     weightedDetails.setPureWeight(warehouseInOutInfo.getPureWeight());
-                    weightedDetails.setUnitPrice(warehouseInOutInfo.getUnitPrice());
+                    weightedDetails.setUnitPrice(warehouseInOutInfo.getCost());
                     weightedDetails.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
                     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);
@@ -852,6 +896,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                         stockSaleReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                         stockSaleReceiptReportService.insert(stockSaleReceiptReport);
+                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockSaleReceiptReport.getWorkflowId());
+                        // 不是退回的单子
+                        if (isStartWorkflow) {
+                            Workflow workflow = workflowService
+                                    .findLatestWorkflowByBusinessCodeByApp(stockSaleReceiptReport.getCompId(), "SALE-RECEIPT-REPORT");
+                            // 没配置审核流程，直接结束并处理信息
+                            if (workflow == null) {
+                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                            }
+                            // 开启审核流
+                            else {
+                                // 设置状态 已提交审核
+                                stockSaleReceiptReport.setWorkflowId(workflow.getId());
+                                stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                                workflowService.startInstance(workflow.getId(), stockSaleReceiptReport.getId());
+                            }
+                        }
+                        // 退回的单子 再启用
+                        else {
+                            stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                            workflowService.activateInstance(stockSaleReceiptReport.getWorkflowId(), stockSaleReceiptReport.getId());
+                        }
                         Wrapper wrapper = new EntityWrapper<TranCarInfo>()
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("car_no", warehouseInOutInfo.getCarNo())
@@ -947,6 +1013,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                         stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                         stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
+                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+                        // 不是退回的单子
+                        if (isStartWorkflow) {
+                            Workflow workflow = workflowService
+                                    .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
+                            // 没配置审核流程，直接结束并处理信息
+                            if (workflow == null) {
+                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                            }
+                            // 开启审核流
+                            else {
+                                // 设置状态 已提交审核
+                                stockPurchaseReceiptReport.setWorkflowId(workflow.getId());
+                                stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                                workflowService.startInstance(workflow.getId(), stockPurchaseReceiptReport.getId());
+                            }
+                        }
+                        // 退回的单子 再启用
+                        else {
+                            stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                            workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
+                        }
                         ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", contractManagementInfo.getContractNo()).eq("delete_flag","0"));
                         if (contractManagementInfo1 == null) {
@@ -973,6 +1061,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
 
                         stockSaleReceiptReportService.insert(stockSaleReceiptReport);
+                        boolean isStartWorkflow1 = org.apache.commons.lang3.StringUtils.isBlank(stockSaleReceiptReport.getWorkflowId());
+                        // 不是退回的单子
+                        if (isStartWorkflow1) {
+                            Workflow workflow = workflowService
+                                    .findLatestWorkflowByBusinessCodeByApp(stockSaleReceiptReport.getCompId(), "SALE-RECEIPT-REPORT");
+                            // 没配置审核流程，直接结束并处理信息
+                            if (workflow == null) {
+                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                            }
+                            // 开启审核流
+                            else {
+                                // 设置状态 已提交审核
+                                stockSaleReceiptReport.setWorkflowId(workflow.getId());
+                                stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                                workflowService.startInstance(workflow.getId(), stockSaleReceiptReport.getId());
+                            }
+                        }
+                        // 退回的单子 再启用
+                        else {
+                            stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                            workflowService.activateInstance(stockSaleReceiptReport.getWorkflowId(), stockSaleReceiptReport.getId());
+                        }
                         Wrapper wrapper = new EntityWrapper<TranCarInfo>()
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("car_no", warehouseInOutInfo.getCarNo())

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;
     }