From 74546b829d63fd3ff7f625d5906536dbab511161 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 03 七月 2025 12:41:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms --- 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