From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14:43 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 10 ++--
rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java | 2 +
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java | 25 ++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 38 +++++++++++++++++--
4 files changed, 65 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 7991ead..0fabcf6 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -140,12 +140,12 @@
warehouse: '浠撳簱',
warehouseAreas: '搴撳尯',
loc: '搴撲綅',
- locType: '搴撲綅绫诲瀷',
- locArea: '閫昏緫鍒嗗尯',
- locAreaMat: '閫昏緫鍒嗗尯',
+ locType: '搴撲綅绫诲瀷(搴�)',
+ locArea: '閫昏緫鍒嗗尯(搴�)',
+ locAreaMat: '閫昏緫鍒嗗尯(搴�)',
locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴',
- container: '瀹瑰櫒绠＄悊',
- contract: '鍚堝悓淇℃伅',
+ container: '瀹瑰櫒绠＄悊(搴�)',
+ contract: '鍚堝悓淇℃伅(搴�)',
qlyInspect: '璐ㄦ淇℃伅',
qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
dictType: '鏁版嵁瀛楀吀',
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
index 3a0fff3..129de11 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
@@ -8,6 +8,7 @@
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +23,7 @@
@Autowired
private WcsService wcsService;
-// @ApiOperation(value = "wcs鐢熸垚鍏ュ簱浠诲姟鎺ュ彛")
+ @ApiOperation(value = "wcs鐢熸垚鍏ュ簱浠诲姟鎺ュ彛")
@PostMapping("/create/in/task")
public R createInTask(@RequestBody TaskInParam param) {
if (Cools.isEmpty(param.getIoType())) {
@@ -43,5 +44,27 @@
}
+ @ApiOperation(value = "agv鍙栬揣瀹屾垚鎺ュ彛")
+ @PostMapping("/agv/pickUp/complete")
+ public R AgvTaskPickUpComplete(@RequestBody TaskInParam param) {
+ if (Cools.isEmpty(param.getIoType())) {
+ return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜涓嶈兘涓虹┖");
+ }
+ if (param.getIoType().equals(TaskType.TASK_TYPE_AGV_IN.type)) {
+ return R.error("鍏ュ簱绫诲瀷鏈夎");
+ }
+ wcsService.agvTaskPickUpComplete(param);
+
+ return R.ok();
+
+
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java
index 433194a..46b655a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java
@@ -5,4 +5,6 @@
public interface WcsService {
InTaskMsgDto createInTask(TaskInParam param, Long loginUserId);
+
+ void agvTaskPickUpComplete(TaskInParam param);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index b5d8d35..4e610b6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -7,14 +7,11 @@
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.entity.dto.LocTypeDto;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
-import com.vincent.rsf.server.manager.enums.OrderType;
-import com.vincent.rsf.server.manager.enums.TaskStsType;
-import com.vincent.rsf.server.manager.enums.TaskType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.api.utils.SlaveProperties;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -52,6 +49,37 @@
private TaskItemService taskItemService;
@Autowired
private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private BasStationService basStationService;
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void agvTaskPickUpComplete(TaskInParam param) {
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getBarcode, param.getBarcode())
+ );
+ if (null == task) {
+ throw new CoolException("鏈壘鍒颁换鍔′俊鎭�");
+ }
+// if (!task.getTaskStatus().equals(TaskStsType.WCS_CONVEYOR_START.id)){
+// throw new CoolException("浠诲姟鐘舵�佹湁璇�");
+// }
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, param.getSourceStaNo())
+ );
+ if (null == basStation) {
+ throw new CoolException("鏈壘鍒扮珯鐐逛俊鎭�");
+ }
+ task.setTaskStatus(TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id);
+ taskService.updateById(task);
+
+ basStation.setUseStatus(StaUseStatusType.TYPE_O.type);
+ basStation.setBarcode(null);
+ basStationService.updateById(basStation);
+
+
+ }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -89,6 +117,8 @@
return locNo;
}
+
+
/**
* 楠岃瘉璁惧绔欑偣
*/
--
Gitblit v1.9.1