Merge branch 'hwh'

hwh

2024-07-15 7ceb9b642fc01412fc4fe3e1a44f55cc79c10c88

 Wms/WMS.BLL/BllTaskServer/BllTaskSyncServer.cs

@@ -1,5 +1,6 @@
using Model.InterFaceModel;
using Model.ModelDto.BllTaskDto;
using Model.ModelDto.SysDto;
using Model.ModelVm.BllTaskVm;
using Newtonsoft.Json;
using SqlSugar;
@@ -7,6 +8,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Utility;
using Utility.Tools;
using WMS.BLL.LogServer;
using WMS.DAL;
@@ -27,6 +30,7 @@
        public BllTaskSyncServer() : base(Db)
        {
        }

        /// <summary>
        /// 获取任务列表
        /// </summary>
@@ -57,7 +61,7 @@
                        StartLocat = it.StartLocat,
                        EndLocat = it.EndLocat,
                        PalletNo = it.PalletNo,
                        PalletType=it.PalletType,
                        PalletType = it.PalletType,
                        FinishDate = it.FinishDate == null ? "" : Convert.ToDateTime(it.FinishDate).ToString("yyyy-MM-dd HH:mm:ss"),
                        WCSName = it.WCSName,
                        CreateTime = it.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -120,7 +124,7 @@
                entry.WCSName = model.WCSName;
                //添加任务信息
                Db.Insertable(entry).ExecuteCommand();
                

                if (model.Type == "0" || model.Type == "2")//入库任务、移库任务
                {
                    //目标储位
@@ -167,7 +171,7 @@
                        BitPalletMark = "0",
                        IsBale = "0",
                        IsBelt = "0",
                        CompleteTime=model.FinishDate,//完成时间
                        CompleteTime = model.FinishDate,//完成时间
                        CreateTime = _dateNow
                    };
                    var bindId = Db.Insertable(bind).ExecuteReturnIdentity();
@@ -233,7 +237,7 @@
        /// </summary>
        /// <param name="taskNo"></param>
        /// <param name="orderNo"></param>
        public void HandleTaskSync(string taskNo, string orderNo,string url, int userId)
        public void HandleTaskSync(string taskNo, string orderNo, string url, int userId)
        {
            try
            {
@@ -465,8 +469,8 @@
                            IsBelt = bindInfo.IsBelt,
                            Demo = bindInfo.Demo,

                            OwnerNo= arrivalNotice.CustomerNo,//供应商编码
                            OwnerName=arrivalNotice.CustomerName,//供应商名称
                            OwnerNo = arrivalNotice.CustomerNo,//供应商编码
                            OwnerName = arrivalNotice.CustomerName,//供应商名称

                            IsDel = "0",
                            CreateUser = 0,
@@ -538,8 +542,8 @@
                                CreateUser = userId,
                                CreateTime = (DateTime)task.FinishDate,

                                OwnerNo=arrivalNotice.CustomerNo,
                                OwnerName=arrivalNotice.CustomerName
                                OwnerNo = arrivalNotice.CustomerNo,
                                OwnerName = arrivalNotice.CustomerName
                            };
                            Db.Insertable(dataStockInfo).ExecuteCommand();
                        }
@@ -603,7 +607,7 @@
                        exTask.Msg = $"入库口到=>>{task.EndLocat}的入库任务";//关键信息
                        #endregion
                        break;
                    

                    case "1"://出库任务
                        #region 出库任务处理逻辑
                        if (task.PalletType == "1")//空托出库
@@ -785,8 +789,8 @@
                        exTask.OrderType = "1";//出库单
                        exTask.Msg = $"{task.StartLocat}的出库任务";//关键信息
                        break;
                        #endregion
                    
                    #endregion

                    case "2"://移库任务
                        #region 移库任务处理逻辑
                        //托盘库存明细
@@ -936,7 +940,7 @@
                Db.CommitTran();
            }
            catch (Exception e)
            { 
            {
                //回滚事务
                Db.RollbackTran();
                throw new Exception(e.Message);
@@ -961,7 +965,7 @@
                {
                    sqlString = $"select SONo from BllExportNotice where Status in ('1','2','3') and IsDel='0' order by CreateTime;";
                }
                

                var modelList = Db.Ado.SqlQuery<string>(sqlString);

                return modelList;