xiaojiao
2026-03-23 f02d3a8ffc05a10a64859b2a16d5d43c8abb0fb9
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/TaskFinishedAction.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using WIDESEA.Common;
using WIDESEA.Core.Utilities;
@@ -17,7 +18,6 @@
        /// <returns></returns>
        public static WebResponseContent TaskFinishedAction(SaveModel saveModel)
        {
            WebResponseContent content = new WebResponseContent();
            string barcode = string.Empty;
            try
@@ -26,6 +26,22 @@
                Dt_taskinfo taskInfo = Dt_taskinfoRepository.Instance.FindFirst(x => x.task_barcode == barcode);
                if (taskInfo == null)
                    return content.OK($"WMS中没有找到托盘号:【{barcode}】对应的任务");
                else
                {
                    try
                    {
                        string rgvId = saveModel.MainData["rgvId"]?.ToString();
                        if (rgvId != null)
                        {
                            taskInfo.task_rgvId = rgvId;
                        }
                    }
                    catch (Exception)
                    {
                        throw;
                    }
                }
                //区分任务类型
                //空托盘入库
@@ -109,7 +125,7 @@
                        //更改货位状态
                        Dt_locationinfo locationinfo = Dt_locationinfoRepository.Instance.FindFirst(x => x.location_id == taskInfo.task_tolocationid);
                        CommonFunction.ChangeLocationState(locationinfo, LocationState.LocationState_Stored.ToString());
                        //删除任务、添加历史
@@ -181,13 +197,18 @@
                            CommonFunction.ChangeLocationState(locationinfo, LocationState.LocationState_Error.ToString());
                            Dt_container_detail dt_Container_Detail = Dt_container_detailRepository.Instance.FindFirst(x => x.containerdtl_barcode == barcode);
                            dt_Container_Detail.containerdtl_isError = "0";
                            Dt_container_detailRepository.Instance.Update(dt_Container_Detail,true);
                            Dt_container_detailRepository.Instance.Update(dt_Container_Detail, true);
                        }
                        else
                        {
                             CommonFunction.ChangeLocationState(locationinfo, LocationState.LocationState_Stored.ToString());
                            CommonFunction.ChangeLocationState(locationinfo, LocationState.LocationState_Stored.ToString());
                        }
                        Dt_container_detail tempdetail = Dt_container_detailRepository.Instance.Find(x => x.containerdtl_goodsCode == container.containerdtl_goodsCode).FirstOrDefault();
                        tempdetail.containerdtl_text1 = "已测量";
                        Dt_container_detailRepository.Instance.Update(tempdetail, true);
                        //删除任务、添加历史
                        // taskInfo.task_rgvId = rgvId;
                        taskInfo.task_state = TaskState.TaskState_Finished.ToString();