From 4f75c44a7efcd1f26aae764c89b2ace8db796d3e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 24 十二月 2025 16:37:22 +0800
Subject: [PATCH] 根据起始站点区分两条产线，分配不同接驳位
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 4 +
src/main/java/com/zy/asrs/controller/MesController.java | 66 +++++++++++++++++----------------
2 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MesController.java b/src/main/java/com/zy/asrs/controller/MesController.java
index 68f483f..a243f80 100644
--- a/src/main/java/com/zy/asrs/controller/MesController.java
+++ b/src/main/java/com/zy/asrs/controller/MesController.java
@@ -63,37 +63,6 @@
return mesService.outBoundOrder(param);
}
-// // 鍑哄簱鐢宠锛堝彨鏂欙級锛岃閰嶅簱銆佹粦鍧楀簱
-// @PostMapping("/api/mes/callOutBoundOrder")
-// public MesReturn callOutBoundOrder(@RequestBody MesCallOutApply param){
-//
-// MesReturn mesReturn = new MesReturn();
-// mesReturn.setSuccess(mesService.callOutBoundOrder(param) == 1 ? "1" : "2");
-// return mesReturn;
-// }
-
- // 鍏ュ簱鐢宠
- @PostMapping("/api/mes/inBoundOrder")
- public MesReturn inBoundOrder(@RequestBody MesInApply param){
-
- MesReturn mesReturn = new MesReturn();
- mesReturn.setSuccess(mesService.inBoundOrder(param, 0) == 1 ? "1" : "2");
- return mesReturn;
- }
-
- @PostMapping("/api/mes/allowInStation")
- @AppAuth(memo = "鍏ョ珯鍏佽")
- public MesReturn allowInStation(@RequestHeader(required = false) String appkey,@RequestBody TransInOutStationAllow param,HttpServletRequest request){
- auth(appkey, param, request);
- return mesService.allowInStation(param);
- }
-
- // 绂荤珯鍏佽锛岃閰嶅簱銆佹粦鍧楀簱
- @PostMapping("/api/mes/allowOutStation")
- public MesReturn allowOutStation(@RequestBody TransInOutStationAllow param){
-
- return mesService.allowOutStation(param);
- }
@Resource
private BasStationService basStationService;
@@ -105,7 +74,8 @@
// 缁堢偣涓虹┖锛岃绠楁帴椹充綅
BasStation basStation = null;
if (Cools.isEmpty(param.getNextStationId())) {
- List<BasStation> basStations = basStationService.selectList(new EntityWrapper<BasStation>().eq("loc_sts", "O"));
+ int productionLine = param.getCurStationId().startsWith("LL") ? 1 : 2;
+ List<BasStation> basStations = basStationService.selectList(new EntityWrapper<BasStation>().eq("loc_sts", "O").eq("area_id",productionLine));
if(basStations.isEmpty()) {
JSONObject result = new JSONObject();
result.put("taskno", param.getTaskno());
@@ -149,6 +119,38 @@
return sendAgvTask;
}
+// // 鍑哄簱鐢宠锛堝彨鏂欙級锛岃閰嶅簱銆佹粦鍧楀簱
+// @PostMapping("/api/mes/callOutBoundOrder")
+// public MesReturn callOutBoundOrder(@RequestBody MesCallOutApply param){
+//
+// MesReturn mesReturn = new MesReturn();
+// mesReturn.setSuccess(mesService.callOutBoundOrder(param) == 1 ? "1" : "2");
+// return mesReturn;
+// }
+
+ // 鍏ュ簱鐢宠
+ @PostMapping("/api/mes/inBoundOrder")
+ public MesReturn inBoundOrder(@RequestBody MesInApply param){
+
+ MesReturn mesReturn = new MesReturn();
+ mesReturn.setSuccess(mesService.inBoundOrder(param, 0) == 1 ? "1" : "2");
+ return mesReturn;
+ }
+
+ @PostMapping("/api/mes/allowInStation")
+ @AppAuth(memo = "鍏ョ珯鍏佽")
+ public MesReturn allowInStation(@RequestHeader(required = false) String appkey,@RequestBody TransInOutStationAllow param,HttpServletRequest request){
+ auth(appkey, param, request);
+ return mesService.allowInStation(param);
+ }
+
+ // 绂荤珯鍏佽锛岃閰嶅簱銆佹粦鍧楀簱
+ @PostMapping("/api/mes/allowOutStation")
+ public MesReturn allowOutStation(@RequestBody TransInOutStationAllow param){
+
+ return mesService.allowOutStation(param);
+ }
+
// 鎺ュ彈鎴愬搧鍒�鍙互鍏ュ簱浜岀淮鐮�
@PostMapping("/api/mes/inBoundItemBarcode")
public MesReturn inBoundItemBarcode(@RequestBody MesItemBarCode param){
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..97ce139 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("鏃犵┖鎺ラ┏浣嶏紝璇风◢鍚庡啀璇�!");
--
Gitblit v1.9.1