From 375f33655933258ea981c45df463b8156f41a309 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 02 九月 2025 13:13:39 +0800
Subject: [PATCH] 许可证到期提醒，系统30分钟无操作强制退出
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 29dfc78..f5712ae 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -254,41 +254,47 @@
now, // 娣诲姞鏃堕棿
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
- null, // 澶囨敞
+ param.getMemo(), // 澶囨敞
2
);
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
+// List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
- if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
- dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
- } else {
- list.add(dto);
- }
- }
- for (DetlDto detlDto : list) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
+// DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
+// detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+// if (DetlDto.hasLineNumber(list, dto)) {
+// DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
+// dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+// assert detlDto != null;
+// detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+// } else {
+// list.add(dto);
+// }
+// }
+// for (DetlDto detlDto : list) {
+// Mat mat = matService.selectByMatnr(detail.getMatnr());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(detail.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+// }
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setLineNumber(detlDto.getLineNumber());
- orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(detlDto.getAnfme());
- orderDetl.setBrand(detlDto.getBrand());
- orderDetl.setStandby1(detlDto.getStandby1());
- orderDetl.setStandby2(detlDto.getStandby2());
- orderDetl.setStandby3(detlDto.getStandby3());
+ orderDetl.setMatnr(detail.getMatnr());
+ orderDetl.setMaktx(detail.getMaktx());
+ orderDetl.setBatch(detail.getBatch());
+ orderDetl.setModel(detail.getModel());
+ orderDetl.setVolume(detail.getVolume());
+ orderDetl.setAnfme(detail.getAnfme());
+// orderDetl.sync(mat);
+// orderDetl.setLineNumber(detail.getLineNumber());
+// orderDetl.setBatch(detail.getBatch());
+// orderDetl.setAnfme(detail.getAnfme());
+// orderDetl.setBrand(detlDto.getBrand());
+// orderDetl.setStandby1(detlDto.getStandby1());
+// orderDetl.setStandby2(detlDto.getStandby2());
+// orderDetl.setStandby3(detlDto.getStandby3());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setCreateBy(9527L);
--
Gitblit v1.9.1