From cc6214b0ebb36943b2f5ea44046a0006ca856502 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 12 十二月 2022 14:46:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 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 c8ef714..d5424bf 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -10,9 +10,12 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
+import com.zy.asrs.entity.OrderDetl;
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;
@@ -38,6 +41,8 @@
@Autowired
private MatService matService;
+ @Autowired
+ private LocDetlService locDetlService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@@ -74,7 +79,7 @@
return R.ok(matService.selectById(String.valueOf(id)));
}
- @RequestMapping(value = "/matCode/auth0")
+ @RequestMapping(value = "/mat/auth")
@ManagerAuth
public R find(@RequestParam("matnr") String matnr) {
return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
@@ -149,7 +154,15 @@
if (Cools.isEmpty(list)){
return R.error();
}
+
+
for (Mat entity : list){
+ LocDetl locDetl = locDetlService.selectByMatnr(entity.getMatnr());
+
+
+ if (!Cools.isEmpty(locDetl)) {
+ throw new CoolException("褰撳墠鐗╂枡鍦ㄥ簱锛屾棤娉曞垹闄わ紒");
+ }
if (!matService.delete(new EntityWrapper<>(entity))) {
throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -192,6 +205,19 @@
return R.parse(BaseRes.REPEAT).add(getComment(Mat.class, String.valueOf(param.get("key"))));
}
return R.ok();
+ }
+
+ @RequestMapping(value = "/mat/covert/{id}/auth")
+ @ManagerAuth
+ public R covert(@PathVariable("id") String id) {
+ Mat mat = matService.selectByMatnr(String.valueOf(id));
+ if (mat == null) {
+ return R.ok();
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setAnfme(0.0D);
+ return R.ok().add(orderDetl);
}
/*************************************** 鎵撳嵃鐩稿叧 ***********************************************/
@@ -274,7 +300,7 @@
/*************************************** xm-select ***********************************************/
// xm-select 鎼滅储鍟嗗搧鍒楄〃
- @RequestMapping("/mat/all/get/kv0") // todo:luxiaotao
+ @RequestMapping("/mat/all/get/kv")
@ManagerAuth
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
@@ -285,7 +311,7 @@
for (Mat mat : mats) {
KeyValueVo vo = new KeyValueVo();
vo.setName(mat.getMatnr() + " - " + mat.getMaktx());
- vo.setValue(mat.getId());
+ vo.setValue(mat.getMatnr());
valueVos.add(vo);
}
return R.ok().add(valueVos);
--
Gitblit v1.9.1