From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/MatController.java | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 15f9a90..eacf7aa 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -17,9 +17,6 @@
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.MobileService;
import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.third.CodeDataParam;
-import com.zy.asrs.third.CodeParam;
-import com.zy.asrs.third.TokenUtils;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -98,27 +95,7 @@
return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
}
- @RequestMapping(value = "/mat/tiaoma/auth")
- @ManagerAuth
- public synchronized R findByTiaoMa(@RequestParam("matnr") String matnr, @RequestParam(required = false, value = "orderNo") String orderNo) {
- List<CodeDataParam> data = mobileService.getData(TokenUtils.getToken(url), new CodeParam(Arrays.asList(matnr)));
- if (data == null || data.isEmpty()) {
- return R.error("鏉＄爜涓嶅瓨鍦�");
- }
- CodeDataParam codeDataParam = data.get(0);
- if (!Cools.isEmpty(orderNo)) {
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("matnr", codeDataParam.getProductionCode()));
- if (orderDetls.isEmpty()) {
- return R.error("璇ュ晢鍝佷笉瀛樺湪鍦ㄥ崟鎹腑");
- }
- }
- Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", codeDataParam.getProductionCode()));
- mat.setMatnr(codeDataParam.getProductionCode());
- mat.setSafeQty(codeDataParam.getQty());
- mat.setUnit(codeDataParam.getBatchNum());
- mat.setMemo(matnr);
- return R.ok(mat);
- }
+
@RequestMapping(value = "/mat/list/auth")
@ManagerAuth
--
Gitblit v1.9.1