From 5e3ef48bf424f00ee3a76693478baa894d5b2b83 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 06 五月 2024 15:47:08 +0800
Subject: [PATCH] # 初始化1楼库位
---
src/main/java/com/zy/asrs/controller/OrderController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 7feeeba..cdb49c0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -137,7 +137,9 @@
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
List<Long> docIds = new ArrayList<>();
for (DocType pakin : pakins) {
- docIds.add(pakin.getDocId());
+ if (pakin.getDocId() != 32) {
+ docIds.add(pakin.getDocId());
+ }
}
wrapper.in("source",docIds);
return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
@@ -160,6 +162,29 @@
// }
// wrapper.in("order_no",orderNos);
// return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ // 鎵�鏈夊叆搴撹鍗曟槑缁�
+ @RequestMapping(value = "/order/bcp/detls/pakin/page/auth")
+ @ManagerAuth
+ public R bcpOrderDetls(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "100")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+// return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() == 32) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+ wrapper.in("source",docIds);
+ return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/order/detl/all/auth")
@@ -294,7 +319,7 @@
dbList.add(dto);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setSource(param.getDocType().intValue());
+ orderDetl.setSource(33);
orderDetl.setCreateBy(getUserId());
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(getUserId());
--
Gitblit v1.9.1