From fc51b172429f629eb37acc3f1d7af666ba6ee7f5 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 26 十月 2022 10:37:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 66fabfa..602908e 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -12,8 +12,9 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.dto.OrderDetlWithSum;
import com.zy.asrs.entity.result.KeyValueVo;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -41,6 +42,9 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+
+ @Autowired
+ private LocDetlService locDetlService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -215,9 +219,10 @@
if (mat == null) {
return R.ok();
}
- OrderDetl orderDetl = new OrderDetl();
+ OrderDetlWithSum orderDetl = new OrderDetlWithSum();
orderDetl.sync(mat);
orderDetl.setAnfme(0.0D);
+ orderDetl.setSum(locDetlService.selectSumByMatnr(mat.getMatnr()));
return R.ok().add(orderDetl);
}
@@ -305,7 +310,7 @@
@ManagerAuth
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
- .andNew().like("matnr", condition).or().like("maktx", condition)
+ .andNew().like("matnr", condition).or().like("maktx", condition).or().like("specs", condition)
.orderBy("create_time", false);
List<Mat> mats = matService.selectPage(new Page<>(1, 30), wrapper).getRecords();
List<KeyValueVo> valueVos = new ArrayList<>();
--
Gitblit v1.9.1