From e7d8e2c64facfa261e8b168b84e81ef6c835f57d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 09:25:19 +0800
Subject: [PATCH] 许可证到期提醒，系统30分钟无操作下线账号
---
src/main/java/com/zy/asrs/controller/OutController.java | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 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..fe78ee9 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -8,18 +7,18 @@
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.service.*;
-import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDto;
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 java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/3/26
@@ -43,37 +42,86 @@
@Autowired
private BasDevpService basDevpService;
+
+ @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
public R pakoutPreview(@RequestBody List<Long> ids) {
+
+
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
+// orderDetls = orderDetls.stream()
+// .sorted(Comparator.comparing(OrderDetl::getMatnr).thenComparing(OrderDetl::getBatch))
+// .collect(Collectors.toList());
+// 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);
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
+
+ // 浣跨敤鏂板澶氬瓧娈垫潯浠舵煡璇㈠簱瀛橈紙鍙敼鎴愪紶鍏ュ弬鏁版潵浼樺寲锛�
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl); // 杩欎釜鏂规硶鍐呴儴搴旇鏍规嵁澶氫釜瀛楁鍖归厤
+
for (LocDetl locDetl : locDetls) {
+ // 澶氬瓧娈靛尮閰�
+ boolean match = locDetl.getMatnr().equals(orderDetl.getMatnr())
+ && Objects.equals(locDetl.getOutOrderNo(), orderDetl.getOutOrderNo())
+ && Objects.equals(locDetl.getTemp2(), orderDetl.getTemp2())
+ && Objects.equals(locDetl.getProType(), orderDetl.getProType())
+ && Objects.equals(locDetl.getModel(), orderDetl.getModel())
+ && Objects.equals(locDetl.getLuHao(), orderDetl.getLuHao());
+
+ if (!match) continue;
+
if (issued > 0) {
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+ 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);
locDto.setStaNos(staNos);
+ locDto.setModel(locDetl.getModel());
+ locDto.setOutOrderNo(locDetl.getOutOrderNo());
+ locDto.setLuHao(locDetl.getLuHao());
+ locDto.setPacking(locDetl.getPacking());
+ locDto.setProType(locDetl.getProType());
+ locDto.setSPgNO(locDetl.getSPgNO());
+ locDto.setColor(locDetl.getColor());
+ locDto.setTemp2(locDetl.getTemp2()); // 鏂板瀛楁
locDtos.add(locDto);
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+
issued = issued - locDetl.getAnfme();
} else {
break;
}
}
+
if (issued > 0) {
LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
+ locDto.setModel(orderDetl.getModel());
+ locDto.setOutOrderNo(orderDetl.getOutOrderNo());
+ locDto.setLuHao(orderDetl.getLuHao());
+ locDto.setPacking(orderDetl.getPacking());
+ locDto.setProType(orderDetl.getProType());
+ locDto.setSPgNO(orderDetl.getSPgNO());
+ locDto.setColor(orderDetl.getColor());
+ locDto.setTemp2(orderDetl.getTemp2());
locDtos.add(locDto);
}
}
+
return R.ok().add(locDtos);
}
@@ -83,22 +131,25 @@
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);
+ Thread.sleep(1000L);
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
--
Gitblit v1.9.1