From 2ff79b71d902e733a0cf0d70052ace24fa1c479e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 06 八月 2024 13:50:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index e1fb0d2..0868429 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -160,6 +160,28 @@
return R.ok();
}
+ @RequestMapping(value = "/mat/turn/over/list/auth")
+ @ManagerAuth
+ public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
+ }
+
+ @RequestMapping("/mat/turn/over/take/site")
+ @ManagerAuth()
+ public R availableTakeSite(@RequestParam(required = false) String matnr){
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<Mat> mats = matService.selectByMatnrLink(matnr);
+ for (Mat mat : mats) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", mat.getId());
+ map.put("desc", mat.getMatnr());
+ result.add(map);
+ }
+ return R.ok().add(result);
+ }
+
@RequestMapping(value = "/mat/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
@@ -307,5 +329,42 @@
return R.ok().add(valueVos);
}
+ @RequestMapping(value = "/mat/list/pda/page/auth")
+ @ManagerAuth
+ public R pdaPageList(@RequestParam(required = true)Long tagId,
+ @RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit){
+ EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ wrapper.eq("tag_id", tagId);
+ wrapper.orderBy("create_time", false);
+ return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+ @RequestMapping(value = "/mat/split")
+ @ManagerAuth(memo = "瑙ｆ瀽鐗╂枡鐮�")
+ public R split(@RequestParam("matnr") String matnr) {
+ if (Cools.isEmpty(matnr)) {
+ return R.error("鏁版嵁涓虹┖");
+ }
+ String[] split = matnr.split(",");
+ if (split.length != 8) {
+ return R.error("鏁版嵁閿欒");
+ }
+// Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", split[0]));
+// if (Cools.isEmpty(mat)){
+// return R.error("鏈煡璇㈠埌鐗╂枡淇℃伅,"+split[0]);
+// }
+ Map<String, Object> map = new HashMap<>();
+ map.put("matnr", split[0]);
+ map.put("batch", split[1]);
+ map.put("specs", split[2].substring(0,split[2].length()-1));
+ map.put("manuDate", split[3]);
+ map.put("model", split[4].substring(0,split[4].length()-1));
+ map.put("weight", split[5].substring(0,split[5].length()-2));
+ map.put("length", split[6]);
+ map.put("volume", split[7]);
+ return R.ok().add(map);
+ }
+
+//0205040001,K44132-09-0724,PE@,20240724,HD-233L@,70@@,2816,53908.56626 80000001
}
--
Gitblit v1.9.1