From c732023df8f25a038d22dd29033c04b562f837e2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 31 五月 2024 20:04:27 +0800
Subject: [PATCH] #新旧物料更新接口
---
src/main/java/com/zy/asrs/controller/MatController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 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 b842a73..a7bb3f7 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -14,6 +14,8 @@
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.result.KeyValueVo;
+import com.zy.asrs.service.AgvLocDetlService;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -41,6 +43,10 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -57,12 +63,23 @@
return R.ok().add(mats);
}
+ @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/search/pda/auth")
@ManagerAuth
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).or().like("specs", condition);
}
wrapper.orderBy("create_time", false);
List<Mat> mats = matService.selectList(wrapper);
@@ -75,7 +92,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)));
@@ -95,7 +112,9 @@
return R.ok(matService.getPage(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
- , param.get("maktx"))
+ , param.get("maktx")
+ , param.get("specs")
+ )
);
}
@@ -203,7 +222,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 +318,35 @@
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("/mat/updateMatnrToMatnr2")
+ @Transactional
+ public R updateMatnrToMatnr2(@RequestParam String matnrOld, @RequestParam String matnrNew) {
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnrOld));
+ if (mat == null) {
+ return R.error("鐗╂枡涓嶅瓨鍦�");
+ }
+
+ //鏇存柊鐗╂枡
+ mat.setMatnr2(matnrOld);
+ mat.setMatnr(matnrNew);
+ if (!matService.updateById(mat)) {
+ throw new CoolException("鐗╂枡鏇存柊澶辫触");
+ }
+
+ //鏇存柊鍥涘悜搴撳簱瀛樼墿鏂欏彿
+ int count = locDetlService.updateNewMatnr(matnrOld, matnrNew);
+
+ //鏇存柊AGV搴撳簱瀛樼墿鏂欏彿
+ int count2 = agvLocDetlService.updateNewMatnr(matnrOld, matnrNew);
+ return R.ok("鐗╂枡鍙凤細" + matnrOld + "=====>鍙樻洿锛�" + matnrNew + "銆傚洓鍚戝簱搴撳瓨鐗╂枡鍙峰彉鏇存暟閲忥細" + count + "锛孉GV搴撳瓨鐗╂枡鍙峰彉鏇存暟閲忥細" + count2);
+ }
+
}
--
Gitblit v1.9.1