From 849409866c1372f5daf7becf9aec054922e260b2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 14 二月 2025 13:20:23 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index b815fa0..0f417f3 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -1,6 +1,5 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -8,7 +7,11 @@
import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.constant.AsrsConstants;
+import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.AgvLocMast;
+import com.zy.asrs.entity.AgvWrkDetl;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.AgvLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
@@ -97,17 +100,22 @@
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
if (type != null) {
- wrapper.notLike("loc_no", "F1");
+ if (type.equals(AsrsConstants.ERCHANG)){
+ wrapper.notLike("loc_no", "F3");
+ }else {
+ wrapper.notLike("loc_no", "F1");
+ }
}
wapperSetCondition(wrapper, "batch", batch);
wapperSetCondition(wrapper, "three_code", csocode);
- wapperSetCondition(wrapper, "dead_time", isoseq);
+ //wapperSetCondition(wrapper, "dead_time", isoseq);
if ("JG".equals(orderNo.substring(0, 2))) {
wapperSetCondition(wrapper, "process_sts", "1");
}
List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
+
for (AgvLocDetl agvLocDetl : agvLocDetls) {
//鍒ゆ柇褰撳墠搴撲綅璐х墿鏄惁F鍦ㄥ簱
@@ -133,7 +141,39 @@
//褰撳墠搴撲綅鎵�澶勬ゼ灞�
int floor = Integer.parseInt(agvLocDetl.getLocNo().split("F")[1]);
//locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
- locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), floor));
+ //鍥涙湡
+ //locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), floor));
+
+ List<String> strings = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1());
+ List<String> agvStaNos = new ArrayList<>();
+ if (agvLocDetl.getLocNo().contains("01F1")) {
+ for (String string : strings) {
+ if (string.contains("F1") || string.contains("F4")) {
+ agvStaNos.add(string);
+ }
+ }
+ } else if (agvLocDetl.getLocNo().contains("02F1")) {
+ for (String string : strings) {
+ if (string.contains("F1") || string.contains("F4")) {
+ agvStaNos.add(string);
+ }
+ }
+ } else if (agvLocDetl.getLocNo().contains("F2")) {
+ for (String string : strings) {
+ if (string.contains("F2") || string.contains("F4")) {
+ agvStaNos.add(string);
+ }
+ }
+ } else if (agvLocDetl.getLocNo().contains("F3")) {
+ for (String string : strings) {
+ if (string.contains("F3")) {
+ agvStaNos.add(string);
+ }
+ }
+ } else {
+ agvStaNos = strings;
+ }
+ locDto.setAgvStaNos(agvStaNos);
locDtoList.add(locDto);
issued -= anfme;
--
Gitblit v1.9.1