Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1eea4a5c99 | |||
| d638c1d04d |
@@ -1479,6 +1479,9 @@ namespace VEPROMS
|
|||||||
ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig;
|
ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig;
|
||||||
if (pc == null) return;
|
if (pc == null) return;
|
||||||
|
|
||||||
|
//C2026-015 set overall change bar date
|
||||||
|
pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss");
|
||||||
|
|
||||||
pc.SelectedSlave = selectedSlave;
|
pc.SelectedSlave = selectedSlave;
|
||||||
pc.Print_Rev = revNumber;
|
pc.Print_Rev = revNumber;
|
||||||
//AppRevDate Change
|
//AppRevDate Change
|
||||||
@@ -1490,22 +1493,8 @@ namespace VEPROMS
|
|||||||
//itm.DTS = dts;
|
//itm.DTS = dts;
|
||||||
itm.UserID = Volian.Base.Library.VlnSettings.UserID;
|
itm.UserID = Volian.Base.Library.VlnSettings.UserID;
|
||||||
itm.Save();
|
itm.Save();
|
||||||
|
|
||||||
//C2026-015 set overall change bar date
|
|
||||||
if (selectedSlave > 0)
|
|
||||||
{
|
|
||||||
pc.SelectedSlave = 0;
|
|
||||||
pc.Print_Rev = revNumber;
|
|
||||||
pc.Print_RevDate = revDate.ToString("MM/dd/yyyy");
|
|
||||||
pc.Print_ChangeBarDate = dts.ToString("MM/dd/yyyy HH:mm:ss"); //this is needed to set the changebar date for an indeividual unit also
|
|
||||||
using (Item itm2 = Item.Get(procedureInfo.ItemID))
|
|
||||||
{
|
|
||||||
itm2.MyContent.Config = pc.ToString();
|
|
||||||
itm2.UserID = Volian.Base.Library.VlnSettings.UserID;
|
|
||||||
itm2.Save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public class RevType
|
public class RevType
|
||||||
|
|||||||
@@ -4054,7 +4054,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
// date). Print_ViewableAfterChangeBarDate was created to get only that user specified date, if it exists. If it does exist, we compare
|
// date). Print_ViewableAfterChangeBarDate was created to get only that user specified date, if it exists. If it does exist, we compare
|
||||||
// that with the Content datetime, otherwise we proceed as before.
|
// that with the Content datetime, otherwise we proceed as before.
|
||||||
DateTime? viewableStartingDateTime = (MyProcedure.MyConfig as ProcedureConfig).Print_ViewableStartingChangeBarDate;
|
DateTime? viewableStartingDateTime = (MyProcedure.MyConfig as ProcedureConfig).Print_ViewableStartingChangeBarDate;
|
||||||
if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate && (MyProcedure.MyConfig as ProcedureConfig).SelectedSlave == 0)
|
if (viewableStartingDateTime != null && viewableStartingDateTime > MyProcedure.ChangeBarDate)
|
||||||
return (MyContent.DTS > viewableStartingDateTime);
|
return (MyContent.DTS > viewableStartingDateTime);
|
||||||
return (MyContent.DTS > MyProcedure.ChangeBarDate);
|
return (MyContent.DTS > MyProcedure.ChangeBarDate);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ namespace Volian.Controls.Library
|
|||||||
names.Add(dcfg.Unit_Name);
|
names.Add(dcfg.Unit_Name);
|
||||||
}
|
}
|
||||||
dcfg.SelectedSlave = 0;
|
dcfg.SelectedSlave = 0;
|
||||||
// string[] names = dcfg.Unit_Name.Split(',');
|
// string[] names = dcfg.Unit_Name.Split(',');
|
||||||
int apple = -1;
|
int apple = -1;
|
||||||
if(_MyDisplayTabItem.MyStepTabPanel != null)
|
if(_MyDisplayTabItem.MyStepTabPanel != null)
|
||||||
apple = _MyDisplayTabItem.MyStepTabPanel.MyStepPanel.ApplDisplayMode;
|
apple = _MyDisplayTabItem.MyStepTabPanel.MyStepPanel.ApplDisplayMode;
|
||||||
@@ -69,6 +69,17 @@ namespace Volian.Controls.Library
|
|||||||
{
|
{
|
||||||
MyItemInfo = _MyDisplayTabItem.MyItemInfo;
|
MyItemInfo = _MyDisplayTabItem.MyItemInfo;
|
||||||
}
|
}
|
||||||
|
if (MyItemInfo != null)
|
||||||
|
{
|
||||||
|
if (MyItemInfo.IsRNOPart == true) // Check if step is an RNO disable "Set All To Level" button.
|
||||||
|
{
|
||||||
|
btnApplicabilitychg.Enabled = false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
btnApplicabilitychg.Enabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -394,13 +405,16 @@ namespace Volian.Controls.Library
|
|||||||
if (_MyItemInfo != null)
|
if (_MyItemInfo != null)
|
||||||
{
|
{
|
||||||
if (this.Visible == false) return;
|
if (this.Visible == false) return;
|
||||||
if (_MyItemInfo.IsRNOPart == true) // Check if step is an RNO disable "Set All To Level" button.
|
if (MyItemInfo != null)
|
||||||
{
|
{
|
||||||
btnApplicabilitychg.Enabled = false;
|
if (MyItemInfo.IsRNOPart == true) // Check if step is an RNO disable "Set All To Level" button.
|
||||||
}
|
{
|
||||||
else
|
btnApplicabilitychg.Enabled = false;
|
||||||
{
|
}
|
||||||
btnApplicabilitychg.Enabled = true;
|
else
|
||||||
|
{
|
||||||
|
btnApplicabilitychg.Enabled = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
IItemConfig cfg = _MyItemInfo.MyConfig as IItemConfig;
|
IItemConfig cfg = _MyItemInfo.MyConfig as IItemConfig;
|
||||||
List<int> apples = cfg.MasterSlave_Applicability.GetFlags();
|
List<int> apples = cfg.MasterSlave_Applicability.GetFlags();
|
||||||
|
|||||||
Reference in New Issue
Block a user