From 4aebedd582c7b1beb23df39829c341b40343e2ce Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 21 十二月 2025 16:16:16 +0800
Subject: [PATCH] pda相关功能开发完善
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 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..3150545 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,WMS_TRANS_START_STATION_1,"1",1,defaultUserId);
// try {
// if (!StringUtils.isEmpty(mesOutApply.getTaskno()) && !StringUtils.isEmpty(mesOutApply.getStationId())) {
@@ -586,8 +586,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(WMS_TRANS_START_STATION_2);
transTask.setItemno(WMS_ZPALLET_ID); // 鍥哄畾涓虹┖鎵樼殑缂栫爜
transTask.setQty(1); // 绌烘墭鍙洖1涓�
transTask.setProductLineId(mesInApply.getProductLineId());
@@ -595,7 +595,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 +678,6 @@
OrderInAndOutUtil.updateOrder(Boolean.TRUE, orderPakin.getId(), 2L, defaultUserId);
// 鍛煎彨AGV浠庝骇绾胯繍鍥炵珛搴�
- try {
if (!StringUtils.isEmpty(mesInApply.getTaskno())) {
TransTask transTask = new TransTask();
transTask.setTaskno(mesInApply.getTaskno());
@@ -697,12 +696,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;
@@ -984,7 +983,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 +1073,6 @@
/**
* 9.1涓嬪彂杩愯緭浠诲姟
- * TODO:鍏朵粬搴撶殑浠诲姟鍏ㄩ儴杞埌婊戝潡搴撶粺涓�璋冨害
*
* @param transTask
* @return
@@ -1124,12 +1122,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 +1153,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