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

Pilot_KD_Parino/AR_SalesVATInvoice/ServicePlugIn/AfterSave.cs

@@ -58,20 +58,34 @@ namespace Gatedge.K3.Pilot.PlugIn.BOSPlugIn.AR_SalesVATInvoice.ServicePlugIn
                             // 判断条件：FIDD != 当前行ID 且 源单编号为空
                             if (fiddValue != entryId && string.IsNullOrWhiteSpace(srcBillNo))
                             {
-                                // 从当前单据主表获取单据编号（实体属性名：BILLNO）
+                                // 通过源分录ID（FIDD）查询源单据的单据编号
-                                var billNo = billObj["BILLNO"]?.ToString() ?? "";
+                                string srcBillNoFromSource = "";
+
+                                var querySql = $@"/*dialect*/
+SELECT A.FBILLNO 
+FROM T_IV_SALESIC A
+INNER JOIN T_IV_SALESICENTRY B ON A.FID = B.FID
+WHERE B.FENTRYID = {fiddValue}";
+
+                                var result = DBServiceHelper.ExecuteDynamicObject(this.Context, querySql);
+                                if (result != null && result.Count > 0)
+                                {
+                                    srcBillNoFromSource = result[0]["FBILLNO"]?.ToString() ?? "";
+                                }
+
+
+
                                 // 固定源单类型为"销售增值税专用发票"
                                 var srcBillType = "IV_SALESIC";
 
-                                // 回写当前单据体：源单类型、源单编号
+                                // 回写当前单据体：源单类型、源单编号（使用源单据的编号）
                                 // 这里使用数据库字段名（带F前缀）
                                 var updateSql = $@"/*dialect*/
 UPDATE T_IV_SALESICENTRY 
 SET FSRCBILLTYPEID = '{srcBillType.Replace("'", "''")}', 
-    FSRCBILLNO = '{billNo.Replace("'", "''")}'
+    FSRCBILLNO = '{srcBillNoFromSource.Replace("'", "''")}'
 WHERE FENTRYID = {entryId}";
-                                Logger.Error("销售增值税专用发票", updateSql, new Exception());
+                                Logger.Error("销售增值税专用发票_回写源单信息", updateSql, new Exception());
-                                Logger.Error("销售增值税专用发票", "78", new Exception());
                                 DBServiceHelper.Execute(this.Context, updateSql);
                             }
                         }
@@ -95,6 +109,7 @@ WHERE FENTRYID = {entryId}";
             {
                 Logger.Error("销售增值税专用发票出错了:", ex.Message, new Exception());
             }
+
         }
     }
-}
+}