From a3776853fa6ff1c4a9805615a79852d54f700e3f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 20 七月 2024 09:21:04 +0800
Subject: [PATCH] 增加库位明细导出功能，曾加物料、单据、库存全局搜索功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java | 96 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
index 32ef0d3..d804dc8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
@@ -1,23 +1,23 @@
package com.zy.asrs.wms.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.dto.LocDto;
+import com.zy.asrs.common.domain.dto.OrderDto;
+import com.zy.asrs.common.domain.dto.TaskDto;
+import com.zy.asrs.common.sys.service.StaDescService;
import com.zy.asrs.common.web.BaseController;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.entity.OrderDetl;
+import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.*;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
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 java.util.*;
-import java.util.stream.Collectors;
/**
* Created by vincent on 2022/3/26
@@ -47,23 +47,24 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
+ Long hostId = getHostId();
List<OrderDetl> orderDetls = orderDetlService.listByIds(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);
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), exist);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
for (LocDetl locDetl : locDetls) {
- if (!Cools.isEmpty(locDetl.getMemo())){
- continue;
- }
+ List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getLocNo, locDetl.getLocNo())
+ .eq(LocDetl::getHostId, hostId));
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);
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
locDto.setStaNos(staNos);
locDtos.add(locDto);
exist.add(locDetl.getLocNo());
@@ -82,4 +83,77 @@
return R.ok().add(locDtos);
}
+ @PostMapping("/out/pakout/auth")
+ @ManagerAuth(memo = "璁㈠崟鍑哄簱")
+ public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ if (Cools.isEmpty(locDtos)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ Long hostId = getHostId();
+ boolean lack = true;
+ for (LocDto locDto : locDtos) {
+ if (!locDto.isLack()) {
+ lack = false;
+ break;
+ }
+ }
+ if (lack) {
+ return R.error("搴撳瓨涓嶈冻");
+ }
+
+ Thread.sleep(500L);
+
+ // 璁㈠崟棰勬牎楠� ===>> 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());
+ } else {
+ orderDtos.add(orderDto);
+ }
+ }
+ for (OrderDto orderDto : orderDtos) {
+ Order order = orderService.selectByNo(orderDto.getOrderNo(), hostId);
+ if (order.getSettle() > 2) {
+ return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
+ }
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null,getHostId());
+ 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; }
+ //2022-08-04 Add锛岄槻姝㈠墠绔〉闈㈡彁鍙栧簱浣嶄俊鎭悗锛屽湪鍏朵粬鍦版柟瀵硅搴撲綅鐢熸垚浜嗗嚭搴撲换鍔�(搴撲綅鐘舵�侀潪F鐘舵��)
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocNo, locDto.getLocNo())
+ .eq(LocMast::getHostId, hostId));
+ if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
+ return R.error("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
+ }
+
+ TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto, hostId);
+ if (TaskDto.has(taskDtos, taskDto)) {
+ TaskDto dto = TaskDto.find(taskDtos, taskDto);
+ assert dto != null;
+ dto.getLocDtos().addAll(taskDto.getLocDtos());
+ } else {
+ taskDtos.add(taskDto);
+ }
+ }
+ // -----------------------------------------------------------------------------------------------
+ for (TaskDto taskDto : taskDtos) {
+ BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo(), false, hostId);
+ workService.stockOut(staNo.getDevNo(), taskDto, getUserId(), hostId);
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1