From 87d66c61fc5047fb5708d609f4a5f1f868cd646c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 七月 2025 18:04:30 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
index 175251f..d21a070 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java
@@ -4,6 +4,7 @@
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
+import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.wms.asrs.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -34,7 +35,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public boolean comb(WaitPakin waitPakin) {
//缁勬墭瑙勫垯鏍￠獙
waitPakinRuleService.rule(waitPakin);
@@ -59,7 +60,8 @@
}
//鍙敤鏁伴噺
- Double count = orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty() - orderDetl.getWaitQty();
+// Double count = orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty() - orderDetl.getWaitQty();
+ Double count = Math.round((orderDetl.getAnfme() - orderDetl.getWorkQty() - orderDetl.getQty()) * 1000) / 1000.0;
if (waitPakin.getAnfme() > count) {
throw new CoolException("缁勬墭鏁伴噺瓒呰繃鍓╀綑鍙敤鏁伴噺");
}
@@ -88,6 +90,12 @@
throw new CoolException("璁㈠崟涓嶅瓨鍦�");
}
+ //濡傛灉鏄钩搴撳叆搴撳崟锛屼慨鏀硅鍗曟槑缁嗘墽琛屾暟閲�
+ if (order.getOrderType() == OrderType.PK_IN_ORDER.id) {
+ orderDetl.setWorkQty(waitPakin.getAnfme());
+ orderDetlService.updateById(orderDetl);
+ }
+
//鏇存柊璁㈠崟鐘舵��
if (order.getOrderSettle().equals(OrderSettleType.INIT.val())) {
order.setOrderSettle(OrderSettleType.WAIT.val());
--
Gitblit v1.9.1