From 076cd7a73eb60c86d43eda67c5625704576d44cc Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 03 二月 2026 17:32:03 +0800
Subject: [PATCH] 实现mes空托和agv任务接口

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
index c50d583..a82c6c0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -182,6 +182,9 @@
         }
         StringBuilder errorBuilder = new StringBuilder();
         List<Long> areaTypeList = LocUtils.getAreaTypeList(station.getStationName());
+        if (areaTypeList.isEmpty()) {
+            throw new CoolException("鏈煡璇㈠埌璧风偣鍙叆搴撳尯锛堝簱浣嶈鍒欐湭閰嶇疆锛夛紒锛侊紒");
+        }
         for (Long areaType : areaTypeList) {
             if (errorBuilder.length() > 0) {
                 errorBuilder.append(",");
@@ -226,7 +229,8 @@
 //                throw new CoolException("璇ョ珯鐐瑰搴斿簱鍖烘湭鎵惧埌搴撲綅");
             }
 
-            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+            String ruleCode = StringUtils.isBlank(param.getTaskNo()) ?
+                    SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null) : param.getTaskNo();
             if (StringUtils.isBlank(ruleCode)) {
                 throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!");
             }
@@ -249,6 +253,7 @@
                     .setOrgSite(station.getStationName())
                     .setBarcode(param.getContainerNo())
                     .setTargSite(stationName)
+                    .setTaskOrigin(StringUtils.isBlank(param.getTaskOrigin()) ? null : param.getTaskOrigin())
                     .setCreateBy(loginUserId)
                     .setUpdateBy(loginUserId);
             if (!taskService.save(task)) {

--
Gitblit v1.9.1