From 804f980b60f0fef5aeb87b8b126462975c2aa693 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期二, 27 八月 2024 09:48:44 +0800
Subject: [PATCH] 发货通知单字段新增、委外订单下达、委外下推采购
---
frmMain.cs | 16 +++++++++++-----
HandleData/AE_MES_ERP.cs | 7 ++++++-
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/HandleData/AE_MES_ERP.cs b/HandleData/AE_MES_ERP.cs
index ca6af41..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宸ュ崟鍏ュ簱鏌ヨ
@@ -3981,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
}
diff --git a/frmMain.cs b/frmMain.cs
index 82538e0..693946e 100644
--- a/frmMain.cs
+++ b/frmMain.cs
@@ -181,10 +181,12 @@
'TB_MESTOERP_SLSH',
'TB_MESTOERP_SCDDXD',
'TB_MESTOERP_WLQDBB',
- 'TB_MESTOERP_TransferIn'
+ 'TB_MESTOERP_TransferIn',
+ 'TB_MESTOERP_WWDDXD',
+ 'TB_MESTOERP_WWCG'
) 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
union all
@@ -238,9 +240,11 @@
'TB_MESTOERP_SLSH',
'TB_MESTOERP_SCDDXD',
'TB_MESTOERP_WLQDBB',
- 'TB_MESTOERP_TransferIn') then 3
+ 'TB_MESTOERP_TransferIn',
+ 'TB_MESTOERP_WWDDXD',
+ 'TB_MESTOERP_WWCG') 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 ('楂樺啿鐗╂枡鍙樻洿','鐗╂枡淇℃伅琛�','浠撳簱淇℃伅琛�','閮ㄩ棬淇℃伅琛�','鍛樺伐淇℃伅琛�','鐢熶骇鎶曟枡鍗�','閮ㄩ棬淇℃伅琛�','棰嗘枡鍗�','鎴愬搧鍏ュ簱鍗�','閲囪喘鍏ュ簱鍗�','鐢熶骇璁㈠崟涓嬭揪','鐗╂枡瀹㈡埛瀵瑰簲琛�','閲囪喘璁㈠崟','鍙戣揣閫氱煡鍗�','閿�鍞嚭搴撳崟','鍒嗘璋冨叆鍗�','鐢熶骇棰嗘枡鍗�','鐢熶骇閫�鏂欏崟','鐢熶骇琛ユ枡鍗�','渚涘簲鍟嗕俊鎭〃')
+ 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',
'TB_MESTOERP_WWRK',
'TB_MESTOERP_QTRK',
@@ -255,7 +259,9 @@
'TB_MESTOERP_GDRK',
'TB_MESTOERP_SLSH',
'TB_MESTOERP_WLQDBB',
- 'TB_MESTOERP_TransferIn')
+ 'TB_MESTOERP_TransferIn',
+ 'TB_MESTOERP_WWDDXD',
+ 'TB_MESTOERP_WWCG')
)
select rtrim(gp)+'-'+rtrim(rank() over(partition by gp order by data)) gcp,* from cte
--
Gitblit v1.9.3