From f35e2bfe37af2efa93ee6c8d986379325bdd0e84 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 10 十二月 2024 09:24:29 +0800
Subject: [PATCH] 1.收料通知单

---
 HandleData/AE_MES_ERP.cs |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/HandleData/AE_MES_ERP.cs b/HandleData/AE_MES_ERP.cs
index ca6af41..fb9785a 100644
--- a/HandleData/AE_MES_ERP.cs
+++ b/HandleData/AE_MES_ERP.cs
@@ -126,6 +126,7 @@
                 case "TB_MESTOERP_WWRK"://MESWWRK閲戣澏鏉$爜鍏ュ簱锛堝澶栧叆搴擄級(鍚屾鎺ㄩ��)
                 case "TB_MESTOERP_QTRK"://MESQTRK閲戣澏鏉$爜鍏ュ簱锛堝叾浠栧叆搴擄級(鍚屾鎺ㄩ��)
                 case "TB_MESTOERP_CPRK"://MESCPRK閲戣澏鏉$爜鍏ュ簱锛堜骇鍝佸叆搴擄級(鍚屾鎺ㄩ��)
+                case "TB_MESTOERP_SLTZ"://MESCPRK閲戣澏锛堟敹鏂欓�氱煡鍗曪級(鍚屾鎺ㄩ��)
                 case "TB_MESTOERP_CGRK"://MESCPRK閲戣澏鏉$爜鍏ュ簱锛堥噰璐叆搴擄級(鍚屾鎺ㄩ��)
                 case "TB_MESTOERP_XSCK"://MESCPRK閲戣澏鏉$爜鍑哄簱锛堥攢鍞嚭搴擄級(鍚屾鎺ㄩ��)
                 case "TB_MESTOERP_WLQDBB"://MESGCBOM閲戣澏楂樺啿鐢ㄦ枡鍙樻洿(鍚屾鎺ㄩ��)
@@ -144,6 +145,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宸ュ崟鍏ュ簱鏌ヨ
@@ -1881,11 +1884,21 @@
                                 if (dr.Table.Columns.Contains("CGAORG"))
                                 {
                                     org = "涓藉痉";
-                                 
-                                    string UP = string.Format(@"EXEC [WMS_CGLD_TOJX] '{0}' ", rtaskid);
-                                    _sqlHelper.ExecuteNonQuery(UP);
-                                    dr["NEWERPID"] = "LD"+dr["ERPID"].ToString();
-                                    IDList.Add("LD"+dr["ERPID"].ToString());
+                                    dr["NEWERPID"] = "LD" + dr["ERPID"].ToString();
+                                    IDList.Add("LD" + dr["ERPID"].ToString());
+
+                                    if (dr["CGA0018"].ToString() == "103")
+                                    {
+                                        string UP = string.Format(@"EXEC [WMS_CGLD_TOJX] '{0}' ", rtaskid);
+                                        _sqlHelper.ExecuteNonQuery(UP);
+
+                                        string SYSDEC = string.Format(@"UPDATE SYSDEC SET STATES='IGNORE' WHERE task_name='TB_ERPTOMES_CG' AND  STATES='NEW' AND TASK_ID ='{0}'", rtaskid);
+                                        _sqlHelper.ExecuteNonQuery(SYSDEC);
+
+                                        return true;
+                                    }
+
+
                                 }
                                 else
                                 {
@@ -2240,7 +2253,22 @@
                             {
                                 if (dF["TLA020"].ToString().Contains("瑁呴厤"))
                                 {
-                                    if (dF["TLA023"].ToString().Contains("-"))
+                                    if (dF["TLA023"].ToString().Contains("*"))
+                                    {
+                                        string[] tr = dF["TLA023"].ToString().Split('*');
+
+                                        //int i = dF["TLA023"].ToString().LastIndexOf('-');
+                                        string StrNew = tr[1].ToString();//dF["TLA023"].ToString().Substring(i + 1, 10);
+                                        string SQLT = string.Format(@"SELECT TOP 1 * FROM WOMCAA(NOLOCK) WHERE CAA018='{0}' ", StrNew);
+                                        DataTable CAA = _sqlHelper.ExecuteDataTable(SQLT);
+                                        if (CAA.Rows.Count > 0)
+                                        {
+                                            string UP = string.Format(@"UPDATE WOMCAA SET CAA016='{0}',CAA017='{1}',CAA018='{2}' WHERE CAA002='{3}'  ", CAA.Rows[0]["CAA016"].ToString(), CAA.Rows[0]["CAA017"].ToString(), CAA.Rows[0]["CAA018"].ToString(), dF["TLA002"].ToString());
+                                            _sqlHelper.ExecuteNonQuery(UP);
+                                        }
+
+                                    }
+                                    else if (dF["TLA023"].ToString().Contains("-"))
                                     {
                                         string[] tr = dF["TLA023"].ToString().Split('-');
 
@@ -3981,7 +4009,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