InOutPut
/
Put_MES
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

11

master
张松男 2 years ago
parent
66bc7819db
commit
8c76ce8275
1 changed files with 33 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs

19
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
View File

@ -118,7 +118,7 @@ namespace QMAPP.WinForm.Forms.TianJin
dataPage.PageIndex = 1; dataPage.PageIndex = 1;
dataPage.SortExpression = " ROWVALUE ASC"; 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 count = Convert.ToInt32(cbListRowcount.Text) / 2;
var orderlist = new List<FJC.Entity.ProductionPlan.WorkOrder>(); var orderlist = new List<FJC.Entity.ProductionPlan.WorkOrder>();
@ -240,7 +240,7 @@ namespace QMAPP.WinForm.Forms.TianJin
label.MATERIALCODE,// label.MATERIALCODE,//
label.Remark label.Remark
); );
if (label.OrderNo.Contains("018D")) if (label.OrderNo.Contains("018D") || label.OrderNo.Contains("278D"))
{ {
TMPPath = "PlanLabelTMPPath8D"; TMPPath = "PlanLabelTMPPath8D";
DATPath = "PlanLabelDATPath8D"; DATPath = "PlanLabelDATPath8D";
@ -505,7 +505,7 @@ namespace QMAPP.WinForm.Forms.TianJin
var orders2 = new List<FJC.Entity.ProductionPlan.WorkOrder>(); var orders2 = new List<FJC.Entity.ProductionPlan.WorkOrder>();
var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem; var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem;
orders2.Add(order2); 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("计划工单即将变换配置，请注意！"); MessageBox.Show("计划工单即将变换配置，请注意！");
} }
@ -559,9 +559,9 @@ namespace QMAPP.WinForm.Forms.TianJin
InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString()); InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString());
WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo); 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 = "后"; 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 = "前"; FR = "前";
BindPlanView(); BindPlanView();
tsbPrint.Enabled = true; tsbPrint.Enabled = true;
@ -693,7 +693,7 @@ namespace QMAPP.WinForm.Forms.TianJin
var orders2 = new List<FJC.Entity.ProductionPlan.WorkOrder>(); var orders2 = new List<FJC.Entity.ProductionPlan.WorkOrder>();
var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i + 1].DataBoundItem; var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i + 1].DataBoundItem;
orders2.Add(order2); 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("计划工单即将变换配置，请注意！"); MessageBox.Show("计划工单即将变换配置，请注意！");
} }
@ -746,9 +746,9 @@ namespace QMAPP.WinForm.Forms.TianJin
//WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始插入记录" + labeldata.OrderNo); //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始插入记录" + labeldata.OrderNo);
InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString()); 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 = "后"; 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 = "前"; FR = "前";
//WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo); //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo);
} }
@ -782,7 +782,8 @@ namespace QMAPP.WinForm.Forms.TianJin
BindPlanView(); BindPlanView();
} }
} }
class Direction { class Direction
{
public string Code { get; set; } public string Code { get; set; }
public string Name { get; set; } public string Name { get; set; }
} }

Write Preview
Loading…
Cancel
Save