Merge branch 'master' of http://8.130.121.29:3000/yuyubo/Pilot_KD_Parino_yuyubo

Gatedge.K3.Pilot.PlugIn/BOSPlugIn/AR_SalesVATInvoice/ServicePlugIn/AfterSave.cs

@@ -1,12 +1,14 @@
 using Kingdee.BOS;
 using Kingdee.BOS.Core.DynamicForm.PlugIn;
 using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
+using Kingdee.BOS.Log;
+using Kingdee.BOS.Orm;
 using Kingdee.BOS.Orm.DataEntity;
 using Kingdee.BOS.ServiceHelper;
 using Kingdee.BOS.Util;
 using System;
 using System.ComponentModel;
-using System.Linq;
+using System.Dynamic;
 
 namespace Gatedge.K3.Pilot.PlugIn.BOSPlugIn.AR_SalesVATInvoice.ServicePlugIn
 {
@@ -16,12 +18,12 @@ namespace Gatedge.K3.Pilot.PlugIn.BOSPlugIn.AR_SalesVATInvoice.ServicePlugIn
         public override void OnPreparePropertys(PreparePropertysEventArgs e)
         {
             base.OnPreparePropertys(e);
-            // 添加需要加载的字段
+            // 根据日志中的实际实体属性名来添加
-            e.FieldKeys.Add("FENTRYID");
             e.FieldKeys.Add("FIDD");
             e.FieldKeys.Add("FSEQQ");
-            e.FieldKeys.Add("FSRCBILLTYPEID");
+            e.FieldKeys.Add("SRCBILLTYPEID");  // 实体属性名（没有F前缀）
-            e.FieldKeys.Add("FSRCBILLNO");
+            e.FieldKeys.Add("SRCBILLNO");      // 实体属性名（没有F前缀）
+            e.FieldKeys.Add("FSEQ");
         }
 
         public override void AfterExecuteOperationTransaction(AfterExecuteOperationTransaction e)
@@ -41,56 +43,63 @@ namespace Gatedge.K3.Pilot.PlugIn.BOSPlugIn.AR_SalesVATInvoice.ServicePlugIn
 
                 foreach (var entry in entrys)
                 {
-                    var entryId = Convert.ToInt64(entry["Id"]);
+                    // 使用 Id 获取主键值
+                    var entryId = Convert.ToInt64(entry.GetPrimaryKeyValue());
                     var fidd = entry["FIDD"];
                     var fiddValue = fidd == null ? 0 : Convert.ToInt64(fidd);
 
                     if (fiddValue > 0)
                     {
                         // FIDD > 0 时，判断是否需要回写
-                        var srcBillNo = entry["FSRCBILLNO"]?.ToString() ?? "";
+                        var srcBillNo = entry["SRCBILLNO"]?.ToString() ?? "";
 
-                        // FIDD != 当前行FENTRYID 且 源单编号为空 时才回写
+                        // 判断条件：FIDD != 当前行ID 且 源单编号为空
                         if (fiddValue != entryId && string.IsNullOrWhiteSpace(srcBillNo))
                         {
-                            // 查询源单据体信息（主键=FIDD的明细行）
+                            // 查询源单据体信息（FID = fiddValue的明细行）
+                            // 这里使用数据库字段名（带F前缀）
                             var sql = $@"/*dialect*/
 SELECT FSRCBILLTYPEID, FSRCBILLNO, FSEQ
 FROM T_IV_SALESICENTRY
 WHERE FENTRYID = {fiddValue}";
-
+                            Logger.Error("销售增值税专用发票", sql, new Exception());
+                            Logger.Error("销售增值税专用发票", "78", new Exception());
                             var result = DBServiceHelper.ExecuteDynamicObject(this.Context, sql);
                             if (result == null || result.Count == 0)
                                 continue;
 
                             var srcData = result[0];
-                            var srcBillTypeId = srcData["FSRCBILLTYPEID"];
+                            // 注意：SQL查询返回的是数据库字段名（带F前缀）
-                            var srcBillNoValue = srcData["FSRCBILLNO"];
+                            var srcBillTypeId = srcData["FSRCBILLTYPEID"]?.ToString() ?? "";
+                            var srcBillNoValue = srcData["FSRCBILLNO"]?.ToString() ?? "";
 
                             // 回写当前单据体：源单类型、源单编号
+                            // 这里使用数据库字段名（带F前缀）
                             var updateSql = $@"/*dialect*/
 UPDATE T_IV_SALESICENTRY 
-SET FSRCBILLTYPEID = '{srcBillTypeId}', 
+SET FSRCBILLTYPEID = '{srcBillTypeId.Replace("'", "''")}', 
-    FSRCBILLNO = '{srcBillNoValue}'
+    FSRCBILLNO = '{srcBillNoValue.Replace("'", "''")}'
 WHERE FENTRYID = {entryId}";
-
+                            Logger.Error("销售增值税专用发票", updateSql, new Exception());
+                            Logger.Error("销售增值税专用发票", "78", new Exception());
                             DBServiceHelper.Execute(this.Context, updateSql);
                         }
                     }
                     else
                     {
-                        // FIDD <= 0 时，把当前行FENTRYID赋值给FIDD，同时把FSEQ赋值给FSEQQ
+                        // FIDD <= 0 时，把当前行FID赋值给FIDD，同时把FSEQ赋值给FSEQQ
+                        var seq = entry["FSEQ"]?.ToString() ?? "0";
                         var updateSql = $@"/*dialect*/
 UPDATE T_IV_SALESICENTRY 
-SET FIDD = FENTRYID,
+SET FIDD = {entryId},
-    FSEQQ = FSEQ
+    FSEQQ = '{seq.Replace("'", "''")}'
 WHERE FENTRYID = {entryId}";
-
+                        Logger.Error("销售增值税专用发票", updateSql, new Exception());
+                        Logger.Error("销售增值税专用发票", "78", new Exception());
                         DBServiceHelper.Execute(this.Context, updateSql);
                     }
                 }
             }
         }
     }
