From 57fa3510fe6573f70a5dfc043a775da32530fbc6 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 15 三月 2025 16:22:12 +0800
Subject: [PATCH] 配置信息

---
 src/main/java/com/zy/asrs/service/impl/CommonServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/CommonServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CommonServiceImpl.java
index 490cc22..bdb42f5 100644
--- a/src/main/java/com/zy/asrs/service/impl/CommonServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CommonServiceImpl.java
@@ -12,8 +12,8 @@
 import com.zy.asrs.domain.enums.WorkNoType;
 import com.zy.asrs.domain.param.CrnOperatorParam;
 import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.Result;
-import com.zy.asrs.entity.param.StorageEscalationParam;
+import com.zy.asrs.entity.wms.WmsResult;
+import com.zy.asrs.entity.wms.StorageEscalationParam;
 import com.zy.asrs.entity.param.TaskOverToWms;
 import com.zy.asrs.mapper.BasCrnErrorMapper;
 import com.zy.asrs.mapper.StaDescMapper;
@@ -213,7 +213,7 @@
                                 MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                             } else {
                                 if (!Cools.isEmpty(response) && !Cools.isEmpty(jsonObject.get("ReturnStatus")) && jsonObject.get("ReturnStatus").equals(0) && !Cools.isEmpty(jsonObject.get("Result").toString())) {
-                                    Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
+                                    WmsResult result = JSON.parseObject(jsonObject.get("Result").toString(), WmsResult.class);
                                     // 鍒涙柊涓�涓叆搴撳伐浣滄。
                                     TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
                                     if (Cools.isEmpty(taskWrk)) {
@@ -1468,7 +1468,7 @@
         return response;
     }
 
-    private TaskWrk createTask1(Result result, String barcode) {
+    private TaskWrk createTask1(WmsResult result, String barcode) {
         String locNo = Utils.Fusion(result.getRow(), result.getFloor(), result.getColumn());
 
 

--
Gitblit v1.9.1