From 803cad115e8fb96fe042b7070fa41dedec4b6361 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 20 五月 2024 15:31:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 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 b842a73..524cd96 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -13,8 +13,10 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.Pakout;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.PakoutService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -41,6 +43,8 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private PakoutService pakoutService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -75,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)));
@@ -92,6 +96,24 @@
if (Cools.isEmpty(tagId)) {
tagId = getOriginTag().getId();
}
+ return R.ok(matService.getPage(new Page<>(curr, limit)
+ , String.valueOf(tagId)
+ , param.get("matnr")
+ , param.get("maktx"))
+ );
+
+ }
+
+ @RequestMapping(value = "/mat/emptyBucketsList/auth")
+ @ManagerAuth
+ public R emptyBucketsList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+
+ int tagId = 46;
+
return R.ok(matService.getPage(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
@@ -203,10 +225,17 @@
return R.ok();
}
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(orderDetl);
+ orderDetl.sync(mat);
orderDetl.setAnfme(0.0D);
return R.ok().add(orderDetl);
}
+
+ @RequestMapping(value = "/pakOut/show")
+ public R showQR(){
+ List<Pakout> manPakOuts = pakoutService.selectList(null);
+ return R.ok(manPakOuts);
+ }
+
/*************************************** 鎵撳嵃鐩稿叧 ***********************************************/
@@ -299,7 +328,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