From 5a0592f51e21bebc2155fb94e5058deb0604299c Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 08 六月 2023 08:32:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 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..ec2dc6a 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -10,10 +10,14 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.ManPakOut;
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.ManPakOutService;
import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -39,7 +43,11 @@
@Autowired
private MatService matService;
@Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private ManPakOutService manPakOutService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -74,7 +82,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)));
@@ -194,6 +202,19 @@
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);
+ }
+
/*************************************** 鎵撳嵃鐩稿叧 ***********************************************/
@RequestMapping(value = "/mac/code/auth")
@@ -242,6 +263,44 @@
return R.ok().add(res);
}
+ @RequestMapping(value = "/order/print/auth")
+ @ManagerAuth(memo = "璁㈠崟缂栫爜鎵撳嵃")
+ public R orderPrint(@RequestParam(value = "param[]") String[] param) {
+ if(Cools.isEmpty(param)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ List<OrderDetl> res = new ArrayList<>();
+ for (String orderNo : param){
+ res = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ }
+ for (OrderDetl orderDetl:
+ res) {
+ orderDetl.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+ }
+ return R.ok().add(res);
+ }
+
+ @RequestMapping(value = "/pakOut/print/auth")
+ @ManagerAuth(memo = "鎷ｈ揣鍗曠紪鐮佹墦鍗�")
+ public R pakOutPrint(@RequestParam(value = "param[]") String[] param) {
+ if(Cools.isEmpty(param)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ List<ManPakOut> res = new ArrayList<>();
+ for (String docNum : param){
+ ManPakOut manPakOut = manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num", docNum));
+ res.add(manPakOut);
+ break;
+ }
+ return R.ok().add(res);
+ }
+ @RequestMapping(value = "/pakOut/show")
+ public R showQR(){
+ List<ManPakOut> manPakOuts = manPakOutService.selectList(null);
+ return R.ok(manPakOuts);
+ }
+
+
/*************************************** 鏁版嵁鐩稿叧 ***********************************************/
@@ -274,7 +333,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 +344,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