From a12500e11babc4d2512013a56b0cb900f7f7e3a6 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 17 三月 2025 09:31:33 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 718f555..6d70670 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -10,9 +10,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.AgvWrkDetl;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.mapper.AgvWrkDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
@@ -39,6 +41,9 @@
private LocDetlService locDetlService;
@Autowired
private AgvLocDetlService agvLocDetlService;
+
+ @Autowired
+ private AgvWrkDetlMapper agvWrkDetlMapper;
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
@@ -183,7 +188,8 @@
for (OrderDetl record : page.getRecords()) {
Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
record.setStock(sumAnfme == null ? 0 : sumAnfme);
- record.setWorkNum(0D);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
}
return R.ok(page);
}
@@ -240,7 +246,8 @@
sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
}
record.setStock(sumAnfme == null ? 0 : sumAnfme);
- record.setWorkNum(0D);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
}
return R.ok(page);
}
@@ -309,7 +316,8 @@
for (OrderDetl record : page.getRecords()) {
Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed(record.getMatnr(), record.getThreeCode());
record.setStock(sumAnfme == null ? 0 : sumAnfme);
- record.setWorkNum(0D);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
}
return R.ok(page);
@@ -344,7 +352,8 @@
for (OrderDetl record : page.getRecords()) {
Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed2(record.getMatnr(), record.getThreeCode());
record.setStock(sumAnfme == null ? 0 : sumAnfme);
- record.setWorkNum(0D);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
}
return R.ok(page);
@@ -378,12 +387,22 @@
for (OrderDetl record : page.getRecords()) {
Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
record.setStock(sumAnfme == null ? 0 : sumAnfme);
- record.setWorkNum(0D);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
}
return R.ok(page);
}
+ @RequestMapping(value = "/orderDetl/pakout/workNum")
+ @ManagerAuth
+ public R listWorkDetl() {
+ List<AgvWrkDetl> agvWrkDetls = agvWrkDetlMapper.listAnfmeByMatnr();
+ return R.ok(agvWrkDetls);
+
+ }
+
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
--
Gitblit v1.9.1