From 66bc7819db2fe63c0c5317f9750ab09b12c81c61 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, 4 Apr 2023 09:18:25 +0800
Subject: [PATCH 1/2] 11
---
APPQ5/QMAPP.WinForm/App.config | 11 ++++++-----
.../WCF/QMFrameWork.WebServiceHost/Web.config | 8 ++++----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 24c80c7..98f4854 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -11,10 +11,10 @@
-->
-
+
-
+
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index 869844e..2e96a89 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -78,8 +78,8 @@
-
@@ -94,12 +94,12 @@
-->
+
-
+-->
From 8c76ce8275400c7c3bd1e808e3f3d4af079718dd 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, 4 Apr 2023 09:23:11 +0800
Subject: [PATCH 2/2] 11
---
.../Forms/TianJin/TJPrintPlanLabel.cs | 65 ++++++++++---------
1 file changed, 33 insertions(+), 32 deletions(-)
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
index 392545b..09202bd 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
@@ -63,7 +63,7 @@ namespace QMAPP.WinForm.Forms.TianJin
comboBox2.ValueMember = "Code";
comboBox2.DataSource = listSHIFT;
- // tsbPrint.Enabled = false;
+ // tsbPrint.Enabled = false;
}
#region 加载列表显示设置
@@ -117,11 +117,11 @@ namespace QMAPP.WinForm.Forms.TianJin
dataPage.PageSize = int.Parse(cbListRowcount.Text);
dataPage.PageIndex = 1;
dataPage.SortExpression = " ROWVALUE ASC";
-
- if (cbRoutes.Text.Contains("018D"))
+
+ if (cbRoutes.Text.Contains("018D") || cbRoutes.Text.Contains("278D"))
{
var count = Convert.ToInt32(cbListRowcount.Text) / 2;
- var orderlist =new List();
+ var orderlist = new List();
var orderlistF = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted018DF", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString());
var orderlistR = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted018DR", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString());
for (var i = 0; i < count; i++)
@@ -151,7 +151,7 @@ namespace QMAPP.WinForm.Forms.TianJin
#endregion
this.dgvPlan.DataSource = orderlist;
}
-
+
}
catch (Exception ex)
{
@@ -207,7 +207,7 @@ namespace QMAPP.WinForm.Forms.TianJin
//BarcodeLib.BarCodeGenerate g = new BarcodeLib.BarCodeGenerate( xmlPath);
//bool b = g.PrintBarCode(_operationServiceParam.main.MAINCODE);
QM.Assist.LabelInfo ll = new QM.Assist.LabelInfo();
- StringBuilder dataline=new StringBuilder();
+ StringBuilder dataline = new StringBuilder();
var TMPPath = string.Empty;
var DATPath = string.Empty;
foreach (var label in labeldata)
@@ -240,7 +240,7 @@ namespace QMAPP.WinForm.Forms.TianJin
label.MATERIALCODE,//
label.Remark
);
- if (label.OrderNo.Contains("018D"))
+ if (label.OrderNo.Contains("018D") || label.OrderNo.Contains("278D"))
{
TMPPath = "PlanLabelTMPPath8D";
DATPath = "PlanLabelDATPath8D";
@@ -253,7 +253,7 @@ namespace QMAPP.WinForm.Forms.TianJin
}
- ll.BarCode=dataline.ToString().TrimEnd('\r','\n');
+ ll.BarCode = dataline.ToString().TrimEnd('\r', '\n');
ll.PrinterName = "";
QM.Assist.PrintUtil.LabelList2.Add(ll);
QM.Assist.PrintUtil pu = new QM.Assist.PrintUtil();
@@ -264,7 +264,7 @@ namespace QMAPP.WinForm.Forms.TianJin
#endregion
}
-
+
private void PrintPlanLabel_Load(object sender, EventArgs e)
{
LoadViewSetting();
@@ -493,7 +493,7 @@ namespace QMAPP.WinForm.Forms.TianJin
if (dgvPlan.Rows.Count == 0)
{
MessageBox.Show("当前生产线没有未打印标签的计划工单!");
- // return;
+ // return;
}
tsbPrint.Enabled = false;
var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[0].DataBoundItem;
@@ -505,7 +505,7 @@ namespace QMAPP.WinForm.Forms.TianJin
var orders2 = new List();
var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem;
orders2.Add(order2);
- if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7))&& !orders[0].MATERIAL_CODE.Contains("018D"))
+ if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7)) && !orders[0].MATERIAL_CODE.Contains("018D") && !orders[0].MATERIAL_CODE.Contains("278D"))
{
MessageBox.Show("计划工单即将变换配置,请注意!");
}
@@ -527,7 +527,7 @@ namespace QMAPP.WinForm.Forms.TianJin
labeldata.PlanDate = orders[0].PLAN_DATE;
if (book != null)
{
- labeldata.Class = " " + book.CarModel.Substring(book.CarModel.Length-3, 3);
+ labeldata.Class = " " + book.CarModel.Substring(book.CarModel.Length - 3, 3);
labeldata.Description = book.Text;
labeldata.OrderNo = book.CarModel + positioncode + data;
if (orders[0].MATERIAL_CODE.Contains("018D"))
@@ -559,18 +559,18 @@ namespace QMAPP.WinForm.Forms.TianJin
InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString());
WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo);
- if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("前"))
+ if ((orders[0].MATERIAL_CODE.Contains("018D") || orders[0].MATERIAL_CODE.Contains("278D")) && orders[0].MATERIAL_NAME.Contains("前"))
FR = "后";
- else if(orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("后"))
+ else if ((orders[0].MATERIAL_CODE.Contains("018D") || orders[0].MATERIAL_CODE.Contains("278D")) && orders[0].MATERIAL_NAME.Contains("后"))
FR = "前";
BindPlanView();
tsbPrint.Enabled = true;
-
-
+
+
}
catch (Exception ee)
{
- MessageBox.Show("打印出现异常!"+ee.Message);
+ MessageBox.Show("打印出现异常!" + ee.Message);
}
}
public string GetNameCode(string Name)
@@ -578,9 +578,9 @@ namespace QMAPP.WinForm.Forms.TianJin
var Code = "";
if (!string.IsNullOrEmpty(Name))
{
- if(Name.Contains("左前"))
+ if (Name.Contains("左前"))
Code = "FL";
- else if(Name.Contains("左后"))
+ else if (Name.Contains("左后"))
Code = "RL";
else if (Name.Contains("右前"))
Code = "FR";
@@ -597,7 +597,7 @@ namespace QMAPP.WinForm.Forms.TianJin
///
///
///
- public void InsertProduct(string ProductCode,string Material_Code,string prepare)
+ public void InsertProduct(string ProductCode, string Material_Code, string prepare)
{
#region 组成新增产品实例
Product newProduct = new Product();
@@ -641,7 +641,7 @@ namespace QMAPP.WinForm.Forms.TianJin
newProduct.WORKLOC_CODE = "DP_PREPARELOC1";
}
-
+
newProduct.WORKCENTER_CODE = "WORK770B";
@@ -669,7 +669,7 @@ namespace QMAPP.WinForm.Forms.TianJin
private void toolStripButton1_Click(object sender, EventArgs e)
{
var count = 0;
-
+
if (dgvPlan.Rows.Count == 0)
{
MessageBox.Show("当前生产线没有未打印标签的计划工单!");
@@ -678,7 +678,7 @@ namespace QMAPP.WinForm.Forms.TianJin
count = int.Parse(cbListRowcount.Text);
else
count = dgvPlan.Rows.Count;
-
+
for (var i = 0; i < count; i++)
{
System.Threading.Thread.Sleep(1000);
@@ -688,24 +688,24 @@ namespace QMAPP.WinForm.Forms.TianJin
var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i].DataBoundItem;
orders.Add(order1);
- if ((i+1)< count)
+ if ((i + 1) < count)
{
var orders2 = new List();
var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i + 1].DataBoundItem;
orders2.Add(order2);
- if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7)) && !orders[0].MATERIAL_CODE.Contains("018D"))
+ if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7)) && !orders[0].MATERIAL_CODE.Contains("018D") && !orders[0].MATERIAL_CODE.Contains("278D"))
{
MessageBox.Show("计划工单即将变换配置,请注意!");
}
}
toolStripButton1.Enabled = false;
-
+
List labels = new List();
var data = DateTime.Now.ToString("yyyyMMddHHmmssfff");
data = data.Substring(2, data.Length - 2);
-
+
string positioncode = GetNameCode(orders[0].MATERIAL_NAME);
var book = _agent.InvokeServiceFunction("FISPhraseBLL_GetFisPhraseBook", orders[0].MATERIAL_CODE + "", positioncode);
@@ -722,10 +722,10 @@ namespace QMAPP.WinForm.Forms.TianJin
labeldata.OrderNo = book.CarModel + positioncode + data;
if (orders[0].MATERIAL_CODE.Contains("018D"))
{
- var bookS = _agent.InvokeServiceFunction("FISPhraseBLL_GetPHRASEBOOK", orders[0].MATERIAL_CODE.Substring(5,3).Trim());
+ 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;
@@ -746,9 +746,9 @@ namespace QMAPP.WinForm.Forms.TianJin
//WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始插入记录" + labeldata.OrderNo);
InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString());
- if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("前"))
+ if ((orders[0].MATERIAL_CODE.Contains("018D") || orders[0].MATERIAL_CODE.Contains("278D")) && orders[0].MATERIAL_NAME.Contains("前"))
FR = "后";
- else if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("后"))
+ else if ((orders[0].MATERIAL_CODE.Contains("018D") || orders[0].MATERIAL_CODE.Contains("278D")) && orders[0].MATERIAL_NAME.Contains("后"))
FR = "前";
//WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo);
}
@@ -782,7 +782,8 @@ namespace QMAPP.WinForm.Forms.TianJin
BindPlanView();
}
}
- class Direction {
+ class Direction
+ {
public string Code { get; set; }
public string Name { get; set; }
}