From 9d36af31f3646a9ece38f17fcde31f1320d767ec Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 24 六月 2025 13:29:09 +0800
Subject: [PATCH] 增加采购退货
---
frmMain.cs | 8 ++-
HandleData/AE_MES_ERP.cs | 68 +++++++++++++++++++++++++++------
2 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/HandleData/AE_MES_ERP.cs b/HandleData/AE_MES_ERP.cs
index a03fea2..6d57826 100644
--- a/HandleData/AE_MES_ERP.cs
+++ b/HandleData/AE_MES_ERP.cs
@@ -149,6 +149,7 @@
case "TB_MESTOERP_WWDDXD"://濮斿璁㈠崟涓嬭揪
case "TB_MESTOERP_WWLL"://濮斿棰嗘枡鍗�
case "TB_MESTOERP_XSTH"://閿�鍞��璐�
+ case "TB_MESTOERP_CGTL"://閲囪喘閫�璐�
case "TB_MESTOERP_WWCG"://濮斿涓嬫帹閲囪喘
result = MesToErp(drSource, ref msg, rtaskid);
break;
@@ -1211,6 +1212,7 @@
private bool TB_ERPTOMES_GYS(DataSet ds, string operatype, ref string ErrorMsg)
{
string sql = "";
+ string dtName = "";
//鐢ㄦ潵鎷糏D闆嗗悎
List<string> IDList = new List<string>();
@@ -1238,7 +1240,7 @@
{
#region INSERT
//dt.Columns.Add("MAA005", typeof(string));
-
+ dtName = dt.TableName;
foreach (DataRow dr in dt.Rows)
{
IDList.Add(dr["ERPID"].ToString());
@@ -1263,11 +1265,11 @@
colMapping[6] = new SqlBulkCopyColumnMapping("FUseOrgId", "FUseOrgId"); // 鍐�/澶栭攢
if (dt.Columns.Contains("GYSA006"))
{
- colMapping[7] = new SqlBulkCopyColumnMapping("GYSA006", "GYSA006"); //澶囨敞
+ colMapping[7] = new SqlBulkCopyColumnMapping("GYSA006", "GYS006"); //澶囨敞
}
//colMapping[8] = new SqlBulkCopyColumnMapping("AUDITING", "AUDITING");
- return DataTableToSQLServer(dt, conStr, "GS_GYS", colMapping, ref ErrorMsg);
+ DataTableToSQLServer(dt, conStr, "GS_GYS", colMapping, ref ErrorMsg);
#endregion
}
else if (operatype == "UPDATE")
@@ -1316,13 +1318,14 @@
}
sql = string.Format(@" delete from GS_GYS where ERPID in ('{0}'); ", string.Join("','", IDList));
- return _sqlHelper.ExecuteNonQuery(sql) > 0;
+ _sqlHelper.ExecuteNonQuery(sql);
#endregion
}
+ return true;
}
catch (Exception ex)
{
- ErrorMsg = ex.Message;
+ ErrorMsg = "[" + dtName + "]" + ex.Message;
return false;
}
}
@@ -3209,7 +3212,7 @@
// sendt.arg0.
US.category = task_name;
US.data = data_inserted;
- US.op = operatype;
+ US.op = dr["mesid"].ToString();
string res = a.Body(US).msg.ToString();
sql = string.Format(@" update sysdec set states='NEW' WHERE TASK_ID='{0}' ", rtaskid);
@@ -3230,10 +3233,6 @@
_sqlHelper.ExecuteNonQuery(sql);
}
- if (string.IsNullOrWhiteSpace(res)) {
- res = "鏁版嵁鏈夊紓甯�";
- }
-
//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"))
{
@@ -3242,7 +3241,7 @@
}
else if(res.Contains("MES鍗曞彿鍞竴妫�娴嬩笉閫氳繃"))
{
- ErrorMsg = res;
+ ErrorMsg = "OK-" + res;
return true;
}
else
@@ -4461,7 +4460,24 @@
foreach (DataRow dr in dt.Rows)
{
IDList.Add(dr["ERPID"].ToString());
-
+ if (dt.Columns.Contains("XSTHB012"))
+ {
+ switch (dr["XSTHB012"].ToString())
+ {
+ case "Son":
+ dr["XSTHB012"] = "濂椾欢瀛愰」";
+ break;
+ case "Standard":
+ dr["XSTHB012"] = "鏍囧噯浜у搧";
+ break;
+ case "Parent":
+ dr["XSTHB012"] = "濂椾欢鐖堕」";
+ break;
+ case "Service":
+ dr["XSTHB012"] = "鏈嶅姟";
+ break;
+ }
+ }
dr["AUDITING"] = "Y";
}
@@ -4488,7 +4504,10 @@
colMapping[11] = new SqlBulkCopyColumnMapping("XSTHB010", "XSTHB010"); //浠撳簱
colMapping[12] = new SqlBulkCopyColumnMapping("XSTHB011", "XSTHB011"); //閫�璐ф棩鏈�
colMapping[13] = new SqlBulkCopyColumnMapping("ERP_EntryID", "ID"); //鏄庣粏ID
- //colMapping[14] = new SqlBulkCopyColumnMapping("XSTHB006", "XSTHB012"); //鏄庣粏ID
+ if (dt.Columns.Contains("XSTHB012"))
+ {
+ colMapping[14] = new SqlBulkCopyColumnMapping("XSTHB012", "XSTHB012"); //鏄庣粏浜у搧绫诲瀷
+ }
DataTableToSQLServer(dt, conStr, "GS_XSTHB", colMapping, ref ErrorMsg);
#endregion
@@ -4691,6 +4710,25 @@
string B = A.ToString();
dr["CGTHB008"] = B;
}
+
+ if (dt.Columns.Contains("CGTHB012"))
+ {
+ switch (dr["CGTHB012"].ToString())
+ {
+ case "Son":
+ dr["CGTHB012"] = "濂椾欢瀛愰」";
+ break;
+ case "Standard":
+ dr["CGTHB012"] = "鏍囧噯浜у搧";
+ break;
+ case "Parent":
+ dr["CGTHB012"] = "濂椾欢鐖堕」";
+ break;
+ case "Service":
+ dr["CGTHB012"] = "鏈嶅姟";
+ break;
+ }
+ }
}
//鎻掑叆鍓嶅厛鍒犻櫎閲嶅閿�
@@ -4716,6 +4754,10 @@
colMapping[11] = new SqlBulkCopyColumnMapping("CGTHB010", "CGTHB010"); //璁′环鍗曚綅
colMapping[12] = new SqlBulkCopyColumnMapping("CGTHB011", "CGTHB011"); //閫�璐у師鍥�
colMapping[13] = new SqlBulkCopyColumnMapping("ERP_EntryID", "ID"); //鏄庣粏ID
+ if (dt.Columns.Contains("CGTHB012"))
+ {
+ colMapping[14] = new SqlBulkCopyColumnMapping("CGTHB012", "CGTHB012"); //鏄庣粏浜у搧绫诲瀷
+ }
DataTableToSQLServer(dt, conStr, "GS_CGTHB", colMapping, ref ErrorMsg);
#endregion
}
diff --git a/frmMain.cs b/frmMain.cs
index 8a30951..38944f9 100644
--- a/frmMain.cs
+++ b/frmMain.cs
@@ -189,10 +189,11 @@
'TB_MESTOERP_WWDDXD',
'TB_MESTOERP_WWCG',
'TB_MESTOERP_WWLL',
- 'TB_MESTOERP_XSTH'
+ 'TB_MESTOERP_XSTH',
+ 'TB_MESTOERP_CGTL'
) then 3
else 4 end gp,*
- from SYSDEC WITH(nolock) where states='NEW' AND descript IN ('鐢ㄦ枡娓呭崟鍙樻洿','楂樺啿鐗╂枡鍙樻洿','鐗╂枡淇℃伅琛�','浠撳簱淇℃伅琛�','閮ㄩ棬淇℃伅琛�','鍛樺伐淇℃伅琛�','閮ㄩ棬淇℃伅琛�','棰嗘枡鍗�','濮斿棰嗘枡鍗�','閿�鍞��璐у崟',
+ from SYSDEC WITH(nolock) where states='NEW' AND descript IN ('鐢ㄦ枡娓呭崟鍙樻洿','楂樺啿鐗╂枡鍙樻洿','鐗╂枡淇℃伅琛�','浠撳簱淇℃伅琛�','閮ㄩ棬淇℃伅琛�','鍛樺伐淇℃伅琛�','閮ㄩ棬淇℃伅琛�','棰嗘枡鍗�','濮斿棰嗘枡鍗�','閿�鍞��璐у崟','閲囪喘閫�璐у崟',
'鎴愬搧鍏ュ簱鍗�','閲囪喘鍏ュ簱鍗�','鏀舵枡閫氱煡鍗�','鐢熶骇璁㈠崟涓嬭揪','鐗╂枡瀹㈡埛瀵瑰簲琛�','閲囪喘璁㈠崟','鍙戣揣閫氱煡鍗�','閿�鍞��璐�','閲囪喘閫�璐�','閿�鍞嚭搴撳崟','鐢熶骇棰嗘枡鍗�','鍒嗘璋冨叆鍗�','鐢熶骇閫�鏂欏崟','鐩存帴璋冩嫧鍗�','鐢熶骇琛ユ枡鍗�','濮斿璁㈠崟','鍏朵粬鍏ュ簱鍗�','鍏朵粬鍑哄簱鍗�','渚涘簲鍟嗕俊鎭〃','濮斿璁㈠崟涓嬭揪','濮斿涓嬫帹閲囪喘')
--and task_name='TB_ERPTOMES_CG'
order by create_time
@@ -254,7 +255,8 @@
'TB_MESTOERP_TransferIn',
'TB_MESTOERP_WWDDXD',
'TB_MESTOERP_WWCG',
- 'TB_MESTOERP_XSTH') then 3
+ 'TB_MESTOERP_XSTH',
+ 'TB_MESTOERP_CGTL') then 3
else 4 end gp,*
from SYSDEC WITH(nolock) where states='FAIL' and retry_times<1 and CREATE_TIME>'2024-06-14 13:13:34' AND descript IN ('鐢ㄦ枡娓呭崟鍙樻洿','楂樺啿鐗╂枡鍙樻洿','鐗╂枡淇℃伅琛�','浠撳簱淇℃伅琛�','閮ㄩ棬淇℃伅琛�','鍛樺伐淇℃伅琛�','鐢熶骇鎶曟枡鍗�','閮ㄩ棬淇℃伅琛�','棰嗘枡鍗�','鎴愬搧鍏ュ簱鍗�','閲囪喘鍏ュ簱鍗�','鐢熶骇璁㈠崟涓嬭揪','鐗╂枡瀹㈡埛瀵瑰簲琛�','閲囪喘璁㈠崟','鍙戣揣閫氱煡鍗�','閿�鍞嚭搴撳崟','鍒嗘璋冨叆鍗�','鐢熶骇棰嗘枡鍗�','鐢熶骇閫�鏂欏崟','鐢熶骇琛ユ枡鍗�','渚涘簲鍟嗕俊鎭〃','濮斿璁㈠崟涓嬭揪','濮斿涓嬫帹閲囪喘')
and task_name not in ('TB_MESTOERP_WGRK',
--
Gitblit v1.9.3