From 7a5b73d01e30562716bbef8074be01bb141c7891 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 17 三月 2026 16:52:21 +0800
Subject: [PATCH] #
---
/dev/null | 0
src/main/resources/docs/WCS外部HTTP API接口V1.9.docx | 0
src/main/java/com/zy/asrs/domain/param/UpdateTaskPriorityAndBatchSeqParam.java | 17 +++++++++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 13 +++++++++++++
src/main/java/com/zy/common/service/CommonService.java | 27 +++++++++++++++++++++++++++
5 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index efeb5ed..a4ee7ac 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -175,6 +175,19 @@
return R.ok().add(result);
}
+ @PostMapping("/updateTaskPriorityAndBatchSeq")
+ @OpenApiLog(memo = "淇敼浠诲姟浼樺厛绾у拰鎵规搴忓彿")
+ public R updateTaskPriorityAndBatchSeq(@RequestBody UpdateTaskPriorityAndBatchSeqParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ boolean result = commonService.updateTaskPriorityAndBatchSeq(param);
+ if (result) {
+ return R.ok();
+ }
+ return R.error("淇敼浠诲姟浼樺厛绾у拰鎵规搴忓彿澶辫触");
+ }
+
@PostMapping("/deviceStatus")
// @OpenApiLog(memo = "鑾峰彇璁惧鐘舵��")
public R getDeviceStatus() {
diff --git a/src/main/java/com/zy/asrs/domain/param/UpdateTaskPriorityAndBatchSeqParam.java b/src/main/java/com/zy/asrs/domain/param/UpdateTaskPriorityAndBatchSeqParam.java
new file mode 100644
index 0000000..1873b51
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/UpdateTaskPriorityAndBatchSeqParam.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.domain.param;
+
+import lombok.Data;
+
+@Data
+public class UpdateTaskPriorityAndBatchSeqParam {
+
+ // wms浠诲姟鍙�
+ private String taskNo;
+
+ // 浠诲姟浼樺厛绾�
+ private Integer taskPri;
+
+ // 鎵规搴忓彿
+ private Integer batchSeq;
+
+}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 10b671c..68468a9 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -152,6 +152,33 @@
return true;
}
+ public boolean updateTaskPriorityAndBatchSeq(UpdateTaskPriorityAndBatchSeqParam param) {
+ if (param == null) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getTaskNo())) {
+ throw new CoolException("WMS浠诲姟鍙蜂笉鑳戒负绌�");
+ }
+ if (param.getTaskPri() == null && param.getBatchSeq() == null) {
+ throw new CoolException("浠诲姟浼樺厛绾у拰鎵规搴忓彿涓嶈兘鍚屾椂涓虹┖");
+ }
+
+ WrkMast wrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wms_wrk_no", param.getTaskNo()));
+ if (wrkMast == null) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ if (param.getTaskPri() != null) {
+ wrkMast.setIoPri(param.getTaskPri().doubleValue());
+ }
+ if (param.getBatchSeq() != null) {
+ wrkMast.setBatchSeq(param.getBatchSeq());
+ }
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ return true;
+ }
+
public CancelTaskBatchResult cancelTaskBatch(CancelTaskBatchParam param) {
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
diff --git "a/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.8.docx" "b/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.8.docx"
deleted file mode 100644
index 688ada3..0000000
--- "a/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.8.docx"
+++ /dev/null
Binary files differ
diff --git "a/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.9.docx" "b/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.9.docx"
new file mode 100644
index 0000000..4489d64
--- /dev/null
+++ "b/src/main/resources/docs/WCS\345\244\226\351\203\250HTTP API\346\216\245\345\217\243V1.9.docx"
Binary files differ
--
Gitblit v1.9.1