From f5c72d20ecfe3728d158ac8d38e97f21ebe1df86 Mon Sep 17 00:00:00 2001
From: miguannan <53815784+javami888@users.noreply.github.com>
Date: Thu, 6 Aug 2026 16:30:32 +0700
Subject: [PATCH] =?UTF-8?q?add:=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/acs/enums/StorageTypeEnum.java     |  8 +-
 .../java/org/nl/config/WmsProperties.java     | 43 +++++++++++
 .../src/main/resources/config/application.yml | 73 +++++++++++++++++++
 3 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/WmsProperties.java

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java
index 7ce8f21..ad340e6 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java
@@ -16,14 +16,14 @@ public enum StorageTypeEnum {
 
     ERROR("4", "异常处理位"),
 
+    BOX_RETURN("6", "退货入库"),
+
     BOX_IN("7", "木箱装箱开盒盖"),
 
-    BOX_RETURN("6", "退货入库"),
-//    这个枚举字段需要跟上位统一
-    BOX_RETURN_HJ("9", "退货异常申请行架对接位至NG位"),
-
     PACK_ERROR("8", "装箱异常申请任务"),
 
+    BOX_RETURN_HJ("9", "退货异常申请行架对接位至NG位"),
+
     CHANGE_LABEL_IN("10","一楼换标入库");
     /**
      * 索引
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/WmsProperties.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/WmsProperties.java
new file mode 100644
index 0000000..8f102d4
--- /dev/null
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/WmsProperties.java
@@ -0,0 +1,43 @@
+package org.nl.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * WMS接口配置属性类
+ *
+ * @author miguannan
+ * @date 2026-08-06
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "wms")
+public class WmsProperties {
+
+    /**
+     * WMS系统基础地址
+     */
+    private String url;
+
+    /**
+     * WMS接口路径映射 key=接口编码, value=接口路径
+     */
+    private Map<String, String> apis;
+
+    /**
+     * 获取完整WMS接口URL
+     *
+     * @param code 接口编码
+     * @return 完整URL
+     */
+    public String getApiUrl(String code) {
+        String apiPath = apis.get(code);
+        if (apiPath == null) {
+            throw new IllegalArgumentException("未配置WMS接口路径: " + code);
+        }
+        return url + apiPath;
+    }
+}
diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
index 38da9c6..5cd83bf 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
@@ -159,3 +159,76 @@ lucene:
   index:
     path: C:\acs\lucene\indexl
 
+wms:
+  # WMS系统基础地址（与数据库 sys_param.code='wmsurl' 保持一致）
+  url: http://10.100.19.7:8013
+  apis:
+    # 01 ACS向WMS申请任务
+    applyTaskToWms: /api/wms/task/apply
+    # 02 二期申请任务
+    applyTwo: /api/wms/task/applyTwo
+    # 03 设备申请二期任务
+    deviceApplyTwo: /api/wms/task/deviceApplyTwo
+    # 04 二期发货申请
+    applySendOutTwo: /api/wms/task/applySendOutTwo
+    # 05 二期发货捆扎贴标（一楼到二楼中间）
+    sendProductToFirstFloor: /api/wms/task/sendProductToFirstFloor
+    # 06 ACS向WMS反馈任务状态
+    feedTaskStatus: /api/wms/task/status
+    # 07 生箔按钮任务
+    applyGreenFoilButtonTask: /api/wms/task/applyGreenFoilButtonTask
+    # 08 反馈下发表处按钮
+    applyButtonTask: /api/wms/task/applyButtonTask
+    # 09 套管工位（套轴/拔轴）
+    applyPlugPullSiteRequest: /api/wms/apply/test1
+    # 10 向WMS反馈子卷重量
+    applyfeedbackSubVolumeWeightRequest: /api/wms/task/applyfeedbackSubVolumeWeightRequest
+    # 11 RGV工位上货申请行架任务
+    applyManipulatorAction: /api/wms/task/applyManipulatorAction
+    # 12 废箔重量反馈
+    feedbackWeight: /api/wms/task/feedbackWeight
+    # 13 申请高度等级
+    getBoxInfo: /api/wms/task/getBoxInfo
+    # 14 申请开盖
+    getIsUncap: /api/wms/task/getIsUncap
+    # 15 追加诺宝动作块
+    secondaryAllocationPoint: /api/bstIvtPackageInfoIvt/secondaryAllocationPoint
+    # 16 强制移动
+    forceMove: /api/wms/task/forceMove
+    # 17 气胀轴库点位申请
+    manipulatorApplyPointRequest: /api/wms/task/manipulatorApplyPointRequest
+    # 18 设备工位取货完成反馈
+    actionFinishRequest2: /api/wms/task/actionFinishRequest2
+    # 19 反馈管芯
+    feedbackDie: /api/wms/task/feedbackDie
+    # 20 密集库出气胀轴行架任务
+    callShaftFromCache: /api/wms/task/callShaftFromCache
+    # 21 查询站点有无货（GET请求，带query参数）
+    gccQueryStationState: /api/wms/task/gccQueryStationState
+    # 22 发送设备状态
+    sendDeviceStatus: /api/wms/task/sendDeviceStatus
+    # 23 申请更新点位（异常点）
+    deviceApplyExceptional: /api/wms/task/deviceApplyExceptional
+    # 24 立库入库
+    inStore: /api/lkll/task/createTask
+    # 25 立库出库
+    outStore: /api/lkll/task/createTask
+    # 26 立库空车出库
+    emptyVehicleOutStore: /api/lkll/task/queryContainer
+    # 27 立库移库
+    moveStore: /api/lkll/task/queryContainer
+    # 28 立库入库重置
+    inStoreReset: /api/lkll/task/queryContainer
+    # 29 立库移库重置
+    moveStoreReset: /api/lkll/task/queryContainer
+    # 30 查询巷道是否锁定
+    roadWayIsLock: /api/lkll/task/queryContainer
+    # 31 取消任务
+    cancelTask: /api/lkll/task/queryContainer
+    # 32 查询车载设备状态
+    queryCarDeviceStatus: /api/lkll/task/queryContainer
+    # 33 查询提升机设备状态
+    queryTsjDeviceStatus: /api/lkll/task/queryContainer
+    # 34 查询输送线设备状态
+    querySsxDeviceStatus: /api/lkll/task/queryContainer
+