From 0379bbe120f509f8c330713958b59687d25b80b3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 08 二月 2025 16:34:50 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 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 fbf95e5..d702e36 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,10 @@
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.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;
@@ -93,18 +95,20 @@
}
- public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq, String type) {
+ public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq, String type2) {
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
- if (type != null) {
- wrapper.notLike("loc_no", "F1");
- }
+// if (type != null) {
+// 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");
+ } else {
+ wrapper.ne("process_sts", "1");
}
List<AgvLocDetl> agvLocDetls = this.selectList(wrapper);
@@ -136,7 +140,37 @@
//locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
//鍥涙湡
//locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), floor));
- locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1()));
+
+ 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