From e7528c1ccedf3d987465bd77a0002c1f2e7670e2 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 11 四月 2024 10:50:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 48c754f..621356c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,12 +2,14 @@
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.param.AgvMobileStartPakin;
import com.zy.asrs.entity.param.AgvMobileStartParam;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,8 +45,9 @@
*/
@PostMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam){
- String message = agvMobileService.comb(combParam, 1l);
- return R.ok(message);
+ agvMobileService.comb(combParam, getUserId());
+
+ return R.ok();
}
/*
@@ -97,6 +100,23 @@
}
/*
+ 鍚姩鍏ュ簱锛岀粍鎵� + 鐢熶骇宸ヤ綔妗�
+ */
+ @PostMapping("/start/pakin/auth")
+ @Synchronized
+ @Transactional
+ public R startPakin(@RequestBody AgvMobileStartPakin params){
+ // 缁勬墭
+ params.getCombParams().forEach(combParam -> {
+ agvMobileService.comb(combParam,getUserId());
+ });
+ params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
+ workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);
+
+ return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
+ }
+
+ /*
鍏ュ簱
*/
@PostMapping("/pakin/empty/auth")
--
Gitblit v1.9.1