From 5c7f3dcb91943485b7f98e98a8c14b37b8d3cacf Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 九月 2023 12:50:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 3e12304..81c16f9 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(){
@@ -51,8 +55,8 @@
@ManagerAuth
public R pdaList(@RequestParam(required = true)Long tagId){
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
- wrapper.eq("tag_id", tagId);
- wrapper.orderBy("create_time", false);
+// wrapper.eq("tag_id", tagId);
+// wrapper.orderBy("create_time", false);
List<Mat> mats = matService.selectList(wrapper);
return R.ok().add(mats);
}
@@ -208,6 +212,13 @@
return R.ok().add(orderDetl);
}
+ @RequestMapping(value = "/pakOut/show")
+ public R showQR(){
+ List<Pakout> manPakOuts = pakoutService.selectList(null);
+ return R.ok(manPakOuts);
+ }
+
+
/*************************************** 鎵撳嵃鐩稿叧 ***********************************************/
@RequestMapping(value = "/mac/code/auth")
--
Gitblit v1.9.1