From 6ddd525901cce19178983f37cbde7209d9df897e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 四月 2022 09:27:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 9b722b2..34b0ba9 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,11 +13,10 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.MatCodeService;
-import com.zy.asrs.utils.VersionUtils;
+import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,6 +33,8 @@
private LocDetlService locDetlService;
@Autowired
private LocDetlMapper locDetlMapper;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/locDetl/update")
public R update1() {
@@ -188,10 +189,6 @@
return R.ok();
}
-
- @Autowired
- private MatCodeService matCodeService;
-
@RequestMapping(value = "/locDetl/statis/auth")
@ManagerAuth
public R statis(@RequestParam(defaultValue = "1")Integer curr,
@@ -199,9 +196,9 @@
@RequestParam Map<String, Object> param) {
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
for (LocDetl locDetl : stockStatis.getRecords()) {
- MatCode matCode = matCodeService.selectById(locDetl.getMatnr());
- if (matCode != null) {
- VersionUtils.setLocDetl(locDetl, matCode);
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (mat != null) {
+ locDetl.sync(mat);
}
}
return R.ok().add(stockStatis);
@@ -215,9 +212,9 @@
public void statisExport(HttpServletResponse response) throws IOException {
List<LocDetl> excel = LocDetlMapper.getStockStatisExcel();
for (LocDetl locDetl : excel) {
- MatCode matCode = matCodeService.selectById(locDetl.getMatnr());
- if (matCode != null) {
- VersionUtils.setLocDetl(locDetl, matCode);
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (mat != null) {
+ locDetl.sync(mat);
}
}
response.setContentType("application/vnd.ms-excel");
--
Gitblit v1.9.1