From 74863c38a407b1e0f36250dfa0c63e5da7fe5f66 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 一月 2026 18:06:51 +0800
Subject: [PATCH] WMS功能完善
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
index 1c92379..b2fa41e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -273,7 +273,9 @@
// 缁堢偣涓虹┖锛岃绠楁帴椹充綅
BasStation basStation = null;
if (Cools.isEmpty(mesOutApply.getNextStationId())) {
- List<BasStation> basStations = basStationService.selectList(new EntityWrapper<BasStation>().eq("loc_sts", "O"));
+ // 1.杩炴潌绾匡紝2.铻烘潌绾�
+ int productionLine = mesOutApply.getStationId().startsWith("LL") ? 1 : 2;
+ List<BasStation> basStations = basStationService.selectList(new EntityWrapper<BasStation>().eq("loc_sts", "O").eq("area_id",productionLine));
if (basStations.isEmpty()) {
mesReturn.setSuccess("2");
mesReturn.setMessage("鏃犵┖鎺ラ┏浣嶏紝璇风◢鍚庡啀璇�!");
@@ -712,9 +714,9 @@
// 涓嬪彂缁橰CS
RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
// 妯℃澘鍚�
- if(transTask.getCurStationId().startsWith("LL") || transTask.getCurStationId().startsWith("LG")) { // 璧风偣浜х嚎
+ if(transTask.getCurStationId().startsWith("LL") || transTask.getCurStationId().startsWith("LJ")|| transTask.getCurStationId().startsWith("LG") || transTask.getCurStationId().startsWith("LT")) { // 璧风偣浜х嚎
rcsTaskSubmit.setTaskType("DJ1");
- } else if(transTask.getNextStationId().startsWith("LL") || transTask.getNextStationId().startsWith("LG")) { // 缁堢偣浜х嚎
+ } else if(transTask.getNextStationId().startsWith("LL") || transTask.getNextStationId().startsWith("LJ")|| transTask.getNextStationId().startsWith("LG") || transTask.getNextStationId().startsWith("LT")) { // 缁堢偣浜х嚎
rcsTaskSubmit.setTaskType("DJ2");
}
rcsTaskSubmit.setRobotTaskCode(transTask.getTaskno());
@@ -848,7 +850,7 @@
*/
public int applyInStation(TransParent apply) {
- String url = MES_URL + (apply.getProductLineId().equals("LL") ? "AGVTransportPalletNotice" : "Aprs/AGVTransportPalletNotice");
+ String url = MES_URL + (apply.getProductLineId().equals("LL") || apply.getProductLineId().equals("LJ") ? "AGVTransportPalletNotice" : "Aprs/AGVTransportPalletNotice");
String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(apply));
if (!StringUtils.isEmpty(response) && response.contains("Success")){
MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
@@ -960,7 +962,7 @@
*/
public int outStation(TransParent apply) {
- String url = MES_URL + (apply.getProductLineId().equals("LL") ? "AGVDepartureCompleted" : "Aprs/AGVDepartureCompleted");
+ String url = MES_URL + (apply.getProductLineId().equals("LL") || apply.getProductLineId().equals("LJ") ? "AGVDepartureCompleted" : "Aprs/AGVDepartureCompleted");
String response = RcsServiceImpl.sendPost(url, JSONObject.toJSONString(apply));
if (!StringUtils.isEmpty(response) && response.contains("Success")){
MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
@@ -1008,7 +1010,7 @@
stockDetl.setAnfme(locDetl.getAnfme());
stockDetls.add(stockDetl);
}
- dtLocDetailVo.setLocDetl(stockDetls);
+ dtLocDetailVo.setLocDetls(stockDetls);
dtLocDetailVoList.add(dtLocDetailVo);
}
--
Gitblit v1.9.1