open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

配置

Browse Source
This commit is contained in:
wangpengfei
2024-12-16 14:32:32 +08:00
parent 3669b3b8f4
commit 2b04e7e364
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
View File

@@ -128,7 +128,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid())); List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
if (warehouseInventories.size()!=0){ if (warehouseInventories.size()!=0){
List<WarehouseInventoryRecord> lists=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>() 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<>(); List<GoodsDetailsVo> goodsDetails=new ArrayList<>();
for (WarehouseInventoryRecord list : lists) { for (WarehouseInventoryRecord list : lists) {
if(list!=null){ 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); 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())); List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
if (warehouseInventories.size()!=0){ if (warehouseInventories.size()!=0){
List<WarehouseInventoryRecord> lists=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>() 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<>(); List<GoodsDetailsVo> goodsDetails=new ArrayList<>();
for (WarehouseInventoryRecord list : lists) { for (WarehouseInventoryRecord list : lists) {
if(list!=null){ 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); storeInfo.setGoodsDetails(goodsDetails);

6
src/main/resources/application-pro.yml
View File

@@ -3,7 +3,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver 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 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 username: root
password: 1LAiGz$t1*Iw password: Yxt@67508182
cloud: cloud:
nacos: nacos:
discovery: discovery:
@@ -23,8 +23,8 @@ spring:
timeout: 0 # 连接超时时间（毫秒） timeout: 0 # 连接超时时间（毫秒）
image: image:
upload: upload:
path: D:/webapps/lipinka/yythmall-ui/upload/ path: D:/webapps/share-store/ui/share-store/upload/
url: url:
prefix: https://supervise.yxtsoft.com/lpk/upload/ prefix: https:/wms.yxtsoft.com/file/upload
import: import:
filePath: D:/yxt-supervise-gf/upload/ filePath: D:/yxt-supervise-gf/upload/