From 57d00cb1bd3eb907935fdee4242134820fd4a484 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 09 一月 2026 15:44:34 +0800
Subject: [PATCH] #
---
src/main/resources/docs/WCS外部HTTP API接口V1.3.docx | 0
src/main/java/com/zy/common/service/CommonService.java | 24 ++++++++++++++++++++++--
src/main/java/com/zy/asrs/domain/param/CancelTaskParam.java | 3 +++
src/main/java/com/zy/asrs/domain/param/CompleteTaskParam.java | 3 +++
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/param/CancelTaskParam.java b/src/main/java/com/zy/asrs/domain/param/CancelTaskParam.java
index 3251306..3a6f515 100644
--- a/src/main/java/com/zy/asrs/domain/param/CancelTaskParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/CancelTaskParam.java
@@ -7,4 +7,7 @@
private Integer wrkNo;
+ //wms浠诲姟鍙�
+ private String taskNo;
+
}
diff --git a/src/main/java/com/zy/asrs/domain/param/CompleteTaskParam.java b/src/main/java/com/zy/asrs/domain/param/CompleteTaskParam.java
index 3d8e3ab..4f42e4a 100644
--- a/src/main/java/com/zy/asrs/domain/param/CompleteTaskParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/CompleteTaskParam.java
@@ -7,4 +7,7 @@
private Integer wrkNo;
+ //wms浠诲姟鍙�
+ private String taskNo;
+
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 86294ea..8959e59 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -83,8 +83,18 @@
}
public boolean completeTask(CompleteTaskParam param) {
+ WrkMast wrkMast = null;
Integer wrkNo = param.getWrkNo();
- WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ String taskNo = param.getTaskNo();//wms浠诲姟鍙�
+
+ if(wrkNo == null) {
+ if (!Cools.isEmpty(taskNo)) {
+ wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
+ }
+ }else {
+ wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ }
+
if (null == wrkMast) {
throw new CoolException("浠诲姟涓嶅瓨鍦�");
}
@@ -103,8 +113,18 @@
}
public boolean cancelTask(CancelTaskParam param) {
+ WrkMast wrkMast = null;
Integer wrkNo = param.getWrkNo();
- WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ String taskNo = param.getTaskNo();//wms浠诲姟鍙�
+
+ if(wrkNo == null) {
+ if (!Cools.isEmpty(taskNo)) {
+ wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
+ }
+ }else {
+ wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ }
+
if (null == wrkMast) {
throw new CoolException("浠诲姟涓嶅瓨鍦�");
}
diff --git "a/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.3.docx" "b/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.3.docx"
new file mode 100644
index 0000000..7f0c134
--- /dev/null
+++ "b/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.3.docx"
Binary files differ
--
Gitblit v1.9.1