From 973eed10d720c7dbd0020407c3b89fe1d385944f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 十二月 2025 09:42:20 +0800
Subject: [PATCH] wms功能完善
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 de80492..02b555d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -1,23 +1,21 @@
package com.zy.asrs.service.impl;
-import com.alibaba.excel.util.DateUtils;
import com.alibaba.excel.util.StringUtils;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.mes.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
-import com.zy.asrs.entity.rcs.*;
+import com.zy.asrs.entity.rcs.RcsReporterTask;
+import com.zy.asrs.entity.rcs.RcsTaskContinue;
+import com.zy.asrs.entity.rcs.RcsTaskSubmit;
+import com.zy.asrs.entity.rcs.RcsTaskTargetRoute;
import com.zy.asrs.mapper.AgvInfoMapper;
import com.zy.asrs.mapper.MatItemBarcodeMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.model.DetlDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import lombok.extern.slf4j.Slf4j;
@@ -29,9 +27,7 @@
import javax.annotation.Resource;
import java.text.ParseException;
import java.util.*;
-import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
@Slf4j
@Service
@@ -108,10 +104,8 @@
MesReturn mesReturn = new MesReturn();
// 1銆佺墿鏂欎俊鎭悓姝�
- int matSuccess = 0;
for (MesMatInfo mesMatInfo : matRecvForm.getItemdata()) {
if (synMatInfo(mesMatInfo) == 1) {
- matSuccess++;
} else {
throw new CoolException("鍚屾鐗╂枡淇℃伅澶辫触");
}
@@ -454,7 +448,6 @@
throw new CoolException("淇濆瓨鍑哄簱璁㈠崟鏄庣粏妗ｅけ璐�");
}
- // TODO锛氳嫢AGV鍜岃緭閫佺嚎娌℃湁瀹夊叏浜や簰锛屽垯瑕佷繚璇佺珛搴撳嚭璐у畬鎴愬悗鍐嶅懠鍙獳GV銆�
// 绔嬪簱鐢熸垚璁㈠崟鍚庯紝鑷姩璋冨害AGV杩愰�佸埌绔欑偣锛岀洰鍓嶅鎵樼敓鎴愬涓��
try {
if (!StringUtils.isEmpty(mesOutApply.getTaskno()) && !StringUtils.isEmpty(mesOutApply.getStationId())) {
@@ -708,7 +701,7 @@
mesOutFeedback.setStationId(dbMemo.getString("StationId"));
mesOutFeedback.setItemno(dbMemo.getString("Itemno"));
mesOutFeedback.setTuoPanId(zpalletId);
- if (itemBarCode != null && itemBarCode.size() > 0) {
+ if (itemBarCode.size() > 0) {
mesOutFeedback.setQty(itemBarCode.size());
mesOutFeedback.setItemBarcode(itemBarCode);
}
@@ -1030,6 +1023,14 @@
// 涓嬪彂缁橰CS
RcsTaskSubmit rcsTaskSubmit = new RcsTaskSubmit();
+ // 妯℃澘鍚�
+ if(transTask.getCurStationId().startsWith("LL") || transTask.getCurStationId().startsWith("LG")) { // 璧风偣浜х嚎
+ rcsTaskSubmit.setTaskType("CS2");
+ } else if(transTask.getNextStationId().startsWith("LL") || transTask.getNextStationId().startsWith("LG")) { // 缁堢偣浜х嚎
+ rcsTaskSubmit.setTaskType("CS");
+ } else { // 涓嶆秹鍙婁骇绾�
+ rcsTaskSubmit.setTaskType("CS3");
+ }
rcsTaskSubmit.setRobotTaskCode(transTask.getTaskno());
rcsTaskSubmit.setInitPriority(10); //榛樿10
List<RcsTaskTargetRoute> targetRouteList = new ArrayList<>();
@@ -1046,8 +1047,7 @@
rcsTaskSubmit.setTargetRoute(targetRouteList);
// 杞彂缁欐捣搴锋垨鍗庢檽RCS
-// int success = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
- int success = 1;
+ int success = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
if (success == 1) {
int workNo = commonService.getWorkNo(WorkNoType.OTHER.type);
Date now = new Date();
--
Gitblit v1.9.1