From ec7d09ccfc8b833a79f099ccf215c7bb8b8ffb38 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 21 Dec 2023 14:45:44 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E7=90=83=E7=A3=A8=E4=B8=8B=E6=96=99?=
 =?UTF-8?q?=E5=8A=A0=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/pda/pdm/rest/PdmWorkTaskController.java    | 15 ++++++++++++++-
 .../pdm/service/impl/PdmWorkTaskServiceImpl.java  |  1 -
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/rest/PdmWorkTaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/rest/PdmWorkTaskController.java
index 82139e7e..3849624b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/rest/PdmWorkTaskController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/rest/PdmWorkTaskController.java
@@ -2,13 +2,17 @@
 package org.nl.pda.pdm.rest;
 
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.annotation.Log;
+import org.nl.pda.exception.PdaRequestException;
 import org.nl.pda.pdm.service.PdmWorkTaskService;
+import org.nl.wms.common.util.RedissonUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -97,7 +101,16 @@ public class PdmWorkTaskController {
     @Log("球磨下料完成")
     @ApiOperation("球磨下料完成")
     public ResponseEntity<Object> moveQMVehicle(@RequestBody Map whereJson) {
-        return new ResponseEntity<>(workTaskService.moveQMVehicle(whereJson),HttpStatus.OK);
+        if (ObjectUtil.isEmpty(whereJson)) {
+            throw new PdaRequestException("传入参数不能为空！");
+        }
+        RedissonUtils.lock(a->{
+            workTaskService.moveQMVehicle(whereJson);
+        },String.valueOf(whereJson.get("device_code")),null);
+        JSONObject returnjo = new JSONObject();
+        returnjo.put("code", "1");
+        returnjo.put("desc", "操作成功！");
+        return new ResponseEntity<>(returnjo,HttpStatus.OK);
     }
 
     @PostMapping("/queryMixDevice")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
index a7968439..6bac00eb 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
@@ -967,7 +967,6 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> moveQMVehicle(Map jsonObject) {
         if (ObjectUtil.isEmpty(jsonObject)) {
             throw new PdaRequestException("传入参数不能为空！");