From e85f0e74d21e49b9c68474bc4d19f5eceacf1a46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:40:04 +0800
Subject: [PATCH] 对接
---
src/main/java/com/zy/asrs/controller/MatController.java | 109 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 77 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index c8ef714..d034093 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -12,6 +12,8 @@
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.param.MatParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
@@ -20,7 +22,10 @@
import com.zy.common.entity.MatExcel;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.QrCode;
+import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
+import com.zy.nc.entity.NccJcQilibcBarcodeflowWms;
+import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -38,17 +43,19 @@
@Autowired
private MatService matService;
+
+
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@RequestMapping(value = "/mat/auto/matnr/auth")
- public R autoMatnr(){
+ public R autoMatnr() {
return R.ok().add("YJ" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss).substring(0, 16));
}
@RequestMapping(value = "/mat/list/pda/auth")
@ManagerAuth
- public R pdaList(@RequestParam(required = true)Long tagId){
+ public R pdaList(@RequestParam(required = true) Long tagId) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
wrapper.eq("tag_id", tagId);
wrapper.orderBy("create_time", false);
@@ -58,15 +65,17 @@
@RequestMapping(value = "/mat/search/pda/auth")
@ManagerAuth
- public R pdaSearch(@RequestParam(required = false)String condition){
+ 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).or().like("maktx", condition);
}
wrapper.orderBy("create_time", false);
List<Mat> mats = matService.selectList(wrapper);
return R.ok().add(mats);
}
+
@RequestMapping(value = "/mat/{id}/auth")
@ManagerAuth
@@ -74,7 +83,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)));
@@ -82,27 +91,28 @@
@RequestMapping(value = "/mat/list/auth")
@ManagerAuth
- public R list(@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){
+ public R list(@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) {
Object tagId = param.get("tag_id");
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"))
);
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -130,10 +140,10 @@
return R.ok();
}
- @RequestMapping(value = "/mat/update/auth")
- @ManagerAuth
- public R update(Mat mat){
- if (Cools.isEmpty(mat) || null==mat.getId()){
+ @RequestMapping(value = "/mat/update/auth")
+ @ManagerAuth
+ public R update(Mat mat) {
+ if (Cools.isEmpty(mat) || null == mat.getId()) {
return R.error();
}
mat.setUpdateBy(getUserId());
@@ -144,12 +154,12 @@
@RequestMapping(value = "/mat/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<Mat> list = JSONArray.parseArray(param, Mat.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (Mat entity : list){
+ for (Mat entity : list) {
if (!matService.delete(new EntityWrapper<>(entity))) {
throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -157,9 +167,31 @@
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){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("mat"));
@@ -173,9 +205,9 @@
public R query(String condition) {
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
wrapper.like("matnr", condition).or().like("maktx", condition);
- Page<Mat> page = matService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Mat> page = matService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Mat mat : page.getRecords()){
+ for (Mat mat : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", mat.getId());
map.put("value", mat.getMatnr() + "(" + mat.getMaktx() + ")");
@@ -188,10 +220,23 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Mat> wrapper = new EntityWrapper<Mat>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != matService.selectOne(wrapper)){
+ if (null != matService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Mat.class, String.valueOf(param.get("key"))));
}
return R.ok();
+ }
+
+ @RequestMapping(value = "/mat/covert/{id}/auth")
+ @ManagerAuth
+ public R covert(@PathVariable("id") String id) {
+ Mat mat = matService.selectByMatnr(String.valueOf(id));
+ if (mat == null) {
+ return R.ok();
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setAnfme(0.0D);
+ return R.ok().add(orderDetl);
}
/*************************************** 鎵撳嵃鐩稿叧 ***********************************************/
@@ -202,7 +247,7 @@
, @RequestParam String param
, HttpServletResponse response) throws Exception {
AdminInterceptor.cors(response);
- if (Cools.isEmpty(param)){
+ if (Cools.isEmpty(param)) {
return R.parse(BaseRes.EMPTY);
}
BufferedImage img;
@@ -223,11 +268,11 @@
@RequestMapping(value = "/mat/print/auth")
@ManagerAuth(memo = "鍟嗗搧缂栫爜鎵撳嵃")
public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
- if(Cools.isEmpty(param)) {
+ if (Cools.isEmpty(param)) {
return R.parse(CodeRes.EMPTY);
}
List<MatPrint> res = new ArrayList<>();
- for (String matnr : param){
+ for (String matnr : param) {
Mat mat = matService.selectByMatnr(matnr);
// 鎵撳嵃鏁版嵁娉ㄥ叆
MatPrint print = new MatPrint();
@@ -268,13 +313,13 @@
public R matExcelImport(MultipartFile file) throws IOException {
MatExcelListener listener = new MatExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+ return R.ok("鎴愬姛鍚屾" + listener.getTotal() + "鏉″晢鍝佹暟鎹�");
}
/*************************************** xm-select ***********************************************/
// xm-select 鎼滅储鍟嗗搧鍒楄〃
- @RequestMapping("/mat/all/get/kv0") // todo:luxiaotao
+ @RequestMapping("/mat/all/get/kv")
@ManagerAuth
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
@@ -285,7 +330,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