From ab290efb7df666e173fcd88c32f066f333825c5e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 08:50:01 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/controller/MatController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 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 b842a73..85aceaf 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -10,10 +10,13 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.InOut;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
+import com.zy.asrs.service.InOutService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -41,6 +44,8 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private InOutService inOutService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -62,7 +67,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("maktx", condition).or().like("model", condition);
}
wrapper.orderBy("create_time", false);
List<Mat> mats = matService.selectList(wrapper);
@@ -75,7 +81,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)));
@@ -92,10 +98,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("name")
+ , param.get("specs"))
);
}
@@ -120,13 +127,22 @@
return R.error("缂栧彿宸插瓨鍦�");
}
Date now = new Date();
+ InOut inOut=new InOut();
mat.setCreateBy(getUserId());
mat.setCreateTime(now);
mat.setUpdateBy(getUserId());
mat.setUpdateTime(now);
mat.setStatus(1);
+ inOut.setMatnr(mat.getMatnr());
+ inOut.setMaktx(mat.getMaktx());
+ inOut.setColor(mat.getColor());
+ inOut.setSpecs(mat.getSpecs());
+ inOut.setTemp1("");
if (!matService.insert(mat)) {
- throw new CoolException("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ throw new CoolException("鍟嗗搧妗ｆ娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ if (!inOutService.insert(inOut)){
+ throw new CoolException("鍟嗗搧淇℃伅娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
return R.ok();
}
@@ -156,6 +172,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")
@@ -203,7 +241,7 @@
return R.ok();
}
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(orderDetl);
+ orderDetl.sync(mat);
orderDetl.setAnfme(0.0D);
return R.ok().add(orderDetl);
}
@@ -292,14 +330,14 @@
@ManagerAuth
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
- .andNew().like("matnr", condition).or().like("maktx", condition)
+ .andNew().like("matnr", condition).or().like("maktx", condition).or().like("model",condition)
.orderBy("create_time", false);
List<Mat> mats = matService.selectPage(new Page<>(1, 30), wrapper).getRecords();
List<KeyValueVo> valueVos = new ArrayList<>();
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