From bae4b94d9d30aab92fb86a302240f257bd7e0d99 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 15 九月 2025 14:34:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OrderController.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 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 4ce625f..a5ea6e5 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
+import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -61,6 +62,15 @@
private FlowLogService flowLogService;
@Autowired
private ConfigService configService;
+ @Autowired
+ private OrderMapper orderMapper;
+
+
+ @GetMapping("/code/type/list")
+ public R docTypeLis2t(@RequestParam String threeCode) {
+ List<String> pakins = orderMapper.selectThreeCode(threeCode);
+ return R.ok().add(pakins);
+ }
@GetMapping("/doc/type/list")
@Transactional
@@ -231,6 +241,8 @@
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
Object o = param.get("orderType");
+ param.remove("orderType");
+ convert(param, wrapper);
if (o != null) {
String[] split = o.toString().split(",");
if (split[0].equals("39")) {
@@ -249,10 +261,8 @@
} else {
wrapper.in("source", split);
}
- param.remove("orderType");
}
- wrapper.andNew();
- convert(param, wrapper);
+
// List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
// List<Long> docIds = new ArrayList<>();
// for (DocType pakin : pakins) {
@@ -261,7 +271,6 @@
// }
// }
Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
-
return R.ok(orderDetlPage);
}
@@ -324,8 +333,18 @@
docIds.add(pakin.getDocId());
}
}
- wrapper.like("matnr", "50", SqlLike.RIGHT);
wrapper.in("source", docIds);
+ List<String> m = configService.getMatCode2();
+ 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);
+ }
+ }
+ }
+ //wrapper.like("matnr", "50", SqlLike.RIGHT);
return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1