From c73b0e2f40e0a143b5f815793de24b060816c664 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 02 七月 2025 10:24:36 +0800
Subject: [PATCH] 完善erp对接

---
 src/main/java/com/zy/asrs/controller/MatController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index b46a4fa..3106ac2 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -100,7 +100,7 @@
 
     @RequestMapping(value = "/mat/tiaoma/auth")
     @ManagerAuth
-    public R findByTiaoMa(@RequestParam("matnr") String matnr, @RequestParam(required = false, value = "orderNo") String orderNo) {
+    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("鏉$爜涓嶅瓨鍦�");
@@ -115,7 +115,7 @@
         Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", codeDataParam.getProductionCode()));
         mat.setMatnr(codeDataParam.getProductionCode());
         mat.setSafeQty(codeDataParam.getQty());
-        mat.setUnit(codeDataParam.getBatchNum());
+        mat.setUnit(null);
         mat.setMemo(matnr);
         return R.ok(mat);
     }

--
Gitblit v1.9.1