From a0c9dea162787d7557b3a6d3498dcbb5374d500c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 08 十二月 2022 15:12:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 141 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 128 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index abfc36d..14b79e7 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,25 +1,24 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+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.BasDevp;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.result.StoPreTab;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
-import com.zy.common.model.DetlDto;
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.RestController;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/3/26
@@ -42,6 +41,15 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private MatService matService;
+
+ @PostMapping("/out/pakout/orderDetlIds/auth")
+ @ManagerAuth
+ public R pakoutOrderDetlIds(@RequestParam Long orderId) throws InterruptedException {
+ Thread.sleep(200);
+ return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
+ }
@PostMapping("/out/pakout/preview/auth")
@ManagerAuth
@@ -51,17 +59,22 @@
}
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
+
+ Set<String> exist = new HashSet<>();
+
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
for (LocDetl locDetl : locDetls) {
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());
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
} else {
@@ -79,26 +92,73 @@
@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);
}
- boolean refuse = true;
+ boolean lack = true;
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
- refuse = !refuse;
+ lack = false;
+ break;
}
}
- if (refuse) {
+ if (lack) {
return R.error("搴撳瓨涓嶈冻");
}
Thread.sleep(500L);
+ // 璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
+ List<OrderDto> orderDtos = new ArrayList<>();
+ for (LocDto locDto : locDtos) {
+ 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 {
+ // 璁㈠崟鍚堝苟鍑哄簱
+ 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() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
+ OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), orderDto.getMatnr(), null);
+ if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
+ return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
+ }
+
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
if (locDto.isLack()) { continue; }
+ // 闃叉鍓嶇椤甸潰鎻愬彇搴撲綅淇℃伅鍚庯紝鍦ㄥ叾浠栧湴鏂瑰璇ュ簱浣嶇敓鎴愪簡鍑哄簱浠诲姟(搴撲綅鐘舵�侀潪F鐘舵��)
+ LocMast locMast = locMastService.selectById(locDto.getLocNo());
+ if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
+ return R.error("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
+ }
+
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
@@ -108,12 +168,67 @@
taskDtos.add(taskDto);
}
}
+
// -----------------------------------------------------------------------------------------------
+ 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 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());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ 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