From cb7339c12d6cd3f4d1668d27d34dbb4b515cc6c1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 09:50:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 450a109..5505bad 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -109,6 +109,10 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ String uuid = String.valueOf(System.currentTimeMillis());
+ locDetl.setUuid(uuid);
+ locDetl.setOwner(wrkDetl.getOwner());
+ locDetl.setPayment(wrkDetl.getPayment());
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -349,7 +353,10 @@
Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
if (mastFinished) {
Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
- orderService.updateSettle(order.getId(),4L,1L);
+ if (!Cools.isEmpty(order)) {
+ orderService.updateSettle(order.getId(),4L,1L);
+
+ }
}
}
--
Gitblit v1.9.1