From b0752dae29c4eadb96480d4c884c5badb9a66fb5 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 03 三月 2026 15:48:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4 ++--
src/main/webapp/static/js/common.js | 2 +-
src/main/resources/application.yml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
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 983ae44..0fa9b07 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -991,7 +991,7 @@
@Override
@Transactional
public void completeWrkMast(String workNo, Long userId) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sheet_no",workNo));
Integer ioType = 0;
if (Cools.isEmpty(wrkMast)){
throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
@@ -1249,7 +1249,7 @@
@Transactional
public void cancelWrkMast(String workNo, Long userId) {
Date now = new Date();
- WrkMast wrkMast = wrkMastService.selectById(workNo);
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sheet_no",workNo));
if (Cools.isEmpty(wrkMast)){
throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5c9b019..ffbf0af 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -70,7 +70,7 @@
# 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
autoLocMoveUnilateralBoolean: false
wms:
- url: localhost:8080
+ url: 127.0.0.1:8056/actionapi/HighAsRs/
comb:
limit: 5000
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index de92d3a..620dcac 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,5 +1,5 @@
var baseUrl = "/zzgtasrs";
-var baseUrlWcs = "http://10.10.10.250:9090/zzgtwcs";
+var baseUrlWcs = "http://127.0.0.1:9090/zzgtwcs";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
--
Gitblit v1.9.1