From 7baa52155b707ce0d89390e80cbba2acc0a0b1d6 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期四, 29 八月 2024 09:44:13 +0800
Subject: [PATCH] 增加互斥锁只允许存在一个窗口
---
HandleData/AE_MES_ERP.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/HandleData/AE_MES_ERP.cs b/HandleData/AE_MES_ERP.cs
index 8bc8136..8360e9c 100644
--- a/HandleData/AE_MES_ERP.cs
+++ b/HandleData/AE_MES_ERP.cs
@@ -144,6 +144,8 @@
case "TB_MESTOERP_SCDDXD"://鎺ㄩ�佸鏍搁�佽揣鍗�
case "TB_MESTOERP_TransferIn"://鍒嗗竷寮忚皟鍏ュ崟
case "TB_MESTOERP_ZJDB"://鐩存帴璋冩嫧鍗�
+ case "TB_MESTOERP_WWDDXD"://濮斿璁㈠崟涓嬭揪
+ case "TB_MESTOERP_WWCG"://濮斿涓嬫帹閲囪喘
result = MesToErp(drSource, ref msg, rtaskid);
break;
case "TB_MESTOERP_GDRK"://ERP宸ュ崟鍏ュ簱鏌ヨ
@@ -1221,7 +1223,7 @@
try
{
DataTable dt = ds.Tables[0];
- if (operatype == "INSERT")
+ if (operatype == "INSERT" || operatype == "UPDATE")
{
#region INSERT
//dt.Columns.Add("MAA005", typeof(string));
@@ -1268,7 +1270,7 @@
GYS005='{5}',
FUseOrgld='{6}'
where ERPID='{0}'; ", dr["ERPID"]
- , dr["GYS001"], dr["GYS002"], dr["GYS003"], dr["GYS004"], dr["GYS005"], dr["FUseOrgld"]);
+ , dr["GYSA001"], dr["GYSA002"], dr["GYSA003"], dr["GYSA004"], dr["GYSA005"], dr["FUseOrgld"]);
}
return _sqlHelper.ExecuteNonQuery(sql) > 0;
#endregion
@@ -3172,7 +3174,6 @@
string res = a.Body(US).msg.ToString();
sql = string.Format(@" update sysdec set states='NEW' WHERE TASK_ID='{0}' ", rtaskid);
-
_sqlHelper.ExecuteNonQuery(sql);
//string res = a.arg0.ws.MES_TO_ERP_DataTransport(task_name, descript, create_time, creator, operatype, source_table, target_table, data, data_inserted, data_deleted);
if (res.Contains("OK"))
@@ -3982,7 +3983,10 @@
colMapping[23] = new SqlBulkCopyColumnMapping("FHB022", "DFB022"); //鍑哄簱涓嬬嚎
colMapping[24] = new SqlBulkCopyColumnMapping("FHB023", "DFB023"); //鏄惁鎺у埗鍑哄簱鏁伴噺
colMapping[25] = new SqlBulkCopyColumnMapping("FHB024", "DFB024"); //绱鍑哄簱鏁�
- colMapping[26] = new SqlBulkCopyColumnMapping("ERP_EntryID", "ID"); //鏄庣粏ID
+ colMapping[26] = new SqlBulkCopyColumnMapping("FHB025", "DFB025"); //浜у搧绫诲瀷
+ colMapping[27] = new SqlBulkCopyColumnMapping("FHB026", "DFB026"); //鐖舵爣璇�
+ colMapping[28] = new SqlBulkCopyColumnMapping("FHB027", "DFB027"); //鏍囪瘑鍒�
+ colMapping[29] = new SqlBulkCopyColumnMapping("ERP_EntryID", "ID"); //鏄庣粏ID
DataTableToSQLServer(dt, conStr, "COMDFB", colMapping, ref ErrorMsg);
#endregion
}
--
Gitblit v1.9.3