From d65706897624d236dc853203e28c6ba0bee01328 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Tue, 10 Jun 2025 16:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=99=E7=AE=B1=E5=88=B0?=
 =?UTF-8?q?=E8=BE=BE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DB/tbl_app_err_record.sql                     | 34 +++++++++++++++++++
 .../CirculationTask/Convey/UploadBoxArrive.cs | 21 +++++++-----
 2 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 DB/tbl_app_err_record.sql

diff --git a/DB/tbl_app_err_record.sql b/DB/tbl_app_err_record.sql
new file mode 100644
index 0000000..297578d
--- /dev/null
+++ b/DB/tbl_app_err_record.sql
@@ -0,0 +1,34 @@
+/*
+ Navicat Premium Dump SQL
+
+ Source Server         : localhost
+ Source Server Type    : MySQL
+ Source Server Version : 80404 (8.4.4)
+ Source Host           : localhost:3306
+ Source Schema         : wcs_szkt
+
+ Target Server Type    : MySQL
+ Target Server Version : 80404 (8.4.4)
+ File Encoding         : 65001
+
+ Date: 24/05/2025 15:13:32
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for tbl_app_err_record
+-- ----------------------------
+DROP TABLE IF EXISTS `tbl_app_err_record`;
+CREATE TABLE `tbl_app_err_record` (
+  `record_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '记录号',
+  `area` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '报警区域',
+  `err_no` int NOT NULL COMMENT '报警编号',
+  `equipment_id` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备号',
+  `create_time` datetime NOT NULL COMMENT '发生时间',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`record_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC;
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs b/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs
index af902f0..0ae5b32 100644
--- a/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs
+++ b/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs
@@ -61,15 +61,20 @@ public class UploadBoxArrive(AppConveyStandDao conveyStandDao, ConveyOperation c
                 }
                 else
                 {
-                    var pickTask = pickTasks[0]; // 拣选任务
-                    conveyTaskDao.Update(new AppConveyTask()
+                    var completeTime = DateTime.Now;
+                    List<AppConveyTask> updateTasks = [];
+                    foreach (var pickTask in pickTasks)
                     {
-                        TaskId = pickTask.TaskId,
-                        TaskStatus = (int)ConveyTaskStatusEnum.arrive,
-                        ArriveLocation = stand.StandId,
-                        CompleteTime = DateTime.Now,
-                        Remark = "PLC上报料箱到达"
-                    }); // 更新表内拣选时间和状态
+                        updateTasks.Add(new AppConveyTask()
+                        {
+                            TaskId = pickTask.TaskId,
+                            TaskStatus = (int)ConveyTaskStatusEnum.arrive,
+                            ArriveLocation = stand.StandId,
+                            CompleteTime = completeTime,
+                            Remark = "PLC上报料箱到达"
+                        });
+                    }
+                    conveyTaskDao.Update(updateTasks.ToArray()); // 更新表内拣选时间和状态
                 }
                 // 发送wms料箱到达
                 UploadPickStandRequest request = new()