From dd76858f35bb4fdd76d5976465e9bd96267b0f0b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 09:50:53 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/controller/MatController.java | 90 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index f2eccbe..62434de 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -32,6 +32,7 @@
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.net.URLEncoder;
+import java.text.DecimalFormat;
import java.util.*;
@RestController
@@ -62,7 +63,8 @@
public R pdaSearch(@RequestParam(required = false)String condition){
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like("matnr", condition).or().like("maktx", condition);
+// wrapper.like("matnr", condition).or().like("maktx", condition);
+ wrapper.like("matnr", condition).or().like("specs", condition);
}
wrapper.orderBy("create_time", false);
List<Mat> mats = matService.selectList(wrapper);
@@ -92,10 +94,11 @@
if (Cools.isEmpty(tagId)) {
tagId = getOriginTag().getId();
}
- return R.ok(matService.getPage(new Page<>(curr, limit)
+ return R.ok(matService.getPage2(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
- , param.get("maktx"))
+ , param.get("maktx")
+ , param.get("specs"))
);
}
@@ -158,6 +161,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){
@@ -203,7 +228,7 @@
return R.ok();
}
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(orderDetl);
+ orderDetl.sync(mat);
orderDetl.setAnfme(0.0D);
return R.ok().add(orderDetl);
}
@@ -299,11 +324,66 @@
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);
}
+ @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<>();
+ if (split[0].equals("00000000")) {
+ // 鍘熸潗鏂欑爜瑙ｆ瀽瑙勫垯
+ map.put("matnr", split[0]);
+ map.put("batch", split[1]);
+ map.put("specs", split[2]);
+ map.put("manuDate", split[3]);
+ map.put("model", split[4]);
+ String[] split1 = split[5].split("\\*");
+ double a = Double.parseDouble(split1[0]); // 鍘氬害
+ double b = Double.parseDouble(split1[1]); // 瀹藉箙
+ DecimalFormat df = new DecimalFormat("#.00");
+ map.put("weight", df.format(b));
+ map.put("length", split[6]);
+ map.put("volume", df.format(a * b));
+ } else {
+ // 鍗婃垚鍝佺爜瑙ｆ瀽瑙勫垯
+ 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