ccj 2 년 전
부모
커밋
64c070e5a6

+ 1 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -140,7 +140,7 @@ public class BiInfoController {
     public List<BiViewInfo> selectBiInfoNew(String compId, String seachMoth) {
         List<BiViewInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_BI_INFO, BiViewInfo.class);
         if (listRedis != null && listRedis.size() > 0) {
-//            return listRedis;
+            return listRedis;
         }
         companyId = compId;
         List<BiViewInfo> biViewInfos = new ArrayList<>();

+ 0 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TurnInfoServiceImpl.java

@@ -141,7 +141,6 @@ public class TurnInfoServiceImpl extends ServiceImpl<TurnInfoMapper, TurnInfo> i
         if (warehousePositionInfo!=null){
             List<WarehousePositionStorageInfo> warehousePositionStorageInfoList = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
                     .eq("position_id", warehousePositionInfo.getId())
-                    .groupBy("goods_name_key")
                     .eq("delete_flag", "0"));
             for (WarehousePositionStorageInfo warehousePositionStorageInfo : warehousePositionStorageInfoList) {
                 WarehouseNumView warehouseNumView = new WarehouseNumView();