-}
+}
-

Pilot_KD_Parino/Pilot_KD_Parino.csproj

@@ -51,22 +51,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>bin\Debug\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="DevExpress.Data.v13.1, Version=13.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DevExpress.Data.v13.1.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DevExpress.Printing.v13.1.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.Utils.v13.1, Version=13.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DevExpress.Utils.v13.1.dll</HintPath>
-    </Reference>
-    <Reference Include="DevExpress.XtraEditors.v13.1, Version=13.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DevExpress.XtraEditors.v13.1.dll</HintPath>
-    </Reference>
     <Reference Include="DocumentFormat.OpenXml">
       <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>

Pilot_KD_Parino/QPHY_AutoWrire/Bill3.cs

@@ -1,5 +1,4 @@
-using DevExpress.Xpo.DB;
+using Kingdee.BOS.Core.DynamicForm;
-using Kingdee.BOS.Core.DynamicForm;
 using Kingdee.BOS.Core.DynamicForm.PlugIn;
 using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
 using Kingdee.BOS.Orm.DataEntity;
@@ -10,8 +9,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using static Pilot_KD_Parino.QPHY_AutoWrire.Bill2;
 
 namespace Pilot_KD_Parino.QPHY_AutoWrire

Pilot_KD_Parino/QPHY_AutoWrire/Bill5.cs

@@ -1,27 +1,12 @@
-using DevExpress.Data.Linq;
+using Kingdee.BOS.Core.CommonFilter;
-using DevExpress.Data.PLinq.Helpers;
-using DocumentFormat.OpenXml.Drawing.Spreadsheet;
-using FarPoint.Excel;
-using Kingdee.BOS.App.Core.Utils;
-using Kingdee.BOS.BusinessEntity.BusinessFlow;
-using Kingdee.BOS.Core.CommonFilter;
 using Kingdee.BOS.Core.DynamicForm;
 using Kingdee.BOS.Core.DynamicForm.PlugIn;
 using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
 using Kingdee.BOS.Core.DynamicForm.PlugIn.ControlModel;
-using Kingdee.BOS.Core.Enums;
-using Kingdee.BOS.Core.List;
-using Kingdee.BOS.Core.Msg;
-using Kingdee.BOS.Core.Report.PlugIn.Args;
 using Kingdee.BOS.JSON;
-using Kingdee.BOS.Log;
-using Kingdee.BOS.Orm;
 using Kingdee.BOS.Orm.DataEntity;
-using Kingdee.BOS.Orm.Exceptions;
-using Kingdee.BOS.ServiceHelper;
 using Kingdee.BOS.Util;
 using Newtonsoft.Json;
-using NPOI.SS.Formula.Functions;
 using Pilot_KD_Parino.Common;
 using System;
 using System.Collections.Generic;
@@ -29,10 +14,6 @@ using System.ComponentModel;
 using System.Data;
 using System.Globalization;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
-using static Kingdee.BOS.BusinessEntity.YunZhiJia.ERPInfoEnum;
 using static Pilot_KD_Parino.QPHY_AutoWrire.Bill2;
 using static Pilot_KD_Parino.QPHY_AutoWrire.Bill3;
 

Pilot_KD_Parino/QPHY_AutoWrireRecord/HeXiaoJiLuYanZheng.cs

@@ -1,18 +1,10 @@
-using DevExpress.Data.PLinq.Helpers;
+using Kingdee.BOS;
-using Kingdee.BOS;
-using Kingdee.BOS.App;
-using Kingdee.BOS.App.Data;
-using Kingdee.BOS.Contracts;
-using Kingdee.BOS.Core.DynamicForm;
 using Kingdee.BOS.Core.DynamicForm.PlugIn;
 using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
-using Kingdee.BOS.Core.Metadata;
-using Kingdee.BOS.Core.Metadata.FieldElement;
 using Kingdee.BOS.Log;
 using Kingdee.BOS.Orm.DataEntity;
 using Kingdee.BOS.ServiceHelper;
 using Kingdee.BOS.Util;
-using Org.BouncyCastle.Asn1.X509;
 using Pilot_KD_Parino.Common;
 using System;
 using System.ComponentModel;