From c39358b79562c5b47c9394ec9c9e9facbd6d312d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE=E7=94=B7?= <446507344@qq.com>
Date: Tue, 25 Apr 2023 08:52:25 +0800
Subject: [PATCH] 111
---
APP/QMAPP.Web/Web.config | 4 +-
APPMD/QMAPP.MD.Web/Web.config | 6 +-
APPQ5/QMAPP.FJC.Web/Web.config | 6 +-
APPQ5/QMAPP.WinForm/App.config | 17 ++---
.../Forms/TianJin/PlanRePrintForm.cs | 65 ++++++++++++++++++-
.../Forms/TianJin/TJPrintPlanLabel.cs | 13 +---
.../QMAPP.WinForm/Properties/AssemblyInfo.cs | 4 +-
.../WCF/QMFrameWork.WebServiceHost/Web.config | 12 ++--
8 files changed, 91 insertions(+), 36 deletions(-)
diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config
index 3845737..dc08633 100644
--- a/APP/QMAPP.Web/Web.config
+++ b/APP/QMAPP.Web/Web.config
@@ -59,9 +59,9 @@
-->
-
+
-
+
diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config
index e382847..be7b1b2 100644
--- a/APPMD/QMAPP.MD.Web/Web.config
+++ b/APPMD/QMAPP.MD.Web/Web.config
@@ -32,7 +32,7 @@
-
+
- -->
+
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config
index b58f0c2..f94af36 100644
--- a/APPQ5/QMAPP.FJC.Web/Web.config
+++ b/APPQ5/QMAPP.FJC.Web/Web.config
@@ -31,7 +31,7 @@
-
+
-
-
+
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 98f4854..31d3273 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -3,10 +3,10 @@
-
@@ -14,18 +14,19 @@
+ -->
-
+
-
@@ -225,8 +226,8 @@
-
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
index 3c9a5ac..fa31b42 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
@@ -88,6 +88,7 @@ namespace QMAPP.WinForm.Forms.TianJin
PrintLabel(labels);
+ InsertProduct(labeldata.OrderNo, MATERIAL_CODE, MATERIAL_NAME);
}
catch (Exception exception)
{
@@ -163,7 +164,69 @@ namespace QMAPP.WinForm.Forms.TianJin
#endregion
}
-
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void InsertProduct(string ProductCode, string Material_Code, string prepare)
+ {
+ #region 组成新增产品实例
+ Product newProduct = new Product();
+
+ newProduct.PID = Guid.NewGuid().ToString();
+
+ newProduct.PRODUCTTYPE = string.Empty;
+
+ newProduct.PRODUCTCODE = ProductCode;
+
+ newProduct.PRODUCTSOURCE = "0";
+
+ newProduct.MACHINENAME = "门板打印";
+
+ newProduct.MACHINECODDE = "门板打印";
+
+ newProduct.MATERIAL_CODE = Material_Code;
+
+ newProduct.STATUS = "0";
+
+ newProduct.OUTFLAG = "0";
+
+ newProduct.CAPACITY = 1;
+
+ newProduct.USINGCOUNT = 0;
+ if (prepare.Contains("左"))
+ {
+ newProduct.WORKCELL_CODE = "DP_L_PREPARE1";
+
+ newProduct.WORKLOC_CODE = "DP_L_PREPARELOC1";
+ }
+ else if (prepare.Contains("右"))
+ {
+ newProduct.WORKCELL_CODE = "DP_R_PREPARE1";
+
+ newProduct.WORKLOC_CODE = "DP_R_PREPARELOC1";
+ }
+ else
+ {
+ newProduct.WORKCELL_CODE = "PREPARE1";
+
+ newProduct.WORKLOC_CODE = "DP_PREPARELOC1";
+ }
+
+
+ newProduct.WORKCENTER_CODE = "WORK770B";
+
+ newProduct.MATERIAL_TYPE = "DP_FINASSY";
+
+ newProduct.USINGSTATE = "0";
+
+ #endregion
+
+ //新增
+ _agent.InvokeServiceFunction>("ProductBLL_Insert", newProduct);
+ }
+
public string GetNameCode(string Name)
{
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
index 64082e3..67553bc 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
@@ -280,16 +280,7 @@ namespace QMAPP.WinForm.Forms.TianJin
if (route != null)
{
this.cbRoutes.SelectedValue = route.ROUTE_CODE;
- this.cbRoutes.Enabled = false;
}
- else
- {
- this.cbRoutes.Enabled = true;
- }
- }
- else
- {
- this.cbRoutes.Enabled = true;
}
BindPlanView();
cbRoutes.SelectedIndexChanged += new EventHandler(cbRoutes_SelectedIndexChanged);
@@ -549,7 +540,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);
@@ -740,7 +731,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 61135f4..77b88de 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("2023.04.12.01")]
-[assembly: AssemblyFileVersion("2023.04.12.01")]
+[assembly: AssemblyVersion("2023.04.21.01")]
+[assembly: AssemblyFileVersion("2023.04.21.01")]
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index 2e96a89..6bc8b94 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -63,10 +63,10 @@
-
-
@@ -77,9 +77,9 @@
-
-
@@ -88,7 +88,7 @@
-
+