From 400aec324dcb2c04ed054fcf6f60851398e7335b Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Sat, 8 Nov 2025 01:39:21 +0800
Subject: [PATCH] =?UTF-8?q?word=E7=9B=96=E7=AB=A0=E4=B8=8D=E5=90=8C?=
=?UTF-8?q?=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Pilot_KD_Parino/SQL/SqlManage.cs | 14 +++++++++++---
Pilot_KD_Parino/Sal_Order/Bill.cs | 18 ++++++++++++++----
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/Pilot_KD_Parino/SQL/SqlManage.cs b/Pilot_KD_Parino/SQL/SqlManage.cs
index 431b781..40c9ce7 100644
--- a/Pilot_KD_Parino/SQL/SqlManage.cs
+++ b/Pilot_KD_Parino/SQL/SqlManage.cs
@@ -504,13 +504,21 @@ namespace Pilot_KD_Parino.SQL
/// 获取模板地址
///
///
- public static DynamicObjectCollection GetTempModelPath(Context ctx, string FID)
+ public static DynamicObjectCollection GetTempModelPath(Context ctx, string FID,long FSaleOrgId=0)
{
//定义SQL,调用物料视图
string sql = string.Format(@"/*dialect*/
- SELECT FTempPath FROM T_TempModelPath WHERE FKeyId = '{0}' ", FID);
+ SELECT FTempPath,FSaleOrgId FROM T_TempModelPath WHERE FKeyId = '{0}' and (FSaleOrgId={1} or FSaleOrgId=0 )", FID, FSaleOrgId);
//执行SQL
- return DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null) as DynamicObjectCollection;
+ var result= DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null) as DynamicObjectCollection;
+ if (result.Count() > 1)
+ {
+ var list = result.Where(t => t["FSaleOrgId"].ToString() != "0").ToList();
+ result.Clear();
+ result.Add(list.FirstOrDefault());
+
+ }
+ return result;
}
diff --git a/Pilot_KD_Parino/Sal_Order/Bill.cs b/Pilot_KD_Parino/Sal_Order/Bill.cs
index 8ca1666..a3f7b54 100644
--- a/Pilot_KD_Parino/Sal_Order/Bill.cs
+++ b/Pilot_KD_Parino/Sal_Order/Bill.cs
@@ -86,7 +86,7 @@ namespace Pilot_KD_Parino.Sal_Order
string FIsDebugging = this.View.Model.GetValue("FIsDebugging")?.ToString();
DynamicObject F_projectname = this.View.Model.GetValue("F_projectname") as DynamicObject;
-
+ int xiaoShouZuZhi = 0; //除了指定合同,其他合同都是0
if (FCustId == null)
{
this.View.ShowErrMessage("客户不允许为空!");
@@ -103,6 +103,14 @@ namespace Pilot_KD_Parino.Sal_Order
return;
}
string projectname = "";
+ List list = new List();
+ list.Add(100305);
+ list.Add(438223);
+ list.Add(1467475);
+ if (list.Contains(oId))
+ {
+ xiaoShouZuZhi = oId;
+ }
if (oId != 438223)
{
projectname = F_projectname["NAME"]?.ToString();
@@ -112,6 +120,8 @@ namespace Pilot_KD_Parino.Sal_Order
projectname = projectname.Replace("*", " ");
projectname = projectname.Replace(":", ":");
}
+ //武汉派诺,
+
string FPath = string.Format(@"D:\导出Word\{0}\{1}\{2}\{3}年\{4}月\{5}日\{6}.docx", this.Context.DataCenterName, "销售订单",
this.View.Model.DataObject["Billno"], DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, string.Format("{0}-{1}-{2}-{3}-{4}", FDATE.ToString("yyyy-MM-dd"), F_cocntractnumber
@@ -177,12 +187,12 @@ namespace Pilot_KD_Parino.Sal_Order
FOrdercategory = "HH";
}
}
-
+
//获取模板地址
- var TempModelPath = SQL.SqlManage.GetTempModelPath(this.Context, FOrdercategory);
+ var TempModelPath = SQL.SqlManage.GetTempModelPath(this.Context, FOrdercategory,xiaoShouZuZhi);
if (TempModelPath == null)
{
- this.View.ShowErrMessage("找不到对应的word模板");
+ this.View.ShowErrMessage("找不到对应的word模板2");
return;
}
var formId = this.View.Model.DataObject["FFormId"];