From b08bfd050511ed27e0bde0bd4095eed1fdb5ddeb Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 01 9月 2025 11:43:32 +0800
Subject: [PATCH] 暂时提交
---
wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs b/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
index 1c19bbf..3c25fe8 100644
--- a/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
@@ -19,6 +19,26 @@
/// </summary>
public class MyExtend
{
+ /// <summary>
+ /// 鏄惁鏄� 鐗╂枡搴撳瓨鐨勮浆绉�
+ /// </summary>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
+ public static bool IsMaterilStockMove(taskType currentTaskType)
+ {
+ if (currentTaskType == taskType.绌哄簱浣�
+ || currentTaskType == taskType.鍛煎彨绌烘墭
+ || currentTaskType == taskType.绌烘墭鍥炲簱
+ || currentTaskType == taskType.绌烘墭涓嬬嚎鍏ュ簱
+ || currentTaskType == taskType.绌烘墭鎵嬪姩鍏ュ簱
+ || currentTaskType == taskType.绌烘墭浜哄伐鍑哄簱
+ || currentTaskType == taskType.鏃佽矾宸ヤ綅缂镐綋绌烘墭鍥炲簱
+ )
+ {
+ return false;
+ }
+ return true;
+ }
public static string HandlerNoIssuedTaskFor鏃佽矾宸ヤ綅缂镐綋绌烘墭鎴栦綑鏂欏洖搴�(dbmodel mod, string convPlace, task item, string[] agvSendStatus)
{
@@ -476,6 +496,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);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫叆搴�
#endregion
break;
case taskType.缂镐綋涓嬬嚎:
@@ -566,6 +587,7 @@
#endregion
OutInStockRecordHandler.AddOutInStockRecord(mod, OutInFlag.鍏ュ簱, finishTask.sourcePlace, finishTask.toPlace, finishTask, "鍏ュ簱绫诲瀷鐨勪换鍔�");
+ OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍏ュ簱, finishTask.sourcePlace, finishTask.toPlace, finishTask, "鍏ュ簱绫诲瀷鐨勪换鍔�", currentTaskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫叆搴�
}
else
{
@@ -592,7 +614,9 @@
finishTask.remark = "瀹屾垚";
finishTask.finishTime = DateTime.Now;
- var result = deleteProduct(false, "sys", mod, finishTask.sourcePlace, finishTask, ref errMsg);//鍒犻櫎搴撳瓨
+
+
+ var result = deleteProduct(false, "sys", mod, finishTask.sourcePlace, finishTask, ref errMsg, "鍫嗗灈鏈轰换鍔″畬鎴�-鎵嬪姩鍑哄簱");//鍒犻櫎搴撳瓨
if (result == false) throw new Exception(errMsg);
OutInStockRecordHandler.AddOutInStockRecord(mod, OutInFlag.鍑哄簱, finishTask.sourcePlace, finishTask.toPlace, finishTask, "鍑哄簱绫诲瀷鐨勪换鍔�");
@@ -647,6 +671,7 @@
errMsg = "缂哥洊涓婄嚎/缂镐綋涓婄嚎浠诲姟锛屼腑杞綅涓虹┖锛屾殏涓嶅鐞�";
return false;
}
+ OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍑哄簱, finishTask.sourcePlace, finishTask.toPlace, finishTask, "鍑哄簱绫诲瀷鐨勪换鍔�", currentTaskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
break;
default://鍏朵粬锛屽嚭搴撶‘璁�
//finishTask.taskStatus = 3;
@@ -769,6 +794,7 @@
//璁剧疆鐩爣浣嶆湁璐�
PositionHandler.Free(true, to_positionStation, "澶勭悊 缂镐綋涓婄嚎鍒版梺璺伐浣嶇殑澶勭悊 鐨勪换鍔�", SysGloble.WCSNAME, item);
+ OutInStockRecord_V2_MesHandler.AddRecord(mod, OutInFlag.鍑哄簱, item.sourcePlace, item.toPlace, item, "鍑哄簱绫诲瀷鐨勪换鍔�", _taskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
OutInStockRecordHandler.AddOutInStockRecord(mod, OutInFlag.鍑哄簱, item.sourcePlace, item.toPlace, item, "鍑哄簱绫诲瀷鐨勪换鍔�");
//閫氱煡澶╂案,缁欏ぉ姘稿彂淇″彿
@@ -948,7 +974,7 @@
/// <param name="positionName"></param>
/// <param name="res"></param>
/// <returns></returns>
- public static bool deleteProduct(bool isPerson, string user, dbmodel mod, string positionName, task _task, ref string res)
+ public static bool deleteProduct(bool isPerson, string user, dbmodel mod, string positionName, task _task, ref string res, string preLog)
{
res = "";
string[] stations = { "GTU1", "GTU2", "GTU3", "GGU1", "GGU2", "GGU3" };
@@ -979,6 +1005,7 @@
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());//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
foreach (var itemList in delteStockDatalist)
{
mod.productStockList.Remove(itemList);
@@ -1039,27 +1066,27 @@
//var queryTask6 = (int)taskType.浣欐枡鍥炲簱;
var queryStats = (int)taskStatus.瀹屾垚;
- var allQty = mod.task.Where(x =>
+ var allQty = mod.task.Where(x =>
//(
- //x.taskType == queryTask1
- //|| x.taskType == queryTask2
- //|| x.taskType == queryTask3
- //|| x.taskType == queryTask4
- //|| x.taskType == queryTask5
- //|| x.taskType == queryTask6
+ //x.taskType == queryTask1
+ //|| x.taskType == queryTask2
+ //|| x.taskType == queryTask3
+ //|| x.taskType == queryTask4
+ //|| x.taskType == queryTask5
+ //|| x.taskType == queryTask6
//) &&
x.taskStatus == queryStats).Count();
var nowDateTimeStr_1 = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00");
var nowDateTimeStr_2 = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59");
- var todayQty = mod.task.Where(x =>
- //(
- //x.taskType == queryTask1
- //|| x.taskType == queryTask2
- //|| x.taskType == queryTask3
- //|| x.taskType == queryTask4
- //|| x.taskType == queryTask5
- //|| x.taskType == queryTask6
+ var todayQty = mod.task.Where(x =>
+ //(
+ //x.taskType == queryTask1
+ //|| x.taskType == queryTask2
+ //|| x.taskType == queryTask3
+ //|| x.taskType == queryTask4
+ //|| x.taskType == queryTask5
+ //|| x.taskType == queryTask6
//) &&
x.taskStatus == queryStats
&& x.finishTime != null && x.finishTime >= nowDateTimeStr_1 && x.finishTime <= nowDateTimeStr_2
@@ -1067,7 +1094,7 @@
var nowDateTimeStr_3 = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");
var nowDateTimeStr_4 = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM") + "-30 23:59:59");
- var monthQty = mod.task.Where(x =>
+ var monthQty = mod.task.Where(x =>
// (
// x.taskType == queryTask1
// || x.taskType == queryTask2
--
Gitblit v1.9.3