From 27a351456cd2127c0b76d48869cc1a0b0b79664a Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 十月 2025 13:16:03 +0800
Subject: [PATCH] 对接
---
src/main/resources/mapper/OrderDetlMapper.xml | 7 +++++++
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2 ++
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 2 ++
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 9 +++++++--
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +-
6 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 747e8fc..16fa979 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -36,6 +36,8 @@
int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
+ int increaseWorkQty2(@Param("id")Long id, @Param("workQty")Double workQty);
+
/**
* 鏌ヨ鎵撳嵃璁㈠崟鏄庣粏浜岀淮鐮佹暟鎹�
* @param id 璁㈠崟鏄庣粏id
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index ecf08d2..3e81066 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -37,4 +37,6 @@
* @return
*/
boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+
+ boolean increaseWorkQty2(Long id, Double workQty);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 48e9a4e..4ea2ac5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -415,7 +415,7 @@
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty2(orderDetl.getId(), elem.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 327edbb..05e1960 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -87,7 +87,12 @@
* @return
*/
@Override
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
- return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
+ public boolean increaseWorkQty(Long id, String matnr, String batch, Double workQty) {
+ return this.baseMapper.increaseWorkQty(id, matnr,batch,workQty) > 0;
+ }
+
+ @Override
+ public boolean increaseWorkQty2(Long id, Double workQty) {
+ return this.baseMapper.increaseWorkQty2(id, workQty) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 5d4101b..5503e51 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -505,7 +505,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// 淇敼璁㈠崟鏄庣粏
- if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty2(orderDetl.getId(), locDto.getAnfme())) {
throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index bf73911..b513892 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -221,4 +221,11 @@
</choose>
</update>
+
+ <update id="increaseWorkQty2">
+ update man_order_detl
+ set work_qty = work_qty + #{workQty}
+ where 1=1
+ and id = #{id}
+ </update>
</mapper>
--
Gitblit v1.9.1