From 6e64596aec723071c690edf9c878b0945fd0e37a Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 19 二月 2025 10:31:58 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/OrderController.java | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 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 a03bba3..000fe9f 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -215,6 +215,36 @@
// return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
+
+ // 鍏ュ簱璁㈠崟鏄庣粏
+ @RequestMapping(value = "/order/detls/pakin/page/auth/v2")
+ @ManagerAuth
+ public R orderDetlsV2(@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);
+ Object o = param.get("orderType");
+ if (o != null) {
+ String[] split = o.toString().split(",");
+ wrapper.in("source", split);
+ param.remove("orderType");
+ }
+ convert(param, wrapper);
+// 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());
+// }
+// }
+
+ return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+
@RequestMapping(value = "/order/detls/pakin")
@ManagerAuth
public R orderDetlsIn(@RequestParam(defaultValue = "1") Integer curr,
@@ -269,7 +299,7 @@
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
List<Long> docIds = new ArrayList<>();
for (DocType pakin : pakins) {
- if (pakin.getDocId() == 36) {
+ if (pakin.getDocId() == 36||pakin.getDocId() == 39) {
docIds.add(pakin.getDocId());
}
}
@@ -319,6 +349,40 @@
}
}
wrapper.in("source", docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(), 1);
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ }
+ return R.ok(page);
+ }
+
+
+ @RequestMapping(value = "/order/bcpDb/detls/pakin/page/auth/v2")
+ @ManagerAuth
+ public R bcpDbOrderDetlsV2(@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);
+ Object o = param.get("orderType");
+ if (o != null) {
+ String[] split = o.toString().split(",");
+ wrapper.in("source", split);
+ param.remove("orderType");
+ }
+ 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() == 33) {
+// 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.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(), 1);
@@ -421,7 +485,7 @@
if (param.getDocType() != 32) {
orderDetl.setProcessSts(3);
}
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getThreeCode().trim(), orderDetl.getProcessSts());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getThreeCode().trim(), orderDetl.getDeadTime());
Double anfme = item.getAnfme();
@@ -601,7 +665,7 @@
List<DetlDto> dbList = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
if (orderDetl.getProcessSts() != 1) continue;
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getThreeCode().trim(), orderDetl.getProcessSts());
if (DetlDto.has(dbList, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getThreeCode().trim(), orderDetl.getDeadTime());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
@@ -691,7 +755,7 @@
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getAnfme(), orderDetl.getProcessSts());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getThreeCode(), orderDetl.getProcessSts());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getThreeCode().trim(), orderDetl.getDeadTime());
Double anfme = item.getAnfme();
@@ -1374,11 +1438,16 @@
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));
String odNo = uuid;
+ if (docType.getPakin() == 1) {
+ odNo += "_I";
+ } else {
+ odNo += "_O";
+ }
if (docName.contains("璋冩嫧鍗�")) {
odNo = "DB" + odNo;
} else if (docName.contains("鍔犲伐鍗�")) {
odNo = "JG" + odNo;
- }else {
+ } else {
if (docType.getPakin() == 1) {
odNo += "_I";
} else {
--
Gitblit v1.9.1