From 1b230d7961b2d5068298f0cba13287cabd2fd649 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 17 七月 2024 18:47:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 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 66fabfa..603e82e 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(){
@@ -106,6 +112,7 @@
return R.ok(matService.getPage(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
+ , param.get("matnr2")
, param.get("maktx")
, param.get("specs")
)
@@ -318,5 +325,29 @@
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