From 52805a2308f901610e3c2e26ad2212138bca8070 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 14:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzwms2' into phyzwms2
---
src/main/java/com/zy/asrs/controller/OrderController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4ff89c0..771adbb 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -215,6 +215,32 @@
}
return R.ok(page);
}
+ @RequestMapping(value = "/order/backStocks/detls/pakin/page/auth")
+ @ManagerAuth
+ public R backStocksOrderDetls(@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("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() == 36) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+ wrapper.in("source",docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfmeback(record.getMatnr(), record.getThreeCode(),1);
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ }
+ return R.ok(page);
+ }
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
@@ -485,6 +511,7 @@
list.add(dto);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setSource(param.getDocType().intValue());
orderDetl.setCreateBy(getUserId());
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(getUserId());
@@ -898,6 +925,7 @@
orderDetl2.setDeadTime(isocode);
orderDetl2.setStatus(1);
orderDetl2.setQty(0.0D);
+ orderDetl2.setProcessSts(proSts);
if (!orderDetlService.insert(orderDetl2)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
@@ -975,6 +1003,7 @@
orderDetl3.setDeadTime(isocode);
orderDetl3.setStatus(1);
orderDetl3.setQty(0.0D);
+ orderDetl3.setProcessSts(proSts);
if (!orderDetlService.insert(orderDetl3)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
--
Gitblit v1.9.1