From 9b8cafca2fc99c3347fc01f4fce8b8375b9f383a Mon Sep 17 00:00:00 2001
From: "songnan.zhang" <446507344@qq.com>
Date: Tue, 3 Jan 2023 13:15:26 +0800
Subject: [PATCH] 111
---
APP/QMAPP.Web/Web.config | 10 +++++-----
APPMD/QMAPP.MD.Web/Web.config | 18 +++++++++++-------
APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs | 2 +-
APPQ5/QMAPP.FJC.Web/Web.config | 7 ++++---
APPQ5/QMAPP.WinForm/App.config | 8 ++++----
.../Forms/TianJin/PlanRePrintForm.cs | 9 ++++++---
.../Forms/TianJin/TJPrintPlanLabel.cs | 9 ++++++---
APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs | 4 ++--
.../WCF/QMFrameWork.WebServiceHost/Web.config | 18 +++++++++---------
9 files changed, 48 insertions(+), 37 deletions(-)
diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config
index 306dc5a..c591aa7 100644
--- a/APP/QMAPP.Web/Web.config
+++ b/APP/QMAPP.Web/Web.config
@@ -55,10 +55,10 @@
-
-
- -->
-
+ -->
+
+
+
@@ -68,7 +68,7 @@
-
+
diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config
index f52a347..38f27f9 100644
--- a/APPMD/QMAPP.MD.Web/Web.config
+++ b/APPMD/QMAPP.MD.Web/Web.config
@@ -29,12 +29,16 @@
-
+
+
+
+
-
+
+
+ -->
+
diff --git a/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs
index dcd624f..41291c0 100644
--- a/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs
@@ -1306,7 +1306,7 @@ namespace QMAPP.FJC.BLL.FIS
ma.PID = Guid.NewGuid().ToString();
ma.PLAN_NO = ma.PLAN_NO;
//int no = new DoorPlankPlanDAL().GetNum(ma) + (num - 1);
- //ma.PLAN_SEQ = ma.PLAN_DATE.ToString("yyyyMMdd") + no;
+ ma.PLAN_SEQ = ma.PLAN_NO.Substring(ma.PLAN_NO.Length-3,3);
ma.PLAN_STATE = EnumGeter.PLANSTATE.INIT.GetHashCode().ToString();
ma.MATERIAL_CODE = ma.MATERIAL_CODE;
ma.MACHINECODDE = ma.MACHINECODDE;
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config
index d82cbef..a5ef590 100644
--- a/APPQ5/QMAPP.FJC.Web/Web.config
+++ b/APPQ5/QMAPP.FJC.Web/Web.config
@@ -43,12 +43,13 @@
-
-
+
+
+ -->
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 21a680f..aa4a837 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -3,10 +3,10 @@
-
+
@@ -19,9 +19,9 @@
-->
-
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
index 02a6ce1..60638ca 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
@@ -68,9 +68,12 @@ namespace QMAPP.WinForm.Forms.TianJin
labeldata.Class = " " + book.Class.Substring(0, 2);
labeldata.Description = book.Text;
labeldata.OrderNo = book.CarModel + positioncode + data;
-
- var bookS = _agent.InvokeServiceFunction("FISPhraseBLL_GetPHRASEBOOK", labeldata.Class.Trim());
- labeldata.Remark = bookS.Text;
+ if (MATERIAL_CODE.Contains("018D"))
+ {
+ var bookS = _agent.InvokeServiceFunction("FISPhraseBLL_GetPHRASEBOOK", MATERIAL_CODE.Substring(5,3).Trim());
+ labeldata.Remark = bookS.Text;
+ }
+
}
var mcresult = _agent.InvokeServiceFunction>("MaterialBLL_Get", new Material { MATERIAL_CODE = MATERIAL_CODE });
var material = mcresult.IsSuccess ? mcresult.Result : null;
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
index 50d0464..8ab0f43 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
@@ -720,9 +720,12 @@ namespace QMAPP.WinForm.Forms.TianJin
labeldata.Class = " " + book.Class.Substring(0, 2);
labeldata.Description = book.Text;
labeldata.OrderNo = book.CarModel + positioncode + data;
-
- var bookS = _agent.InvokeServiceFunction("FISPhraseBLL_GetPHRASEBOOK", labeldata.Class.Trim());
- labeldata.Remark = bookS.Text;
+ if (orders[0].MATERIAL_CODE.Contains("018D"))
+ {
+ var bookS = _agent.InvokeServiceFunction("FISPhraseBLL_GetPHRASEBOOK", orders[0].MATERIAL_CODE.Substring(5,3).Trim());
+ labeldata.Remark = bookS.Text;
+ }
+
}
var mcresult = _agent.InvokeServiceFunction>("MaterialBLL_Get", new Material { MATERIAL_CODE = orders[0].MATERIAL_CODE });
var material = mcresult.IsSuccess ? mcresult.Result : null;
diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
index 4edb9df..0f4c43f 100644
--- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
+++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2022.12.28.01")]
-[assembly: AssemblyFileVersion("2022.12.28.01")]
+[assembly: AssemblyVersion("2023.01.02.02")]
+[assembly: AssemblyFileVersion("2023.01.02.02")]
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index 7881cab..bfbc7cc 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -63,23 +63,23 @@
-
+
-
-
-
+
+
+ -->
+
+
+
+