From 99b819fb7354c86ef4111a1b3465f63d6d263fd7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 14 七月 2025 16:58:41 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OrderController.java | 88 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index bc971bd..7fcaa51 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -14,6 +14,7 @@
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import com.zy.system.service.ConfigService;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -58,6 +59,8 @@
private AgvLocDetlService agvLocDetlService;
@Autowired
private FlowLogService flowLogService;
+ @Autowired
+ private ConfigService configService;
@GetMapping("/doc/type/list")
@Transactional
@@ -231,7 +234,18 @@
if (o != null) {
String[] split = o.toString().split(",");
if (split[0].equals("39")) {
- wrapper.andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT).andNew().in("source", split);
+ //wrapper.andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT).andNew().in("source", split);
+ wrapper.in("source", split);
+ List<String> m = configService.getMatCode();
+ if (!Cools.isEmpty(m)) {
+ for (int i = 0; i < m.size(); i++) {
+ if (i == 0) {
+ wrapper.andNew().like("matnr", m.get(i), SqlLike.RIGHT);
+ } else {
+ wrapper.or().like("matnr", m.get(i), SqlLike.RIGHT);
+ }
+ }
+ }
} else {
wrapper.in("source", split);
}
@@ -353,8 +367,20 @@
docIds.add(pakin.getDocId());
}
}
- wrapper.notLike("matnr", "401", SqlLike.RIGHT).notLike("matnr", "402", SqlLike.RIGHT);
+ //wrapper.notLike("matnr", "401", SqlLike.RIGHT).notLike("matnr", "402", SqlLike.RIGHT);
+ //wrapper.in("source", docIds);
+
wrapper.in("source", docIds);
+ List<String> m = configService.getMatCode();
+ if (!Cools.isEmpty(m)) {
+ for (int i = 0; i < m.size(); i++) {
+ if (i == 0) {
+ wrapper.andNew().notLike("matnr", m.get(i), SqlLike.RIGHT);
+ } else {
+ wrapper.or().notLike("matnr", m.get(i), SqlLike.RIGHT);
+ }
+ }
+ }
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
for (OrderDetl record : page.getRecords()) {
Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(), 1);
@@ -441,6 +467,21 @@
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
}
Date now = new Date();
+ if (param.getDocType() == 33) {
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ boolean flag = false;
+ List<String> matCode = configService.getMatCode();
+ for (String s : matCode) {
+ if (orderDetl.getMatnr().startsWith(s)) {
+ flag = true;
+ }
+ }
+ if (flag) {
+ param.setOrderNo("DC" + param.getOrderNo());
+ break;
+ }
+ }
+ }
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
@@ -558,9 +599,22 @@
}
}
if (param.getDocType().intValue() == 32) {
+ String ono = "DB";
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ boolean flag2 = false;
+ List<String> matCode = configService.getMatCode();
+ for (String s : matCode) {
+ if (orderDetl.getMatnr().startsWith(s)) {
+ flag2 = true;
+ }
+ }
+ if (flag2) {
+ ono = "DC";
+ }
+ }
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- "DB" + param.getOrderNo(), // 璁㈠崟缂栧彿
+ ono + param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
33L, // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
@@ -1188,7 +1242,19 @@
}
// 鐢熸垚璋冩嫧鍗�
if (docType.getDocId().intValue() == 32) {
- String dbUuid = "DB" + odNo;
+ String dbUuid;
+ boolean flag3 = false;
+ List<String> matCode = configService.getMatCode();
+ for (String s : matCode) {
+ if (matnr.startsWith(s)) {
+ flag3 = true;
+ }
+ }
+ if (!Cools.isEmpty(matnr) && flag3) {
+ dbUuid = "DC" + odNo;
+ } else {
+ dbUuid = "DB" + odNo;
+ }
Order order2 = orderService.selectByNo(dbUuid);
if (null == order2) {
order2 = new Order(
@@ -1455,7 +1521,19 @@
odNo += "_O";
}
if (docName.contains("璋冩嫧鍗�")) {
- odNo = "DB" + odNo;
+ boolean flag6 = false;
+ List<String> matCode = configService.getMatCode();
+ for (String s : matCode) {
+ if (matnr.startsWith(s)) {
+ flag6 = true;
+ }
+ }
+ if (!Cools.isEmpty(matnr) && flag6) {
+ odNo = "DC" + odNo;
+ } else {
+ odNo = "DB" + odNo;
+ }
+ //odNo = "DB" + odNo;
} else if (docName.contains("鍔犲伐鍗�")) {
odNo = "JG" + odNo;
} else {
--
Gitblit v1.9.1