From 2a9bf520f65e85777fff0f20f4c84ba9a810eef5 Mon Sep 17 00:00:00 2001
From: yyk <2336760928@qq.com>
Date: 星期四, 29 八月 2024 13:54:46 +0800
Subject: [PATCH] Merge branch 'yyk'
---
Wms/WMS.BLL/BllTaskServer/BllTaskSyncServer.cs | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/Wms/WMS.BLL/BllTaskServer/BllTaskSyncServer.cs b/Wms/WMS.BLL/BllTaskServer/BllTaskSyncServer.cs
index 04fb3d6..1723543 100644
--- a/Wms/WMS.BLL/BllTaskServer/BllTaskSyncServer.cs
+++ b/Wms/WMS.BLL/BllTaskServer/BllTaskSyncServer.cs
@@ -1,5 +1,6 @@
锘縰sing 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;
--
Gitblit v1.8.0