From dd6df6f04bc7419f639447be37793927dac62f23 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 04 9月 2025 16:52:09 +0800
Subject: [PATCH] 222
---
wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs b/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
index 3c25fe8..034bbc8 100644
--- a/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
@@ -19,6 +19,16 @@
/// </summary>
public class MyExtend
{
+
+ /// <summary>
+ /// 娑堟伅鏃堕棿瀛楃涓�
+ /// </summary>
+ /// <returns></returns>
+ public static string MsgTimeStr()
+ {
+ return "[娑堟伅鏃堕棿:" + DateTimeHelper.ConvertToStringForOnlyShowTime(DateTime.Now) + "]";
+ }
+
/// <summary>
/// 鏄惁鏄� 鐗╂枡搴撳瓨鐨勮浆绉�
/// </summary>
@@ -496,7 +506,7 @@
throw new Exception("鍏ュ簱浠诲姟锛岀洰鏍囩珯鐐规壘涓嶅埌锛宼oPlace锛�" + finishTask.toPlace);
}
OutInStockRecordHandler.AddOutInStockRecord(mod, OutInFlag.鍏ュ簱, finishTask.sourcePlace, finishTask.toPlace, finishTask, "鍏ュ簱绫诲瀷鐨勪换鍔�");
- OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍏ュ簱, finishTask.sourcePlace, finishTask.toPlace, finishTask, "鍏ュ簱绫诲瀷鐨勪换鍔�", currentTaskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫叆搴�
+ OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍏ュ簱, finishTask.toPlace, finishTask, "鍏ュ簱绫诲瀷鐨勪换鍔�", currentTaskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫叆搴�
#endregion
break;
case taskType.缂镐綋涓嬬嚎:
@@ -546,6 +556,7 @@
materialId = newMaterial.materialId;
}
}
+ System.Collections.Generic.List<productStockList> insert_productStocks = new List<productStockList>();
if (pos != null && orderList.Count > 0)
{
productStock stock = new productStock();
@@ -574,6 +585,7 @@
stockList.productName = item.productName;
stockList.serialNumber = item.serialNumber;
mod.productStockList.Add(stockList);
+ insert_productStocks.Add(stockList);
}
}
@@ -587,7 +599,7 @@
#endregion
OutInStockRecordHandler.AddOutInStockRecord(mod, OutInFlag.鍏ュ簱, finishTask.sourcePlace, finishTask.toPlace, finishTask, "鍏ュ簱绫诲瀷鐨勪换鍔�");
- OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍏ュ簱, finishTask.sourcePlace, finishTask.toPlace, finishTask, "鍏ュ簱绫诲瀷鐨勪换鍔�", currentTaskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫叆搴�
+ OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍏ュ簱, finishTask.toPlace, finishTask, "鍏ュ簱绫诲瀷鐨勪换鍔�", insert_productStocks, currentTaskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫叆搴�
}
else
{
@@ -671,7 +683,7 @@
errMsg = "缂哥洊涓婄嚎/缂镐綋涓婄嚎浠诲姟锛屼腑杞綅涓虹┖锛屾殏涓嶅鐞�";
return false;
}
- OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍑哄簱, finishTask.sourcePlace, finishTask.toPlace, finishTask, "鍑哄簱绫诲瀷鐨勪换鍔�", currentTaskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
+ OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍑哄簱, finishTask.sourcePlace, finishTask, "鍑哄簱绫诲瀷鐨勪换鍔�", currentTaskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
break;
default://鍏朵粬锛屽嚭搴撶‘璁�
//finishTask.taskStatus = 3;
@@ -794,7 +806,7 @@
//璁剧疆鐩爣浣嶆湁璐�
PositionHandler.Free(true, to_positionStation, "澶勭悊 缂镐綋涓婄嚎鍒版梺璺伐浣嶇殑澶勭悊 鐨勪换鍔�", SysGloble.WCSNAME, item);
- OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍑哄簱, item.sourcePlace, item.toPlace, item, "鍑哄簱绫诲瀷鐨勪换鍔�", _taskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
+ OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍑哄簱, item.toPlace, item, "鍑哄簱绫诲瀷鐨勪换鍔�", _taskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
OutInStockRecordHandler.AddOutInStockRecord(mod, OutInFlag.鍑哄簱, item.sourcePlace, item.toPlace, item, "鍑哄簱绫诲瀷鐨勪换鍔�");
//閫氱煡澶╂案,缁欏ぉ姘稿彂淇″彿
@@ -1005,7 +1017,8 @@
List<productStockList> delteStockDatalist = mod.productStockList.Where(x => x.stockId == delteData.positionId).ToList();
if (delteStockDatalist.Count > 0)
{
- OutInStockRecord_V2_MesHandler.AddRecordForPersonDelete(mod, OutInFlag.鍑哄簱, "鍒犻櫎搴撳瓨:" + preLog, delteStockDatalist, delteStockData.First());//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
+ OutInStockRecord_V2_MesHandler.AddRecordForPersonDelete(mod, OutInFlag.鍑哄簱, "鍒犻櫎搴撳瓨:" + preLog,
+ delteStockDatalist, delteStockData.First(), positionName);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
foreach (var itemList in delteStockDatalist)
{
mod.productStockList.Remove(itemList);
@@ -1038,7 +1051,7 @@
}
catch (Exception ex)
{
- res = "鍒犻櫎寮傚父,璇锋鏌ュ弬鏁�";
+ res = "鍒犻櫎寮傚父,璇锋鏌ュ弬鏁�:" + ex.Message;
WZ.Useful.Commons.LogTextHelper.WriteLine("IyunneiWcf", "TaskDisplay", ex.ToString());
throw ex;
}
--
Gitblit v1.9.3