From b51e3b3d5bb721cec65952498d1c2c882d1a01d6 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 15 十二月 2025 17:14:22 +0800
Subject: [PATCH] wms功能完善
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 198 ++++++++++++++++++++-----------------------------
1 files changed, 81 insertions(+), 117 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 2b93d99..e6b7a13 100644
--- a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.excel.util.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
@@ -272,6 +273,7 @@
* @param mesOutApply
* @return 1 鎴愬姛锛�-1 璁㈠崟閲嶅锛�
*/
+ @Transactional
public int outBoundOrder(MesInApply mesOutApply){
// docType鏍规嵁搴撶被鍨嬬‘瀹�
@@ -300,7 +302,7 @@
orderPakout.setMemo(JSONObject.toJSONString(mesOutApply));
orderPakout.setPakinPakoutStatus(2);
if (!orderPakoutService.insert(orderPakout)) {
- log.error("MES淇濆瓨鍑哄簱璁㈠崟涓绘。澶辫触");
+ log.error("MES淇濆瓨鍑哄簱璁㈠崟涓绘。澶辫触:{}",orderPakout);
throw new CoolException("淇濆瓨鍑哄簱璁㈠崟涓绘。澶辫触");
}
@@ -310,7 +312,7 @@
OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
orderDetlPakout.setOrderId(orderPakout.getId());
orderDetlPakout.setOrderNo(orderPakout.getOrderNo());
- orderDetlPakout.setAnfme(Double.valueOf(item.getAnfme()));
+ orderDetlPakout.setAnfme(item.getAnfme());
orderDetlPakout.setQty(0.0);
orderDetlPakout.setMatnr(mat.getMatnr());
orderDetlPakout.setMaktx(mat.getMaktx());
@@ -323,61 +325,37 @@
orderDetlPakout.setStatus(1);
orderDetlPakout.setPakinPakoutStatus(2);
if (!orderDetlPakoutService.insert(orderDetlPakout)) {
- log.error("MES淇濆瓨鍑哄簱璁㈠崟鏄庣粏妗ｅけ璐�");
+ log.error("MES淇濆瓨鍑哄簱璁㈠崟鏄庣粏妗ｅけ璐�:{}",orderDetlPakout);
throw new CoolException("淇濆瓨鍑哄簱璁㈠崟鏄庣粏妗ｅけ璐�");
}
}
// TODO锛欳TU鍑哄簱鍔ㄤ綔
- // todo 鍛煎彨agv浜х嚎鍙栫┖鏂欐灦
- // TODO锛氳嫢AGV鍜岃緭閫佺嚎娌℃湁瀹夊叏浜や簰锛屽垯瑕佷繚璇佺珛搴撳嚭璐у畬鎴愬悗鍐嶅懠鍙獳GV銆�
// 绔嬪簱鐢熸垚璁㈠崟鍚庯紝鑷姩璋冨害AGV浠庝骇绾胯繍杈撶┖鍒�鏋惰嚦绔嬪簱缂撳瓨鍖恒��
- try {
if (!StringUtils.isEmpty(mesOutApply.getTaskNo()) && !StringUtils.isEmpty(mesOutApply.getStationId())) {
TransTask transTask = new TransTask();
transTask.setTaskno(mesOutApply.getTaskNo());
-// transTask.setTaskname(mesOutApply.getTaskname());
+ transTask.setTaskname(mesOutApply.getTaskname());
transTask.setOrderNo(mesOutApply.getOrderNo());
transTask.setTransType("02"); //杩愬洖鍒�鏋舵椂榛樿02锛堜笅绌烘墭锛� mesOutApply.getTransType()
transTask.setCurProcess(mesOutApply.getProductLineId());
transTask.setCurStationId(mesOutApply.getStationId());
-// transTask.setNextProcess();
- transTask.setNextStationId(WMS_TRANS_START_STATION_1);
+ transTask.setNextProcess(mesOutApply.getProductLineId());
+ transTask.setNextStationId(mesOutApply.getNextStationId());
// transTask.setItemno(mesOutApply.getItemNo());
- transTask.setQty(0);
+ transTask.setQty(1);
transTask.setProductLineId(mesOutApply.getProductLineId());
// transTask.setItemBarcode(codes);
// transTask.setTuoPanId(entry.getKey());
+ transTask.setDjNo(mesOutApply.getDjNo());
transTask.setOperateType(1);
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));
}
-
-
-// // 鎸夐浂浠朵簩缁寸爜鏌ヨ鏈夊嚑涓墭锛屽鎵樼敓鎴愬涓换鍔★紝姣忔墭瀵瑰簲闆朵欢浜岀淮鐮�
-//// String barCode = barCodeListToStr(mesOutApply.getItemBarcode());
-// EntityWrapper<MatItemBarcode> matItemBarcodeEntityWrapper = new EntityWrapper<>();
-// matItemBarcodeEntityWrapper.in("item_barcode", barCode);
-// List<MatItemBarcode> barcodes = matItemBarcodeMapper.selectList(matItemBarcodeEntityWrapper);
-// if (barcodes != null) {
-// Map<String, List<MatItemBarcode>> map = barcodes.stream().collect(Collectors.groupingBy(MatItemBarcode::getZapplet));
-// for (Map.Entry<String, List<MatItemBarcode>> entry : map.entrySet()) {
-// List<MatItemBarcode> list = entry.getValue();
-// List<String> codes = new ArrayList<>();
-// for (MatItemBarcode zapllet : list) {
-// codes.add(zapllet.getItemBarcode());
-// }
-//
-//
-// }
-// }
}
- } catch (Exception e) {
- log.error("涓嬪彂AGV杩愯緭浠诲姟澶辫触", e);
- }
return 1;
}
@@ -423,6 +401,7 @@
* @param mesInApply
* @return 1 鎴愬姛锛�-1 鍏ュ簱璁㈠崟閲嶅锛�0 閮ㄥ垎澶辫触锛�
*/
+ @Transactional
public int inBoundOrder(MesInApply mesInApply, int check){
// docType鏍规嵁搴撶被鍨嬬‘瀹�
@@ -461,7 +440,7 @@
OrderDetlPakin orderDetlPakin = new OrderDetlPakin();
orderDetlPakin.setOrderId(orderPakin.getId());
orderDetlPakin.setOrderNo(orderPakin.getOrderNo());
- orderDetlPakin.setAnfme(Double.valueOf(item.getAnfme()));
+ orderDetlPakin.setAnfme(item.getAnfme());
orderDetlPakin.setQty(0.0);
orderDetlPakin.setMatnr(mat.getMatnr());
orderDetlPakin.setMaktx(mat.getMaktx());
@@ -483,6 +462,28 @@
}
}
+ // 鍛煎彨agv鎼繍
+ if (!StringUtils.isEmpty(mesInApply.getTaskNo())) {
+ TransTask transTask = new TransTask();
+ transTask.setTaskno(mesInApply.getTaskNo());
+ transTask.setTaskname(mesInApply.getTaskNo());
+ transTask.setOrderNo(mesInApply.getOrderNo());
+ transTask.setTransType(mesInApply.getTransType());
+ transTask.setCurProcess(mesInApply.getProductLineId());
+ transTask.setCurStationId(mesInApply.getStationId());
+ transTask.setNextStationId(WMS_TRANS_START_STATION_1);
+// transTask.setItemno(mesInApply.get());
+// transTask.setQty(mesInApply.getQty());
+ transTask.setProductLineId(mesInApply.getProductLineId());
+// transTask.setItemBarcode(itemBarcode);
+ transTask.setDjNo(mesInApply.getDjNo());
+ transTask.setOperateType(1);
+ transTask.setAgvFactory(1);
+ JSONObject sendAgvTask = submitTask(transTask);
+ if (!"1".equals(sendAgvTask.getString("Success"))) {
+ log.error("鍑哄簱涓嬪彂agv杩愯緭浠诲姟澶辫触:{}", JSONObject.toJSONString(transTask));
+ }
+ }
// // TODO:鏄惁缁戝畾璐х墿鍜屾墭鐩�?
@@ -726,11 +727,32 @@
List<Task> tasks = taskService.selectList(wrapper);
if (tasks != null && !tasks.isEmpty()) {
result.put("Success", "2");
- result.put("Message", "浠诲姟閲嶅鍙戦��");
+ result.put("Message", "浠诲姟鍙烽噸澶嶅彂閫侊細" + transTask.getTaskno());
return result;
}
- try {
+ // 涓嬪彂缁橰CS
+ RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
+ // 妯℃澘鍚�
+ rcsTaskSubmit.setTaskType("CS");
+ rcsTaskSubmit.setRobotTaskCode(transTask.getTaskno());
+ rcsTaskSubmit.setInitPriority(10); //榛樿10
+ List<RcsTaskTargetRoute> targetRouteList = new ArrayList<>();
+ RcsTaskTargetRoute startRoute = new RcsTaskTargetRoute();
+ startRoute.setSeq(0);
+ startRoute.setCode(transTask.getCurStationId());
+ startRoute.setOperation("COLLECT");
+ targetRouteList.add(startRoute);
+ RcsTaskTargetRoute endRoute = new RcsTaskTargetRoute();
+ endRoute.setSeq(1);
+ endRoute.setCode(transTask.getNextStationId());
+ endRoute.setOperation("DELIVERY");
+ targetRouteList.add(endRoute);
+ rcsTaskSubmit.setTargetRoute(targetRouteList);
+
+ // 杞彂缁欐捣搴锋垨鍗庢檽RCS
+ RcsReturn rcsReturn = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
+ if (rcsReturn.getCode().equals("SUCCESS")) {
int workNo = commonService.getWorkNo(WorkNoType.OTHER.type);
Date now = new Date();
Task task = new Task();
@@ -747,87 +769,30 @@
task.setAppeUser(defaultUserId);
task.setAppeTime(now);
task.setTaskNo(transTask.getTaskno());
+ task.setBarcode(transTask.getDjNo()); // 鍒�鏋跺彿
task.setMemo(JSONObject.toJSONString(transTask));
+ taskService.insert(task);
- if (taskService.insert(task)) {
- Mat mat = matService.selectByMatnr("emptyDj");
- TaskDetl taskDetl = new TaskDetl();
- taskDetl.setWrkNo(task.getWrkNo());
- taskDetl.setIoTime(task.getIoTime());
- taskDetl.setMatnr(mat.getMatnr());
- taskDetl.setAnfme(0.0);
- taskDetl.setStandby1(String.valueOf(transTask.getQty()));
- taskDetl.setMaktx(mat.getMaktx());
- taskDetl.setSpecs(mat.getSpecs());
- taskDetl.setOrderNo(transTask.getOrderNo());
- taskDetl.setModiUser(defaultUserId);
- taskDetl.setModiTime(now);
- taskDetl.setAppeUser(defaultUserId);
- taskDetl.setAppeTime(now);
- taskDetlService.insert(taskDetl);
+ Mat mat = matService.selectByMatnr("emptyDj");
+ TaskDetl taskDetl = new TaskDetl();
+ taskDetl.setWrkNo(task.getWrkNo());
+ taskDetl.setIoTime(task.getIoTime());
+ taskDetl.setMatnr(mat.getMatnr());
+ taskDetl.setAnfme(1.0);
+ taskDetl.setMaktx(mat.getMaktx());
+ taskDetl.setSpecs(mat.getSpecs());
+ taskDetl.setOrderNo(transTask.getOrderNo());
+ taskDetl.setModiUser(defaultUserId);
+ taskDetl.setModiTime(now);
+ taskDetl.setAppeUser(defaultUserId);
+ taskDetl.setAppeTime(now);
+ taskDetlService.insert(taskDetl);
+ result.put("Success", "1");
+ result.put("Message", "浠诲姟鎺ユ敹鎴愬姛");
-// EntityWrapper<WaitPakin> wrapper1 = new EntityWrapper<>();
-// wrapper1.eq("order_no", transTask.getTaskno())
-// .eq("matnr", mat.getMatnr())
-// .eq("anfme", transTask.getQty());
-// WaitPakin waitPakin = waitPakinService.selectOne(wrapper1);
-// if (waitPakin != null)
-// {
-// TaskDetl taskDetl = new TaskDetl();
-// taskDetl.setWrkNo(task.getWrkNo());
-// taskDetl.setIoTime(task.getIoTime());
-// taskDetl.setMatnr(transTask.getItemno());
-// taskDetl.setAnfme(Double.valueOf(transTask.getQty()));
-// taskDetl.setAnfme(0.0);
-// taskDetl.setStandby1(String.valueOf(transTask.getQty()));
-// taskDetl.setZpallet(waitPakin.getZpallet());
-// taskDetl.setMaktx(mat.getMaktx());
-// taskDetl.setSpecs(mat.getSpecs());
-// taskDetl.setOrderNo(transTask.getOrderNo());
-// taskDetl.setModiUser(defaultUserId);
-// taskDetl.setModiTime(now);
-// taskDetl.setAppeUser(defaultUserId);
-// taskDetl.setAppeTime(now);
-// taskDetlService.insert(taskDetl);
-// }
-// else {
-// result.put("Success", "2");
-// result.put("Message", "鎺ユ敹浠诲姟澶辫触");
-// // Throw
-// }
-
- // 涓嬪彂缁橰CS
- RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
- rcsTaskSubmit.setRobotTaskCode(transTask.getTaskno());
- rcsTaskSubmit.setInitPriority(10); //榛樿10
- List<RcsTaskTargetRoute> targetRouteList = new ArrayList<>();
- RcsTaskTargetRoute startRoute = new RcsTaskTargetRoute();
- startRoute.setSeq(0);
- startRoute.setCode(transTask.getCurStationId());
- startRoute.setOperation("COLLECT");
- targetRouteList.add(startRoute);
- RcsTaskTargetRoute endRoute = new RcsTaskTargetRoute();
- endRoute.setSeq(1);
- endRoute.setCode(transTask.getNextStationId());
- endRoute.setOperation("DELIVERY");
- targetRouteList.add(endRoute);
- rcsTaskSubmit.setTargetRoute(targetRouteList);
-
- // 杞彂缁欐捣搴锋垨鍗庢檽RCS
- int success = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
- if (success == 1) {
- result.put("Success", "1");
- result.put("Message", "浠诲姟鎺ユ敹鎴愬姛");
- } else {
- result.put("Success", "2");
- result.put("Message", "浠诲姟涓嬪彂缁橰CS澶辫触");
- }
- } else {
- result.put("Success", "2");
- result.put("Message", "鎺ユ敹浠诲姟澶辫触");
- }
- } catch (Exception e) {
- log.error("涓嬪彂杩愯緭浠诲姟閿欎綅 - {}", transTask, e);
+ } else {
+ result.put("Success", "2");
+ result.put("Message", "浠诲姟涓嬪彂缁橰CS澶辫触");
}
return result;
@@ -1061,9 +1026,8 @@
task.setMemo(JSONObject.toJSONString(transTask));
taskService.updateById(task);
// 杞彂缁欐捣搴锋垨鍗庢檽RCS
- int success = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
-
- if (success == 1) {
+ RcsReturn rcsReturn = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
+ if (rcsReturn.getCode().equals("SUCCESS")) {
flag = true;
}
} catch (Exception e) {
--
Gitblit v1.9.1