From 3bf6f972604761c9ac59a2cb9ea01eeacaec2189 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 15:43:51 +0800
Subject: [PATCH] 更新为正式部署许可证
---
src/main/java/com/zy/common/web/WcsController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 9ac8e9f..30e3918 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -1,14 +1,18 @@
package com.zy.common.web;
+import com.alibaba.excel.util.StringUtils;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.mes.MesReturn;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.RcsServiceImpl;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
@@ -17,6 +21,7 @@
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -54,6 +59,9 @@
@Autowired
private TaskService taskService;
+ @Value("${mes.url}")
+ public String MES_URL;
+
// TODO锛氱О閲嶃�佹媿鐓т笂鎶ュ瓨鍌紝CTU鏂欑杩愯浆
@PostMapping("/pakin/loc/v1")
@@ -66,8 +74,29 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getSourceStaNo())) {
- return R.error("鎵樼洏涓嶈兘涓虹┖鎴栬�呮墭鐩樼爜涓嶄负鍏綅");
+ if (Cools.isEmpty(param.getBarcode()) || param.getBarcode().equals("00000000")) {
+ return R.error(".鎵樼洏鐮佷笉鑳戒负绌烘垨鑰呮墭鐩樼爜涓�0");
+ }
+ if (param.getSourceStaNo() == 301 || param.getSourceStaNo() == 304){
+ String url = "CameraPictureRecognition";
+
+// return R.error("閰嶇洏涓嶆纭�");
+// String URL = MES_URL + url;
+// String URL = "172.26.160.74:8080/basicmodel/WmsFit/Api/CameraPictureRecognition";
+// try{
+// String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(param));
+// if (!StringUtils.isEmpty(response) && response.contains("Success")) {
+// MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
+// if ("2".equals(mesReturn.getSuccess())) {
+// return R.error("閰嶇洏涓嶆纭�");
+// }else {
+// log.info("閰嶇洏姝ｇ‘锛屽厑璁稿叆搴�");
+// }
+// }
+// } catch (Exception e) {
+// return R.error("MES鍦板潃杩炴帴瓒呮椂");
+// }
+
}
List<WaitPakin> waitPakins = null;
if (param.getIoType() == 1) {
@@ -315,6 +344,8 @@
}
//鏌ョ湅鏄惁鏈夌浉鍏崇殑AGV鎼繍浠诲姟瀛樺湪
List<Task> tasks = taskService.selectList(new EntityWrapper<Task>()
+ .eq("task_type", "AGV琛ョ┖鏂欐灦")
+ .andNew()
.in("sta_no", wrkMast.getStaNo(),wrkMast.getMemo())
.or()
.in("source_sta_no", wrkMast.getStaNo(),wrkMast.getMemo()));
--
Gitblit v1.9.1