From 91d05844fa5d170face76455d38a330f24e214bc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 03 十一月 2022 13:58:26 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs
---
src/main/java/com/zy/asrs/controller/MatController.java | 8 +++++---
1 files changed, 5 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 602908e..5f600a5 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -12,6 +12,7 @@
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;
@@ -219,10 +220,11 @@
if (mat == null) {
return R.ok();
}
- OrderDetlWithSum orderDetl = new OrderDetlWithSum();
+// OrderDetlWithSum orderDetl = new OrderDetlWithSum();
+ OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
orderDetl.setAnfme(0.0D);
- orderDetl.setSum(locDetlService.selectSumByMatnr(mat.getMatnr()));
+// orderDetl.setSum(locDetlService.selectSumByMatnr(mat.getMatnr()));
return R.ok().add(orderDetl);
}
@@ -316,7 +318,7 @@
List<KeyValueVo> valueVos = new ArrayList<>();
for (Mat mat : mats) {
KeyValueVo vo = new KeyValueVo();
- vo.setName(mat.getMatnr() + " - " + mat.getMaktx());
+ vo.setName(mat.getSpecs() + "-" + mat.getMaktx() + " - " + mat.getMatnr());
vo.setValue(mat.getMatnr());
valueVos.add(vo);
}
--
Gitblit v1.9.1