From a15ad9309f383153d4f5a95a044fb19e882fff55 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 七月 2025 15:19:52 +0800
Subject: [PATCH] 平库组库功能优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java | 21 ++++++++++++++-------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java | 13 +++++++++++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 2 +-
4 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
index 912ebe4..a990d36 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
@@ -7,6 +7,7 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.template.WaitPakinTemplate;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.common.annotation.OperationLog;
@@ -65,7 +66,11 @@
@PostMapping("/waitPakin/save")
public R save(@RequestBody WaitPakin waitPakin) {
try {
- waitPakinService.comb(waitPakin);
+ if (waitPakin.getBarcode().contains("PK")) {
+ waitPakinService.comb(waitPakin, OrderType.PK_IN_ORDER.id);
+ } else {
+ waitPakinService.comb(waitPakin, OrderType.UTC_IN_ORDER.id);
+ }
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
@@ -177,7 +182,11 @@
waitPakin.setDetlId(orderDetl.getId());
waitPakin.setMatnr(orderDetl.getMat$().getMatnr());
waitPakin.setBatch(orderDetl.getBatch());
- waitPakinService.comb(waitPakin);
+ if (waitPakinTemplate.getBarcode().contains("PK")) {
+ waitPakinService.comb(waitPakin, OrderType.PK_IN_ORDER.id);
+ } else {
+ waitPakinService.comb(waitPakin, OrderType.UTC_IN_ORDER.id);
+ }
}
return R.ok();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java
index 485d612..a14d53e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaitPakinService.java
@@ -10,6 +10,6 @@
List<WaitPakin> getByOrderDetlId(Long orderDetlId);
//缁勬墭
- boolean comb(WaitPakin waitPakin);
+ boolean comb(WaitPakin waitPakin, Long inType);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index 69f382c..e590dc7 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -126,7 +126,7 @@
//缁勬嫋閫氱煡妗�
waitPakins.forEach(pakin -> {
- waitPakinService.comb(pakin);
+ waitPakinService.comb(pakin, ordersParam.getInType());
});
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 72ca1a7..d727f71 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
@@ -36,7 +36,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean comb(WaitPakin waitPakin) {
+ public boolean comb(WaitPakin waitPakin, Long inType) {
//缁勬墭瑙勫垯鏍￠獙
waitPakinRuleService.rule(waitPakin);
@@ -59,11 +59,17 @@
throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
}
- //鍙敤鏁伴噺
+ if (inType.equals(OrderType.PK_IN_ORDER.id)) {
+ Double sCount = Math.round((orderDetl.getAnfme() - orderDetl.getWaitQty()) * 1000) / 1000.0;
+ if (waitPakin.getAnfme().compareTo(sCount) > 0) {
+ throw new CoolException("缁勬墭鏁伴噺瓒呰繃鍓╀綑鍙敤鏁伴噺");
+ }
+ } else {
// 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().compareTo(count) > 0) {
- throw new CoolException("缁勬墭鏁伴噺瓒呰繃鍓╀綑鍙敤鏁伴噺");
+ Double count = Math.round((orderDetl.getAnfme() - orderDetl.getWorkQty() - orderDetl.getQty()) * 1000) / 1000.0;
+ if (waitPakin.getAnfme().compareTo(count) > 0) {
+ throw new CoolException("缁勬墭鏁伴噺瓒呰繃鍓╀綑鍙敤鏁伴噺");
+ }
}
//鏌ヨ鏄惁瀛樺湪鐩稿悓鏄庣粏鍜屾墭鐩樼爜鐨勭粍鎵橀�氱煡妗�
@@ -78,8 +84,9 @@
throw new CoolException("娣诲姞澶辫触");
}
}else {
+ Double total = waitPakin1.getAnfme() + waitPakin.getAnfme();
//瀛樺湪缁勬墭閫氱煡妗ｏ紝鏇存柊
- waitPakin1.setAnfme(waitPakin1.getAnfme() + waitPakin.getAnfme());
+ waitPakin1.setAnfme(total);
waitPakin1.setUpdateTime(new Date());
if (!this.updateById(waitPakin1)) {
throw new CoolException("娣诲姞澶辫触");
@@ -93,7 +100,7 @@
}
//濡傛灉鏄钩搴撳叆搴撳崟锛屼慨鏀硅鍗曟槑缁嗘墽琛屾暟閲�
- if (order.getOrderType() == OrderType.PK_IN_ORDER.id) {
+ if (inType.equals(OrderType.PK_IN_ORDER.id)) {
orderDetl.setWorkQty(waitPakin.getAnfme());
orderDetlService.updateById(orderDetl);
}
--
Gitblit v1.9.1