From cf5ef52a94c25e2ce92d0a0b7ebca62d81852873 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 02 9月 2025 16:20:21 +0800
Subject: [PATCH] 数据清理
---
wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs | 3 ++-
wcs/yunneiWCS/yunneiWCS/DataAccess/OutInStockRecord_V2_MesHandler.cs | 14 +++++++-------
wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs | 11 ++++++-----
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/DataAccess/OutInStockRecord_V2_MesHandler.cs b/wcs/yunneiWCS/yunneiWCS/DataAccess/OutInStockRecord_V2_MesHandler.cs
index a0b5f58..8d99096 100644
--- a/wcs/yunneiWCS/yunneiWCS/DataAccess/OutInStockRecord_V2_MesHandler.cs
+++ b/wcs/yunneiWCS/yunneiWCS/DataAccess/OutInStockRecord_V2_MesHandler.cs
@@ -27,7 +27,7 @@
/// <param name="productStocks"></param>
/// <param name="currentTaskType"></param>
public static void AddRecordForPersonDelete(dbmodel mod, OutInFlag _outInFlag, string remark,
- System.Collections.Generic.List<productStockList> productStocks, productStock modfiyStock)
+ System.Collections.Generic.List<productStockList> productStocks, productStock modfiyStock, string positionName)
{
try
{
@@ -43,7 +43,7 @@
Wms_outInStockRecord_V2_Mes log = new Wms_outInStockRecord_V2_Mes()
{
ID = Yitter.IdGenerator.YitIdHelper.NextId(),
- sourcePlace = "",
+ sourcePlace = positionName,
toPlace = "",
containerCode = modfiyStock.containerCode,
@@ -97,7 +97,7 @@
throw ex;
}
}
- private static void AddRecord(dbmodel mod, OutInFlag _outInFlag, string sourcePlace, string toPlace, task _task, string remark,
+ private static void AddRecord(dbmodel mod, OutInFlag _outInFlag, string positionName, task _task, string remark,
System.Collections.Generic.List<productStockList> productStocks, taskType currentTaskType)
{
try
@@ -114,8 +114,8 @@
Wms_outInStockRecord_V2_Mes log = new Wms_outInStockRecord_V2_Mes()
{
ID = Yitter.IdGenerator.YitIdHelper.NextId(),
- sourcePlace = sourcePlace,
- toPlace = toPlace,
+ sourcePlace = positionName,
+ toPlace = "",
containerCode = _task.containerCode,
LastModifier = _task.creator,
@@ -166,14 +166,14 @@
}
}
- public static void AddRecord(dbmodel mod, OutInFlag _outInFlag, string sourcePlace, string toPlace, task _task, string remark,
+ public static void AddRecord(dbmodel mod, OutInFlag _outInFlag, string positionName, task _task, string remark,
taskType currentTaskType)
{
var stock = mod.productStock.Where(a => a.containerCode == _task.containerCode).FirstOrDefault();
if (stock != null)
{
System.Collections.Generic.List<productStockList> productStocks = mod.productStockList.Where(a => a.stockId == stock.stockId).ToList();
- AddRecord(mod, _outInFlag, sourcePlace, toPlace, _task, remark,
+ AddRecord(mod, _outInFlag, positionName, _task, remark,
productStocks, currentTaskType);
}
}
diff --git a/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs b/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
index ba65b8a..5ffdeac 100644
--- a/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
+++ b/wcs/yunneiWCS/yunneiWCS/ExtendFunction/MyExtend.cs
@@ -506,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.缂镐綋涓嬬嚎:
@@ -597,7 +597,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, "鍏ュ簱绫诲瀷鐨勪换鍔�", currentTaskType);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫叆搴�
}
else
{
@@ -681,7 +681,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;
@@ -804,7 +804,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, "鍑哄簱绫诲瀷鐨勪换鍔�");
//閫氱煡澶╂案,缁欏ぉ姘稿彂淇″彿
@@ -1015,7 +1015,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);
diff --git a/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs b/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs
index 86a42a7..60c4d10 100644
--- a/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs
+++ b/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs
@@ -2325,7 +2325,8 @@
preLog = "浜哄伐鍒嗘嫞";
}
- OutInStockRecord_V2_MesHandler.AddRecordForPersonDelete(mod, OutInFlag.鍑哄簱, "浜哄伐鍒犻櫎搴撳瓨:" + preLog, record_delteList, modfiyStock);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
+ OutInStockRecord_V2_MesHandler.AddRecordForPersonDelete(mod, OutInFlag.鍑哄簱, "浜哄伐鍒犻櫎搴撳瓨:" + preLog,
+ record_delteList, modfiyStock, (currentStock != null ? currentStock.positionName : ""));//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
int res = mod.SaveChanges();
if (res > 0)
--
Gitblit v1.9.3