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 | 159 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 141 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 41fe4d5..51b87f7 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,20 +1,24 @@
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;
import com.core.common.Cools;
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;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -40,6 +44,8 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private MatService matService;
@PostMapping("/out/pakout/orderDetlIds/auth")
@ManagerAuth
@@ -67,7 +73,8 @@
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
locDto.setStaNos(staNos);
locDtos.add(locDto);
exist.add(locDetl.getLocNo());
@@ -88,6 +95,7 @@
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
+ @Transactional
public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
if (Cools.isEmpty(locDtos)) {
return R.parse(BaseRes.PARAM);
@@ -108,24 +116,46 @@
// 璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
List<OrderDto> orderDtos = new ArrayList<>();
for (LocDto locDto : locDtos) {
- if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
- OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getAnfme());
- if (OrderDto.has(orderDtos, orderDto)) {
- OrderDto dto = OrderDto.find(orderDtos, orderDto);
- assert dto != null;
- dto.setAnfme(dto.getAnfme() + orderDto.getAnfme());
+ 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)) {
+ OrderDto dto = OrderDto.find(orderDtos, orderDto);
+ assert dto != null;
+ dto.setAnfme(dto.getAnfme() + orderDto.getAnfme());
+ } else {
+ orderDtos.add(orderDto);
+ }
} else {
- orderDtos.add(orderDto);
+ // 璁㈠崟鍚堝苟鍑哄簱
+// 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)) {
+ OrderDto dto = OrderDto.find(orderDtos, orderDto);
+ assert dto != null;
+ dto.setAnfme(dto.getAnfme() + orderDto.getAnfme());
+ } else {
+ orderDtos.add(orderDto);
+ }
+ }
}
}
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() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
}
}
@@ -148,13 +178,106 @@
taskDtos.add(taskDto);
}
}
- // -----------------------------------------------------------------------------------------------
+ List<String> locNos = new ArrayList<>();
for (TaskDto taskDto : taskDtos) {
- locMastService.breakUp(taskDto.getLocNo());
+ 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);
}
return R.ok();
}
+
+ /**
+ * 鍚堝苟璁㈠崟姹囨�婚瑙�
+ */
+ @RequestMapping(value = "/order/merge/preview/auth")
+ @ManagerAuth
+ public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
+ return R.ok().add(orderService.mergePreview(orderIds));
+ }
+
+ @PostMapping("/out/pakout/preview/merge/auth")
+ @ManagerAuth
+ public R pakoutPreviewMerge(@RequestBody List<OrderMergeVo> list) {
+ if (Cools.isEmpty(list)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ Set<String> exist = new HashSet<>();
+ List<LocDto> locDtos = new ArrayList<>();
+
+ for (OrderMergeVo vo : list) {
+ double issued = Optional.of(vo.getAnfme()).orElse(0.0D);
+ if (issued <= 0.0D) { continue; }
+ List<LocDetl> locDetls = locDetlService.queryStock(vo.getMatnr(), vo.getBatch(), null, exist);
+ for (LocDetl locDetl : locDetls) {
+ 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 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);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, vo.getMatnr(), vo.getMaktx(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), issued);
+ locDto.setLack(Boolean.TRUE);
+ locDtos.add(locDto);
+ }
+ }
+ for (LocDto locDto : locDtos) {
+ Mat mat = matService.selectByMatnr(locDto.getMatnr());
+ assert mat != null;
+ locDto.setSpecs(mat.getSpecs());
+ }
+ return R.ok().add(locDtos);
+ }
+
}
--
Gitblit v1.9.1