From a5b37a13e37118391a535dec6faf9d947bf605f1 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期一, 28 八月 2023 09:00:21 +0800
Subject: [PATCH] #补丁
---
src/main/java/com/zy/asrs/controller/OutController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 986c290..51b87f7 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,6 +1,8 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -8,6 +10,7 @@
import com.core.common.R;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocDto;
import com.zy.common.model.OrderDto;
import com.zy.common.model.OrderMergeVo;
@@ -113,7 +116,7 @@
// 璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
List<OrderDto> orderDtos = new ArrayList<>();
for (LocDto locDto : locDtos) {
- if (isJSON(locDto.getOrderNo())) {
+ if (!isJSON(locDto.getOrderNo())) {
if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getAnfme());
if (OrderDto.has(orderDtos, orderDto)) {
@@ -127,8 +130,7 @@
// 璁㈠崟鍚堝苟鍑哄簱
// List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
- List<OrderDto> orderDtoList = new ArrayList<>();
- orderDtoList.add(new OrderDto(locDto.getOrderNo(),locDto.getMatnr(),locDto.getAnfme()));
+ List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
for (OrderDto one : orderDtoList) {
OrderDto orderDto = new OrderDto(one.getOrderNo(), locDto.getMatnr(), one.getAnfme());
@@ -176,7 +178,45 @@
taskDtos.add(taskDto);
}
}
-
+ List<String> locNos = new ArrayList<>();
+ for (TaskDto taskDto : taskDtos) {
+ if (!locNos.contains(taskDto.getLocNo())){
+ locNos.add(taskDto.getLocNo());
+ }
+ }
+ List<TaskDto> taskDtos1 = new ArrayList<>();
+ for (TaskDto taskDto : taskDtos) {
+ String locNo = taskDto.getLocNo();
+ List<String> groupOuterSingleLoc = Utils.getGroupOuterSingleLoc(locNo);
+ if (Utils.getBay(locNo)>=21){
+ groupOuterSingleLoc = Utils.getGroupOuterSingleLocLowFrequency(locNo);
+ }
+ for (String locNo1 : groupOuterSingleLoc){
+ if (!locNos.contains(locNo1)){
+ locNos.add(locNo1);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo1));
+ if (locMast.getLocSts().equals("F")){
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo1));
+ if (Cools.isEmpty(locDetls) || locDetls.size()==0) {
+ TaskDto taskDto1 = new TaskDto(locNo1, taskDto.getStaNo());
+ taskDtos1.add(taskDto1);
+ }else {
+ List<LocDto> locDtos1 = new ArrayList<>();
+ for (LocDetl locDetl:locDetls){
+ LocDto locDto = new LocDto(locDetl,taskDto.getLocDtos().get(0),"浼寸敓鍑哄簱");
+ locDtos1.add(locDto);
+ }
+ TaskDto taskDto1 = new TaskDto(locNo1, taskDto.getStaNo(),locDtos1);
+ taskDtos1.add(taskDto1);
+ }
+ }else if (locMast.getLocSts().equals("D")){
+ TaskDto taskDto1 = new TaskDto(locNo1, taskDto.getStaNo());
+ taskDtos1.add(taskDto1);
+ }
+ }
+ }
+ }
+ taskDtos.addAll(taskDtos1);
// -----------------------------------------------------------------------------------------------
List<String> excludeLocNos = taskDtos.stream().map(TaskDto::getLocNo).distinct().collect(Collectors.toList());
for (TaskDto taskDto : taskDtos) {
--
Gitblit v1.9.1