From c144aa8571bb8788c173c905cfcb9964472595d8 Mon Sep 17 00:00:00 2001
From: "songnan.zhang" <446507344@qq.com>
Date: Wed, 28 Dec 2022 14:07:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4bzd=E5=8F=96=E5=AD=98?=
=?UTF-8?q?=E5=82=A8=E8=BF=87=E7=A8=8B=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
APP/QMAPP.Web/Web.config | 6 +++---
APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs | 2 +-
APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs | 12 ++++--------
APPQ5/QMAPP.WinForm/App.config | 8 ++++----
.../Forms/TianJin/TJPrintPlanLabel.cs | 15 +++------------
APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs | 4 ++--
.../WCF/QMFrameWork.WebServiceHost/Web.config | 2 ++
7 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config
index 030b47d..306dc5a 100644
--- a/APP/QMAPP.Web/Web.config
+++ b/APP/QMAPP.Web/Web.config
@@ -62,13 +62,13 @@
-
-
+
-
+
diff --git a/APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs b/APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs
index ab552ef..01d7f86 100644
--- a/APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs
@@ -403,7 +403,7 @@ namespace QMAPP.MD.DAL
{
string sqlChange = ChangeSqlByDB(sql, session);
var dt = session.GetTable(sqlChange, parameters.ToArray());
- return Convert.ToInt16(dt.Rows[0].ItemArray[0]);
+ return Convert.ToInt32(dt.Rows[0].ItemArray[0]);
}
diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs
index 39ae706..9db65e3 100644
--- a/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs
@@ -459,10 +459,8 @@ namespace QMAPP.FJC.DAL.TianJin
sql.AppendFormat(" ON P.[PID]=W.[ORDERPLANID] ");
sql.AppendFormat(" LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) ");
sql.AppendFormat(" ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] ");
- if (Direction == "左")
- sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_L_ASSEMBLY_770B' ");
- else
- sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_R_ASSEMBLY_770B' ");
+
+ sql.AppendFormat($" WHERE P.[ROUTE_CODE]='{routecode}' ");
sql.AppendFormat(" AND W.[PRINTED]='0' ");
if (!string.IsNullOrEmpty(Direction))
@@ -553,10 +551,8 @@ namespace QMAPP.FJC.DAL.TianJin
sql.AppendFormat(" ON P.[PID]=W.[ORDERPLANID] ");
sql.AppendFormat(" LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) ");
sql.AppendFormat(" ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] ");
- if (Direction == "左")
- sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_L_ASSEMBLY_770B' ");
- else
- sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_R_ASSEMBLY_770B' ");
+
+ sql.AppendFormat($" WHERE P.[ROUTE_CODE]='{routecode}' ");
sql.AppendFormat(" AND W.[PRINTED]='0' ");
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 32f7feb..21a680f 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -19,7 +19,7 @@
-->
-
@@ -35,7 +35,7 @@
-
+
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
index b1dd248..50d0464 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
@@ -117,16 +117,7 @@ namespace QMAPP.WinForm.Forms.TianJin
dataPage.PageSize = int.Parse(cbListRowcount.Text);
dataPage.PageIndex = 1;
dataPage.SortExpression = " ROWVALUE ASC";
- //操作开始时间
- //if (string.IsNullOrEmpty(this.dtpCREATEDATESTART.Text.Trim()) == false)
- //{
- // searchModel.BeginTime = Convert.ToDateTime((this.dtpCREATEDATESTART.Value).ToString("yyyy-MM-dd") + " 00:00:00");
- //}
- ////操作结束时间
- //if (string.IsNullOrEmpty(this.dtpCREATEDATEEND.Text.Trim()) == false)
- //{
- // searchModel.EndTime = Convert.ToDateTime((this.dtpCREATEDATEEND.Value).ToString("yyyy-MM-dd") + " 23:59:59");
- //}
+
if (cbRoutes.Text.Contains("018D"))
{
var count = Convert.ToInt32(cbListRowcount.Text) / 2;
@@ -556,7 +547,7 @@ namespace QMAPP.WinForm.Forms.TianJin
WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo);
- //PrintLabel(labels);
+ PrintLabel(labels);
WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo);
@@ -744,7 +735,7 @@ namespace QMAPP.WinForm.Forms.TianJin
//WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo);
- //PrintLabel(labels);
+ PrintLabel(labels);
//WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo);
//变更打印状态 0=>1
diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
index d2a5aed..4edb9df 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.16.01")]
-[assembly: AssemblyFileVersion("2022.12.16.01")]
+[assembly: AssemblyVersion("2022.12.28.01")]
+[assembly: AssemblyFileVersion("2022.12.28.01")]
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index b28c2e1..7881cab 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -65,6 +65,8 @@
+
+