From 3210698902c4e0f3e6f1433d24e62923fbfa794d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 12:59:42 +0800
Subject: [PATCH] 组托IO类型优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 6ef56c2..e854ebf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -65,7 +65,6 @@
}
List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
- .notIn(WaitPakin::getIoStatus, asList)
.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
if (!Objects.isNull(pakin)) {
throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬墭鍗曪細" + pakin.getCode() + "浣跨敤锛侊紒");
@@ -85,7 +84,7 @@
}
waitPakin1.setCode(ruleCode)
//鐘舵�佷慨鏀逛负鍏ュ簱涓�
- .setIoStatus(Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val))
+ .setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
.setAnfme(sum)
.setUpdateBy(userId)
.setCreateBy(userId)
@@ -119,6 +118,10 @@
.setAsnCode(warehouseAreasItems.getAsnCode())
.setAsnItemId(warehouseAreasItems.getAsnItemId())
.setIsptResult(warehouseAreasItems.getIsptResult())
+ .setPlatItemId(warehouseAreasItems.getPlatItemId())
+ .setPlatOrderCode(warehouseAreasItems.getPlatOrderCode())
+ .setPlatWorkCode(warehouseAreasItems.getPlatWorkCode())
+ .setProjectCode(warehouseAreasItems.getProjectCode())
.setBatch(warehouseAreasItems.getSplrBatch())
.setUnit(warehouseAreasItems.getStockUnit())
.setFieldsIndex(warehouseAreasItems.getFieldsIndex())
@@ -146,7 +149,7 @@
}
- double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+ Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
if (!waitPakinItemService.saveBatch(items)) {
throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒");
@@ -158,9 +161,10 @@
if (Objects.isNull(one)) {
throw new CoolException("鏀惰揣鍖烘暟鎹敊璇紒锛�");
}
-// one.setAnfme(one.getAnfme() - pakinItem.getAnfme())
- one.setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty());
- if (one.getWorkQty() > one.getAnfme()) {
+ Double workQty = Math.round((one.getWorkQty() + pakinItem.getAnfme()) * 10000) / 10000.0;
+ Double qty = Math.round((workQty + one.getQty()) * 10000) / 10000.0;
+ one.setWorkQty(workQty);
+ if (qty.compareTo(one.getAnfme()) > 0) {
throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
}
if (!warehouseAreasItemService.saveOrUpdate(one)) {
@@ -172,9 +176,6 @@
if (!this.updateById(waitPakin1)) {
throw new CoolException("缁勬墭鏁伴噺淇敼澶辫触锛侊紒");
}
-
- //TODO 缁勬墭瀹屾垚鍚庯紝鎵ｅ噺鏀惰揣鍖哄簱瀛�
-
return pakin;
}
@@ -295,8 +296,7 @@
continue;
}
double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
- item.setWorkQty(item.getWorkQty() - sum)
- .setAnfme(item.getAnfme() + sum);
+ item.setWorkQty(item.getWorkQty() - sum);
if (!warehouseAreasItemService.updateById(item)) {
throw new CoolException("鏀惰揣鍖烘暟鎹洖婊氬け璐ワ紒锛�");
}
--
Gitblit v1.9.1