From 7f9a488ea0b82e1e09b1d92a5bd83e5127d060f4 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期三, 16 十月 2024 13:09:25 +0800
Subject: [PATCH] 证书问题
---
src/main/resources/mapper/OrderMapper.xml | 9 +++++++++
src/main/java/com/zy/asrs/service/OrderService.java | 3 +++
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 11 ++++++++---
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 2 ++
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 64fc464..0140d61 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -15,6 +15,8 @@
int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
+ int updateSettle2(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("plt")Integer plt);
+
List<Order> selectComplete();
List<Order> selectorderNoL(@Param("orderNo")String orderNo);
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index e41d209..e48f8b2 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -14,6 +14,9 @@
boolean updateSettle(Long orderId, Long settle, Long userId);
+ boolean updateSettle2(Long orderId, Long settle, Integer pltType);
+
+
void checkComplete(String orderNo, String locNo);
boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index a3ed3c7..0ee71d8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -93,6 +93,11 @@
}
@Override
+ public boolean updateSettle2(Long orderId, Long settle, Integer plt) {
+ return this.baseMapper.updateSettle2(orderId, settle, plt) > 0;
+ }
+
+ @Override
public void checkComplete(String orderNo, String locNo) {
Order order = this.selectByNo(orderNo);
if (Cools.isEmpty(order)) {
@@ -110,11 +115,11 @@
break;
}
}
+ Integer pltType = null;
//浠撳簱缂栫爜
if (Cools.isEmpty(order.getPltType())) {
AgvLocMast locNo1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
- order.setPltType(locNo1.getPltType());
- super.updateById(order);
+ pltType = locNo1.getPltType();
}
// 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗ｄ腑鏃犺鍗曟嵁鐨勬暟鎹�
int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
@@ -126,7 +131,7 @@
boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
- if (!this.updateSettle(order.getId(), 4L, null)) {
+ if (!this.updateSettle2(order.getId(), 4L, pltType)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
}
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 8bb394e..99eecd5 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -53,6 +53,15 @@
and id = #{orderId}
</update>
+ <update id="updateSettle2">
+ update man_order
+ set settle = #{settle}
+ ,update_time = getdate()
+ ,plt_type = #{plt}
+ where 1=1
+ and id = #{orderId}
+ </update>
+
<select id="selectComplete" resultMap="BaseResultMap">
select top 5 *
from man_order
--
Gitblit v1.9.1