From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/MatController.java | 36 ++++++------------------------------
1 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 257417f..bd09394 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -12,14 +12,11 @@
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.OrderDetlPakout;
import com.zy.asrs.entity.result.KeyValueVo;
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;
@@ -55,7 +52,7 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
- @Value("mes.url")
+ @Value("${mes.url}")
private String url;
@RequestMapping(value = "/mat/auto/matnr/auth")
@@ -98,27 +95,6 @@
return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
}
- @RequestMapping(value = "/mat/tiaoma/auth")
- @ManagerAuth
- public 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
@@ -264,10 +240,10 @@
if (mat == null) {
return R.ok();
}
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setAnfme(0.0D);
- return R.ok().add(orderDetl);
+ OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
+ orderDetlPakout.sync(mat);
+ orderDetlPakout.setAnfme(0.0D);
+ return R.ok().add(orderDetlPakout);
}
/*************************************** 鎵撳嵃鐩稿叧 ***********************************************/
--
Gitblit v1.9.1