From 2b04e7e36468fe99da0b65273b5c044e4e8266e4 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 16 Dec 2024 14:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/warehouseinfo/WarehouseInfoService.java      | 12 ++++++++----
 src/main/resources/application-pro.yml               |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
index ec25ee0..e961618 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
@@ -128,7 +128,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
         List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
         if (warehouseInventories.size()!=0){
             List<WarehouseInventoryRecord> lists=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>()
-                    .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1").groupBy("billNo"));
+                    .eq("warehouseSid",storeInfo.getSid()).eq("billType","1").groupBy("billNo"));
             List<GoodsDetailsVo> goodsDetails=new ArrayList<>();
             for (WarehouseInventoryRecord list : lists) {
                 if(list!=null){
@@ -154,7 +154,9 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
                             }
                         }
                     }
-                    goodsDetails.add(vo);
+                    if(details.size()!=0) {
+                        goodsDetails.add(vo);
+                    }
                 }
             }
             storeInfo.setGoodsDetails(goodsDetails);
@@ -198,7 +200,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
             List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
             if (warehouseInventories.size()!=0){
                 List<WarehouseInventoryRecord> lists=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>()
-                        .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1").groupBy("billNo"));
+                        .eq("warehouseSid",storeInfo.getSid()).eq("billType","1").groupBy("billNo"));
                 List<GoodsDetailsVo> goodsDetails=new ArrayList<>();
                 for (WarehouseInventoryRecord list : lists) {
                     if(list!=null){
@@ -224,7 +226,9 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
                                 }
                             }
                         }
-                        goodsDetails.add(vo);
+                        if(details.size()!=0) {
+                            goodsDetails.add(vo);
+                        }
                     }
                 }
                 storeInfo.setGoodsDetails(goodsDetails);
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index b6a8b2f..8e516f4 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -3,7 +3,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/ss_warehouse?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
-    password: 1LAiGz$t1*Iw
+    password: Yxt@67508182
   cloud:
     nacos:
       discovery:
@@ -23,8 +23,8 @@ spring:
     timeout: 0  # 连接超时时间（毫秒）
 image:
   upload:
-    path: D:/webapps/lipinka/yythmall-ui/upload/
+    path: D:/webapps/share-store/ui/share-store/upload/
   url:
-    prefix: https://supervise.yxtsoft.com/lpk/upload/
+    prefix: https:/wms.yxtsoft.com/file/upload
 import:
   filePath: D:/yxt-supervise-gf/upload/