From 8a44d9e4f192f961d7ef75762de516c2b33906db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 07 八月 2025 16:28:25 +0800
Subject: [PATCH] 组拖档功能优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakin.java | 3 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaitPakinServiceImpl.java | 13 +++++++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakin.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakin.java
index 51595ff..81382bb 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakin.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakin.java
@@ -91,6 +91,9 @@
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
+ @ApiModelProperty("浼樺厛绾�")
+ private Integer sort;
+
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
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 c5e3ca2..dcbebd7 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
@@ -28,6 +28,8 @@
private TaskService taskService;
@Autowired
private WaitPakinRuleService waitPakinRuleService;
+ @Autowired
+ private WaitPakinService waitPakinService;
@Override
public List<WaitPakin> getByOrderDetlId(Long orderDetlId) {
@@ -72,10 +74,12 @@
}
}
+
//鏌ヨ鏄惁瀛樺湪鐩稿悓鏄庣粏鍜屾墭鐩樼爜鐨勭粍鎵橀�氱煡妗�
WaitPakin waitPakin1 = this.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, waitPakin.getBarcode())
.eq(WaitPakin::getDetlId, waitPakin.getDetlId()));
+
if (waitPakin1 == null) {
//涓嶅瓨鍦ㄧ粍鎵橀�氱煡妗ｏ紝鍒涘缓
waitPakin.setMatnr(orderDetl.getMat$().getMatnr());
@@ -106,6 +110,15 @@
orderDetlService.updateById(orderDetl);
}
+ if (orderDetl.getWaitQty().compareTo(orderDetl.getAnfme()) >= 0) {
+ waitPakin.setSort(0);
+ } else if (orderDetl.getWaitQty().compareTo(0.0) > 0) {
+ waitPakin.setSort(55);
+ } else {
+ waitPakin.setSort(49);
+ }
+ waitPakinService.updateById(waitPakin);
+
//鏇存柊璁㈠崟鐘舵��
if (order.getOrderSettle().equals(OrderSettleType.INIT.val())) {
order.setOrderSettle(OrderSettleType.WAIT.val());
--
Gitblit v1.9.1