From 10b0dccb27336e2f286b5b464d035ead6dee7de9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 12:57:20 +0800
Subject: [PATCH] #库龄分品号、批次、货主
---
src/main/java/com/zy/asrs/controller/MatController.java | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 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..3c0ef82 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -10,11 +10,11 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatPrint;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.KeyValueVo;
+import com.zy.asrs.service.LocInPrintMatService;
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 +41,10 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private PakoutService pakoutService;
+ @Autowired
+ private LocInPrintMatService locInPrintMatService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -49,12 +53,17 @@
@RequestMapping(value = "/mat/list/pda/auth")
@ManagerAuth
- public R pdaList(@RequestParam(required = true)Long tagId){
+ public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "20")Integer limit,
+ @RequestParam Map<String, Object> param,
+ @RequestParam(required = true) Long tagId){
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
- wrapper.eq("tag_id", tagId);
- wrapper.orderBy("create_time", false);
- List<Mat> mats = matService.selectList(wrapper);
- return R.ok().add(mats);
+// wrapper.eq("tag_id", tagId);
+// wrapper.orderBy("create_time", false);
+ Page<Mat> matPage = toPage(curr, limit, param, Mat.class);
+ Page<Mat> page = matService.selectAllPage(matPage);
+ // List<Mat> mats = matService.selectList(wrapper);
+ return R.ok().add(page);
}
@RequestMapping(value = "/mat/search/pda/auth")
@@ -208,6 +217,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")
@@ -256,6 +272,35 @@
return R.ok().add(res);
}
+ // 鎵撳嵃
+ @RequestMapping(value = "/loc/in/mat/print/auth")
+ @ManagerAuth(memo = "鍟嗗搧缂栫爜鎵撳嵃")
+ public R locInMatCodePrint(@RequestParam(value = "param[]") Long[] ids) {
+ if(Cools.isEmpty(ids)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ List<MatPrint> res = new ArrayList<>();
+ for (Long id : ids){
+ LocInPrintMat locInPrintMat = locInPrintMatService.selectById(id);
+ // 鎵撳嵃鏁版嵁娉ㄥ叆
+ MatPrint print = new MatPrint();
+ print.setMatnr(locInPrintMat.getMatnr());
+ print.setMaktx(locInPrintMat.getMaktx());
+ print.setBatch(locInPrintMat.getBatch());
+ print.setAnfme(locInPrintMat.getAnfme());
+ print.setLocNo(locInPrintMat.getLocNo());
+ print.setOwnerId(locInPrintMat.getOwnerId());
+ print.setOwner(locInPrintMat.getOwner$());
+ print.setId(locInPrintMat.getId());
+ res.add(print);
+ locInPrintMat.setUpdateTime(new Date());
+ locInPrintMat.setUpdateBy(getUserId());
+ locInPrintMat.setStatus(2);
+ locInPrintMatService.updateById(locInPrintMat);
+ }
+ return R.ok().add(res);
+ }
+
/*************************************** 鏁版嵁鐩稿叧 ***********************************************/
--
Gitblit v1.9.1