From ebe2da6e4eefd59b366ebab3a651b32763b580ed Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 22 六月 2025 14:23:56 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
index 2d82b49..bb425dc 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.apis.wcs.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
@@ -21,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@@ -84,6 +86,7 @@
}
/**
+ * ESS 鎾澧欐媿鐏洖璋�
* 鎾澧欐媿鐏紝ESS璋冪敤
*/
@PostMapping("/light/off")
@@ -98,16 +101,24 @@
throw new CoolException("浜嬩欢鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
+ log.info("鎾澧欐媿鐏紝璇锋眰鍙傛暟锛歿}", JSONObject.toJSONString(request));
+
// 鏍规嵁绔欑偣缂栫爜鏌ユ挱绉嶇珯鐐逛俊鎭�
CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, request.get("tagCode")));
+ if (Objects.isNull(cacheSite)) {
+ throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦紒锛�");
+ }
// 鏍规嵁鎾绔欑偣淇℃伅鏉＄爜锛屾煡浠诲姟
Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, cacheSite.getBarcode()));
+ if (Objects.isNull(task)) {
+ throw new CoolException("褰撳墠绔欑偣浠诲姟涓嶅瓨鍦紒锛�");
+ }
- request.clear();
- request.put("taskNo", task.getTaskNo());
- request.put("orderNo",cacheSite.getOrderNo());
+ Map<String, Object> param = new HashMap<>();
+ param.put("taskNo", task.getTaskNo());
+ param.put("orderNo",cacheSite.getOrderNo());
- wcsApiService.slapLightLogic(request);
+ wcsApiService.slapLightLogic(param);
return R.ok();
}
--
Gitblit v1.9.1