From aa221b6b6c3939130c78e4219207d14ce877ff30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 15:57:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 54bbc39..49ba281 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.AgvWrkDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
+import com.zy.system.service.ConfigService;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -44,6 +45,8 @@
@Autowired
private AgvWrkDetlMapper agvWrkDetlMapper;
+ @Autowired
+ private ConfigService configService;
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
@@ -204,7 +207,9 @@
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
Object o = param.get("orderType");
+ param.remove("orderType");
boolean flag = false;
+ convertLike(param, wrapper);
if (o != null) {
String[] split = o.toString().split(",");
//-1璇存槑鏄崐鎴愬搧绠卞３鍑哄簱鍗�
@@ -216,14 +221,22 @@
docIds.add(pakin.getDocId());
}
}
- wrapper.andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT).andNew().in("source", docIds);
+ wrapper.in("source", docIds);
+ List<String> m = configService.getMatCode();
+ 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);
+ }
+ }
+ }
flag = true;
} else {
wrapper.in("source", split);
}
- param.remove("orderType");
}
- convertLike(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
} else {
@@ -359,6 +372,41 @@
return R.ok(page);
}
+ @RequestMapping(value = "/orderDetl/pakout/list/authV9")
+ @ManagerAuth
+ public R pakoutList9(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convertLike(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() == 48) {
+ 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.getSumAnfmeProcessed2(record.getMatnr(), record.getThreeCode());
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
+ }
+
+ return R.ok(page);
+ }
+
@RequestMapping(value = "/orderDetl/pakout/list/authV6")
@ManagerAuth
public R pakoutList6(@RequestParam(defaultValue = "1") Integer curr,
@@ -396,13 +444,8 @@
@RequestMapping(value = "/orderDetl/pakout/workNum")
@ManagerAuth
- public R listWorkDetl(@RequestParam OrderDetl param) {
- List<AgvWrkDetl> agvWrkDetls = agvWrkDetlMapper.listAnfmeByMatnr(param.getMatnr(), param.getThreeCode(), param.getOrderNo());
- if (agvWrkDetls != null) {
- for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
-
- }
- }
+ public R listWorkDetl() {
+ List<AgvWrkDetl> agvWrkDetls = agvWrkDetlMapper.listAnfmeByMatnr();
return R.ok(agvWrkDetls);
}
--
Gitblit v1.9.1