From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
src/main/java/com/zy/asrs/controller/OutController.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 50e7ad1..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)) {
@@ -125,7 +128,10 @@
}
} else {
// 璁㈠崟鍚堝苟鍑哄簱
+// List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
+
List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
+
for (OrderDto one : orderDtoList) {
OrderDto orderDto = new OrderDto(one.getOrderNo(), locDto.getMatnr(), one.getAnfme());
if (OrderDto.has(orderDtos, orderDto)) {
@@ -140,12 +146,16 @@
}
for (OrderDto orderDto : orderDtos) {
Order order = orderService.selectByNo(orderDto.getOrderNo());
- if (order.getSettle() > 2) {
- return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
+ if (!Cools.isEmpty(order)){
+ if (order.getSettle() > 2) {
+ return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
}
OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), orderDto.getMatnr(), null);
- if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
- return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
+ if (!Cools.isEmpty(orderDetl)){
+ if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
+ return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
}
}
@@ -168,13 +178,51 @@
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) {
BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
workService.stockOut(staNo, taskDto, getUserId());
- locMastService.breakUp(taskDto.getLocNo(), excludeLocNos);
+// locMastService.breakUp(taskDto.getLocNo(), excludeLocNos);
}
return R.ok();
}
@@ -206,7 +254,8 @@
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), JSON.toJSONString(vo.getOrderDtos()),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
+ int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo()));
+ int ioType = (issued >= locDetl.getAnfme() && count == 1 ? 101 : 103);
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
locDto.setStaNos(staNos);
locDtos.add(locDto);
--
Gitblit v1.9.1