From b46dc3bc339ed04f72b091c3880d20b9512b18c2 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 12 七月 2024 09:07:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 3 +++
src/main/resources/application.yml | 2 +-
2 files changed, 4 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 50d9f3d..469f792 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -108,6 +108,9 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ if (Cools.isEmpty(wrkDetl.getBatch())){
+ locDetl.setBatch("");
+ }
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fd287b7..7bbec98 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.254:1433;databasename=ahyxasrs
+ url: jdbc:sqlserver://10.10.10.201:1433;databasename=ahyxasrs
username: sa
password: sa@123
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
--
Gitblit v1.9.1