From 5056447f2a32f9e3e37a971416c99d8b8c8d74d9 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期日, 09 十月 2022 12:37:48 +0800
Subject: [PATCH] 排程单的注释
---
APSM/装配智能排程/Sc_ICMOAutoSortBill.cs | 4 ++--
APSM/装配智能排程/Sc_ICMOAutoSortBill.designer.cs | 9 ++++++++-
APSM/Sc_ICMOSortBillFun.cs | 4 ++--
APSM/装配智能排程/Sc_ICMOAutoSortBill.resx | 12 ++++++------
4 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/APSM/Sc_ICMOSortBillFun.cs b/APSM/Sc_ICMOSortBillFun.cs
index 39d6cdb..31418ba 100644
--- a/APSM/Sc_ICMOSortBillFun.cs
+++ b/APSM/Sc_ICMOSortBillFun.cs
@@ -2002,7 +2002,7 @@
{
if (sLeftQty > 0)
{
- if (DBUtility.ClsPub.isDate(ds.Tables[0].Rows[i]["日期"]) == DBUtility.ClsPub.isDate(grd.Columns[j].Tag))
+ if (DBUtility.ClsPub.isDate(ds.Tables[0].Rows[i]["日期"]) == DBUtility.ClsPub.isDate(grd.Columns[j].Tag)) //表格的标题上 保存了日期；
{
//如果时间被 上道余量占用 则 跳过
b = false;
@@ -2044,7 +2044,7 @@
oClsGridValues.Add(oSub);
}
}
- else
+ else //卓力不需要考虑加班，下面的这一段不需要
{
if (sLeftQty > sWorkQty * DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[i]["最大剩余工时"]))
{
diff --git "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.cs" "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.cs"
index 18e8fa9..ffc531e 100644
--- "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.cs"
+++ "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.cs"
@@ -692,7 +692,7 @@
//判断资源剩余工时，是否大于 生产周期
if (DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[j]["剩余工时"]) > sLeftProdTimes)
{
- if (iLeftQty > 0)
+ if (iLeftQty > 0) // 生产订单剩余数量
{
//在本资源上生产
//获取该生产资源的剩余工时进行排程。
@@ -705,7 +705,7 @@
dsSub = Sc_ICMOSortBillFun.GetWorkSourceTimeBySource(oCn, lSourceID);
if (dsSub == null || dsSub.Tables[0].Rows.Count == 0)
{
- continue;
+ continue;//如果没有剩余则 执行下一个生产订单
}
if (dsSub != null )//不加班排程
{
diff --git "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.designer.cs" "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.designer.cs"
index f05e6a7..396a38b 100644
--- "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.designer.cs"
+++ "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.designer.cs"
@@ -107,6 +107,7 @@
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.spc1)).BeginInit();
this.spc1.Panel1.SuspendLayout();
this.spc1.Panel2.SuspendLayout();
this.spc1.SuspendLayout();
@@ -866,12 +867,13 @@
this.grdSourceBill.Margin = new System.Windows.Forms.Padding(4);
this.grdSourceBill.Name = "grdSourceBill";
this.grdSourceBill.ReadOnly = true;
+ this.grdSourceBill.RowHeadersWidth = 51;
this.grdSourceBill.RowTemplate.Height = 23;
this.grdSourceBill.Size = new System.Drawing.Size(1571, 745);
this.grdSourceBill.TabIndex = 20;
this.grdSourceBill.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSourceBill_CellBeginEdit);
- this.grdSourceBill.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSourceBill_CellEndEdit);
this.grdSourceBill.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSourceBill_CellClick);
+ this.grdSourceBill.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSourceBill_CellEndEdit);
this.grdSourceBill.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdSourceBill_EditingControlShowing);
this.grdSourceBill.KeyDown += new System.Windows.Forms.KeyEventHandler(this.grdSourceBill_KeyDown);
//
@@ -898,6 +900,7 @@
this.grdMain.Margin = new System.Windows.Forms.Padding(4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
this.grdMain.Size = new System.Drawing.Size(1571, 745);
this.grdMain.TabIndex = 21;
@@ -941,6 +944,7 @@
this.grdSource.Margin = new System.Windows.Forms.Padding(4);
this.grdSource.Name = "grdSource";
this.grdSource.ReadOnly = true;
+ this.grdSource.RowHeadersWidth = 51;
this.grdSource.RowTemplate.Height = 23;
this.grdSource.Size = new System.Drawing.Size(1571, 0);
this.grdSource.TabIndex = 0;
@@ -968,6 +972,7 @@
this.grdICMO.Margin = new System.Windows.Forms.Padding(4);
this.grdICMO.Name = "grdICMO";
this.grdICMO.ReadOnly = true;
+ this.grdICMO.RowHeadersWidth = 51;
this.grdICMO.RowTemplate.Height = 23;
this.grdICMO.Size = new System.Drawing.Size(1571, 0);
this.grdICMO.TabIndex = 1;
@@ -994,6 +999,7 @@
this.grdProcFlow.Margin = new System.Windows.Forms.Padding(4);
this.grdProcFlow.Name = "grdProcFlow";
this.grdProcFlow.ReadOnly = true;
+ this.grdProcFlow.RowHeadersWidth = 51;
this.grdProcFlow.RowTemplate.Height = 23;
this.grdProcFlow.Size = new System.Drawing.Size(1579, 7);
this.grdProcFlow.TabIndex = 2;
@@ -1022,6 +1028,7 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.spc1.Panel1.ResumeLayout(false);
this.spc1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.spc1)).EndInit();
this.spc1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
diff --git "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.resx" "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.resx"
index 607f103..07005d2 100644
--- "a/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.resx"
+++ "b/APSM/\350\243\205\351\205\215\346\231\272\350\203\275\346\216\222\347\250\213/Sc_ICMOAutoSortBill.resx"
@@ -112,15 +112,15 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -4204,10 +4204,10 @@
//////////////////////////////////////////////////////////////////////8A
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>95, 17</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
</root>
\ No newline at end of file
--
Gitblit v1.9.1