From aa95589f3b49e10a72b2200a865c46b8077a4204 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 六月 2025 11:16:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index a688989..5a44740 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -45,6 +45,19 @@
@Autowired
private WrkMastLogService wrkMastLogService;
+ @RequestMapping(value = "/order/search/pda/auth")
+ @ManagerAuth
+ public R pdaOrderSearch(@RequestParam(required = false)String condition){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+// wrapper.like("matnr", condition).or().like("maktx", condition);
+ wrapper.like("order_no", condition);
+ }
+ wrapper.orderBy("create_time", false);
+ List<Order> mats = orderService.selectList(wrapper);
+ return R.ok().add(mats);
+ }
+
@RequestMapping(value = "/order/list/pda/page/auth")
@ManagerAuth
@@ -52,6 +65,25 @@
@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit){
List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
+ ArrayList<Integer> arrayList = new ArrayList<>();
+ docTypes.forEach(docType -> {
+ arrayList.add(docType.getDocId().intValue());
+ });
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+// wrapper.eq("tag_id", tagId);
+ wrapper.in("doc_type", arrayList);
+ wrapper.in("settle",1,2);
+ wrapper.orderBy("create_time", false);
+ Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok().add(orderPage);
+ }
+
+ @RequestMapping(value = "/order/list/pda/page/out/auth")
+ @ManagerAuth
+ public R pdaPageListOut(@RequestParam(required = true)Long tagId,
+ @RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit){
+ List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
ArrayList<Integer> arrayList = new ArrayList<>();
docTypes.forEach(docType -> {
arrayList.add(docType.getDocId().intValue());
@@ -271,7 +303,7 @@
endQty = endQty + orderDetl.getQty();
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued > 0.0) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null,null,null,null);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
issued = issued - locDetl.getAnfme();
--
Gitblit v1.9.1