From be1b426b7d765a546f4a26b60e80aa49a57079b9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 一月 2024 16:25:11 +0800
Subject: [PATCH] 1、优化采购模块数量不能为小数点问题2、新增客服巡查巡楼记录功能模块3、新增页面导出功能4、优化记录查询条件新增时间段查询条件5、其他界面性调整
---
service-store/src/main/java/com/java110/store/cmd/collection/GoodsCollectionCmd.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/collection/GoodsCollectionCmd.java b/service-store/src/main/java/com/java110/store/cmd/collection/GoodsCollectionCmd.java
index 08e61e0..d6adb04 100644
--- a/service-store/src/main/java/com/java110/store/cmd/collection/GoodsCollectionCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/collection/GoodsCollectionCmd.java
@@ -85,8 +85,8 @@
if (resourceStores == null || resourceStores.size() < 1) {
throw new CmdException("鏈寘鍚鐢ㄧ墿鍝�");
}
- int quanitity = 0;
- int stock = 0;
+ double quanitity = 0;
+ double stock = 0;
for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {
JSONObject resourceStore = resourceStores.getJSONObject(resourceStoreIndex);
Assert.hasKeyAndValue(resourceStore, "timesId", "蹇呭～锛屾湭閫夋嫨浠锋牸");
@@ -95,11 +95,11 @@
resourceStoreTimesDto.setStoreId(storeId);
List<ResourceStoreTimesDto> resourceStoreTimesDtos = resourceStoreTimesV1InnerServiceSMOImpl.queryResourceStoreTimess(resourceStoreTimesDto);
Assert.listOnlyOne(resourceStoreTimesDtos, "浠锋牸涓嶅瓨鍦�");
- quanitity = resourceStore.getIntValue("quantity");
+ quanitity = Double.parseDouble(resourceStore.getString("quantity"));
if (quanitity < 1) {
throw new CmdException("鐢宠鏁伴噺涓嶆纭�");
}
- stock = Integer.parseInt(resourceStoreTimesDtos.get(0).getStock());
+ stock = Double.parseDouble(resourceStoreTimesDtos.get(0).getStock());
if (quanitity > stock) {
throw new CmdException(resourceStoreTimesDtos.get(0).getResCode() + "鍑哄簱涓嶈冻,搴撳瓨涓�=" + stock + ",鐢宠鏁颁负=" + quanitity);
}
@@ -267,7 +267,7 @@
if (purchaseApplyDetailDtos == null || purchaseApplyDetailDtos.size() < 1) {
return;
}
- int stock = 0;
+ double stock = 0;
for (PurchaseApplyDetailDto tmpPurchaseApplyDetailDto : purchaseApplyDetailDtos) {
ResourceStorePo resourceStorePo = new ResourceStorePo();
resourceStorePo.setResId(tmpPurchaseApplyDetailDto.getResId());
--
Gitblit v1.8.0