From f0226479e92a906950aac0834048cc709e032e97 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 24 十二月 2025 09:17:44 +0800
Subject: [PATCH] 奥普瑞斯从侧面口进出，盘点拣料功能修复
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 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 38a457c..4d03fa8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -372,7 +372,7 @@
// 绌烘墭鍑哄簱
if (StringUtils.isEmpty(mesOutApply.getOrderNo()) && "01".equals(mesOutApply.getTransType())) {
// 鐢熸垚绌烘墭鍑哄簱浠诲姟
- mobileService.callEmptyBinOutBound(mesOutApply,WMS_TRANS_START_STATION_1,"1",defaultUserId);
+ mobileService.callEmptyBinOutBound(mesOutApply,mesOutApply.getStationId().startsWith("LL") ? WMS_TRANS_START_STATION_3 : WMS_TRANS_START_STATION_1,"1",1,defaultUserId);
// try {
// if (!StringUtils.isEmpty(mesOutApply.getTaskno()) && !StringUtils.isEmpty(mesOutApply.getStationId())) {
@@ -477,8 +477,13 @@
wrkMast.setIoType(101); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(1);
- wrkMast.setSourceStaNo("203"); // 婧愮珯
- wrkMast.setStaNo("204"); // 鐩爣绔�
+ if(mesOutApply.getStationId().startsWith("LL")) {
+ wrkMast.setSourceStaNo("203"); // 婧愮珯
+ wrkMast.setStaNo("204"); // 鐩爣绔�
+ } else {
+ wrkMast.setSourceStaNo("205"); // 婧愮珯
+ wrkMast.setStaNo("205"); // 鐩爣绔�
+ }
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -586,8 +591,8 @@
transTask.setOrderNo(mesInApply.getOrderNo());
transTask.setTransType(mesInApply.getTransType());
transTask.setCurProcess(mesInApply.getProductLineId());
- transTask.setCurStationId("A3");
- transTask.setNextStationId("A4");
+ transTask.setCurStationId(mesInApply.getStationID());
+ transTask.setNextStationId(mesInApply.getStationID().startsWith("LL") ? WMS_TRANS_START_STATION_2 : WMS_TRANS_START_STATION_1);
transTask.setItemno(WMS_ZPALLET_ID); // 鍥哄畾涓虹┖鎵樼殑缂栫爜
transTask.setQty(1); // 绌烘墭鍙洖1涓�
transTask.setProductLineId(mesInApply.getProductLineId());
@@ -595,7 +600,7 @@
transTask.setAgvFactory(1);
JSONObject sendAgvTask = submitTask(transTask);
if (!"1".equals(sendAgvTask.getString("Success"))) {
- log.error("鍑哄簱涓嬪彂agv杩愯緭浠诲姟澶辫触,{}", JSONObject.toJSONString(transTask));
+ log.error("鍏ュ簱涓嬪彂agv杩愯緭浠诲姟澶辫触,{}", JSONObject.toJSONString(transTask));
return 2;
}
} else {
@@ -678,7 +683,6 @@
OrderInAndOutUtil.updateOrder(Boolean.TRUE, orderPakin.getId(), 2L, defaultUserId);
// 鍛煎彨AGV浠庝骇绾胯繍鍥炵珛搴�
- try {
if (!StringUtils.isEmpty(mesInApply.getTaskno())) {
TransTask transTask = new TransTask();
transTask.setTaskno(mesInApply.getTaskno());
@@ -687,7 +691,7 @@
transTask.setTransType(mesInApply.getTransType());
transTask.setCurProcess(mesInApply.getProductLineId());
transTask.setCurStationId(mesInApply.getStationID());
- transTask.setNextStationId(WMS_TRANS_START_STATION_2);
+ transTask.setNextStationId(mesInApply.getStationID().startsWith("LL") ? WMS_TRANS_START_STATION_2 : WMS_TRANS_START_STATION_1);
transTask.setItemno(mesInApply.getItemno());
transTask.setQty(mesInApply.getQty());
transTask.setProductLineId(mesInApply.getProductLineId());
@@ -697,12 +701,12 @@
transTask.setAgvFactory(1);
JSONObject sendAgvTask = submitTask(transTask);
if (!"1".equals(sendAgvTask.getString("Success"))) {
- log.error("鍑哄簱涓嬪彂agv杩愯緭浠诲姟澶辫触:{}", JSONObject.toJSONString(transTask));
+ log.error("鍏ュ簱涓嬪彂agv杩愯緭浠诲姟澶辫触:{}", JSONObject.toJSONString(transTask));
+ throw new CoolException("鍏ュ簱涓嬪彂agv杩愯緭浠诲姟澶辫触");
}
+ } else {
+ throw new CoolException("MES鍏ュ簱涓嬪彂agv杩愯緭浠诲姟澶辫触");
}
- } catch (Exception e) {
- log.error("涓嬪彂AGV杩愯緭浠诲姟澶辫触", e);
- }
}
return 1;
@@ -973,7 +977,7 @@
transTask.setOrderNo(dbMemo.getString("OrderNo"));
transTask.setTransType(dbMemo.getString("TransType"));
// transTask.setCurProcess();
- transTask.setCurStationId(WMS_TRANS_START_STATION_1);
+ transTask.setCurStationId(WMS_TRANS_START_STATION_3);
transTask.setNextProcess(dbMemo.getString("ProductLineId"));
transTask.setNextStationId(dbMemo.getString("StationId"));
transTask.setItemno(dbMemo.getString("Itemno"));
@@ -984,7 +988,7 @@
transTask.setAgvFactory(1);
JSONObject sendAgvTask = submitTask(transTask);
if (!"1".equals(sendAgvTask.getString("Success"))) {
- log.error("鍑哄簱涓嬪彂agv杩愯緭浠诲姟澶辫触", JSONObject.toJSONString(transTask));
+ log.error("鍑哄簱涓嬪彂agv杩愯緭浠诲姟澶辫触:{}", JSONObject.toJSONString(transTask));
}
}
} else {
@@ -1074,7 +1078,6 @@
/**
* 9.1涓嬪彂杩愯緭浠诲姟
- * TODO:鍏朵粬搴撶殑浠诲姟鍏ㄩ儴杞埌婊戝潡搴撶粺涓�璋冨害
*
* @param transTask
* @return
@@ -1124,12 +1127,6 @@
// 杞彂缁欐捣搴锋垨鍗庢檽RCS
RcsReturn rcsReturn = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
if (rcsReturn.getCode().equals("SUCCESS")) {
- JSONObject data = rcsReturn.getData();
- String robotTaskCode = data.getString("robotTaskCode");
- if (Cools.isEmpty(transTask.getTaskno())) {
- transTask.setTaskno(robotTaskCode);
- result.put("taskno", transTask.getTaskno());
- }
int workNo = commonService.getWorkNo(WorkNoType.OTHER.type);
Date now = new Date();
Task task = new Task();
@@ -1161,7 +1158,7 @@
taskDetl.setSpecs(mat.getSpecs());
taskDetl.setOrderNo(transTask.getOrderNo());
taskDetl.setZpallet(transTask.getTuoPanId());
- taskDetl.setMemo(barCodeListToStr(transTask.getItemBarcode()));
+ taskDetl.setMemo(Cools.isEmpty(transTask.getItemBarcode()) ? "":barCodeListToStr(transTask.getItemBarcode()));
taskDetl.setModiUser(defaultUserId);
taskDetl.setModiTime(now);
taskDetl.setAppeUser(defaultUserId);
--
Gitblit v1.9.1