From 438c1612a0b0b212e21d25249ccdebac6a326842 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 15 十一月 2025 15:27:08 +0800
Subject: [PATCH] 小数点保留后两位
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 109120c..8ee222c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -5,7 +5,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.MobileService;
@@ -243,7 +243,7 @@
throw new CoolException("鏁版嵁閿欒锛侊紒");
}
if (!one.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)) {
- throw new CoolException("鍑哄簱鍗曟湭瀹屾垚锛屾棤娉曞畬鎴愭敹璐э紒锛�");
+ throw new CoolException("璋冩嫈鍑哄簱鍗曟湭瀹屾垚锛屼笉鍙墽琛屾敹璐ф搷浣滐紒锛�");
}
}
@@ -251,7 +251,7 @@
throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
}
//TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/
- Double rcptedQty = Math.round((wkOrder.getQty() + receiptQty) * 10000) / 10000.0;
+ Double rcptedQty = Math.round((wkOrder.getQty() + receiptQty) * 100) / 100.0;
wkOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
if (!asnOrderMapper.updateById(wkOrder)) {
throw new CoolException("宸叉敹璐ф暟閲忎慨鏀瑰け璐ワ紒锛�");
@@ -299,7 +299,7 @@
throw new CoolException("璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡锛侊紒");
}
- Double itemRcptQty = Math.round((dto.getReceiptQty() + orderItem.getQty()) * 10000) / 10000.0;
+ Double itemRcptQty = Math.round((dto.getReceiptQty() + orderItem.getQty()) * 100) / 100.0;
Boolean allowOver = false;
if (!Objects.isNull(config)) {
if (Boolean.parseBoolean(config.getVal())) {
@@ -412,7 +412,7 @@
if (!Objects.isNull(serviceOne)) {
item.setId(serviceOne.getId());
- Double anfme = Math.round((item.getAnfme() + serviceOne.getAnfme()) * 10000) / 10000.0;
+ Double anfme = Math.round((item.getAnfme() + serviceOne.getAnfme()) * 100) / 100.0;
item.setAnfme(anfme);
}
@@ -537,16 +537,30 @@
Object code = params.get("code");
Object matnrCode = params.get("matnrCode");
Object asnCode = params.get("asnCode");
+ Object crushNo = params.get("fieldsIndex");
Object batch = params.get("batch");
+ String fieldIndex = null;
+ if (!Objects.isNull(crushNo)) {
+ FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getValue, crushNo).last("Limit 1"));
+ if (!Objects.isNull(fieldsItem)) {
+ fieldIndex = fieldsItem.getUuid();
+ }
+ }
//TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
.or().eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)
.or().eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)
+ .or().eq(!Cools.isEmpty(fieldIndex), WarehouseAreasItem::getFieldsIndex, fieldIndex)
.or().eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
.or().eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode);
List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
+ list.forEach(item -> {
+ Map<String, String> fields = FieldsUtils.getFields(item.getFieldsIndex());
+ item.setExtendFields(fields);
+ });
+
return R.ok(list);
}
@@ -1106,7 +1120,7 @@
if (Objects.isNull(stockItem)) {
detlsDto.setStockQty(0.0);
} else {
- Double anfme = Math.round((stockItem.getAnfme() + stockItem.getWorkQty()) * 10000) / 10000.0;
+ Double anfme = Math.round((stockItem.getAnfme() + stockItem.getWorkQty()) * 100) / 100.0;
detlsDto.setStockQty(anfme);
}
--
Gitblit v1.9.1