From 61eb8dfa4ff44b539d9dd03205705270ba6e1fa7 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 10 一月 2026 14:38:00 +0800
Subject: [PATCH] 库位锁定或释放 添加任务自动下发功能
---
src/main/java/com/zy/api/controller/params/WorkTaskParams.java | 3 +
src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java | 8 +++
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 45 +++++++++++++++++++---
src/main/java/com/zy/common/constant/MesConstant.java | 8 ++++
src/main/java/com/zy/api/service/WcsApiService.java | 12 ++++++
5 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/params/WorkTaskParams.java b/src/main/java/com/zy/api/controller/params/WorkTaskParams.java
index 0a86af1..e5bc4c4 100644
--- a/src/main/java/com/zy/api/controller/params/WorkTaskParams.java
+++ b/src/main/java/com/zy/api/controller/params/WorkTaskParams.java
@@ -33,4 +33,7 @@
@ApiModelProperty("鍑哄簱绔欑偣")
private String staNo;
+ @ApiModelProperty("浣滀笟绫诲瀷锛宨n: 鍏ュ簱锛� out:鍑哄簱")
+ private String type;
+
}
diff --git a/src/main/java/com/zy/api/service/WcsApiService.java b/src/main/java/com/zy/api/service/WcsApiService.java
index bc79a40..4f5434b 100644
--- a/src/main/java/com/zy/api/service/WcsApiService.java
+++ b/src/main/java/com/zy/api/service/WcsApiService.java
@@ -4,6 +4,8 @@
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
+import java.util.Set;
+
public interface WcsApiService {
/**
@@ -32,4 +34,14 @@
* @return com.core.common.R
*/
R pubWrkToWcs(WorkTaskParams params);
+
+
+ /**
+ * 閿佸畾鎴栭噴鏀惧簱浣�
+ * @author Ryan
+ * @date 2026/1/10 14:35
+ * @param locs
+ * @param type
+ */
+ void reportLockLocs(Set<String> locs, String type);
}
diff --git a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
index 9a60b44..3881dc5 100644
--- a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
@@ -5,6 +5,7 @@
import com.core.exception.CoolException;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.service.HmesApiService;
+import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.BasDevice;
import com.zy.asrs.entity.LocAroundBind;
import com.zy.asrs.entity.LocMast;
@@ -33,6 +34,9 @@
@Autowired
private LocMastService locMastService;
+
+ @Autowired
+ private WcsApiService wcsApiService;
/**
* 鎺ユ敹MES绌跨嚎浠诲姟
* @author Ryan
@@ -119,6 +123,8 @@
}
});
- return R.ok();
+ wcsApiService.reportLockLocs(locs, "lock");
+
+ return R.ok("閲婃斁鎴愬姛 锛侊紒");
}
}
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 0186fd0..ede488a 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -61,7 +61,7 @@
}
Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
- reportLockLocs(locs);
+ reportLockLocs(locs, "lock");
return R.ok("涓婃姤鎴愬姛锛侊紒");
}
@@ -109,26 +109,59 @@
*/
@Override
public R pubWrkToWcs(WorkTaskParams params) {
+ if (Objects.isNull(params.getTaskNo())) {
+ return R.error("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(params.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(params.getLocNo())) {
+ return R.error("鐩爣搴撲綅涓嶈兘涓虹┖锛侊紒");
+ }
+ String url = MesConstant.PUB_TASK_IN;
+ if (Objects.isNull(params.getType()) && params.getType().equals("out")) {
+ url = MesConstant.PUB_TASK_OUT;
+ }
+ String response;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.URL)
+ .setPath(url)
+ .setJson(JSON.toJSONString(params))
+ .build()
+ .doPost();
+ R result = JSON.parseObject(response, R.class);
-
-
+ if (result.get("code").equals("200")) {
+ //TODO 涓婃姤鏄惁鎴愬姛
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
return null;
}
/**
- * 涓婃姤閿佸畾搴撲綅淇℃伅
+ * 涓婃姤閿佸畾/閲婃斁搴撲綅淇℃伅
* @author Ryan
* @date 2026/1/10 12:50
* @param locs
*/
+ @Override
@Transactional(rollbackFor = Exception.class)
- public void reportLockLocs(Set<String> locs) {
+ public void reportLockLocs(Set<String> locs, String type) {
+ String url = MesConstant.LOCK_LOCS_URL;
+ if (!Objects.isNull(type)) {
+ if (type.equals("release")) {
+ url = MesConstant.RELEASE_LOCS_URL;
+ }
+ }
String response;
try {
response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
- .setPath(MesConstant.LOCK_LOCS_URL)
+ .setPath(url)
.setJson(JSON.toJSONString(locs))
.build()
.doPost();
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
index 20ffdca..52297d0 100644
--- a/src/main/java/com/zy/common/constant/MesConstant.java
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -17,6 +17,14 @@
/***涓婃姤MES锛岄攣瀹氬悓杈瑰簱浣�*/
public static final String LOCK_LOCS_URL = "";
+ /***閲婃斁搴撲綅閾炬帴*/
+ public static final String RELEASE_LOCS_URL = "";
+
+ /***鐢宠鍏ュ簱浠诲姟*/
+ public static final String PUB_TASK_IN = "/openapi/createInTask";
+
+ /***鐢宠鍑哄簱浠诲姟*/
+ public static final String PUB_TASK_OUT = "/openapi/createOutTask";
/**
* token閫氳繃header浼犻�掔殑鍚嶇О
--
Gitblit v1.9.1