TyroneGit/SCRGroupLine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.SCR组立服务器G型动静盘组装岗位，一体机上要增加一个按键，名字叫动盘与支架等级匹配ok，这个要关联到机种登录里面，目前只有一个机种会要这个按键，每个工件都要点这个按键，需要关联到给我PLC的放行信号里面

Browse Source 
2.SCR组立服务器G型筒体烧嵌岗位，需要增加一个治具号，13位字符串
This commit is contained in:
Tyrone CT
2026-04-22 14:35:34 +08:00
parent 13516a45d2
commit ce429f7d12
6 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
GroupLine.App/ModelDto/GCylinderBurnEbDto.cs
View File

@@ -45,6 +45,15 @@ private string _ATrayNo;
get { return _ATrayNo; } get { return _ATrayNo; }
set { _ATrayNo = value; RaisePropertyChanged(() => ATrayNo); } set { _ATrayNo = value; RaisePropertyChanged(() => ATrayNo); }
} }
private string _FixtureNo;
/// <summary>
/// 治具号
/// </summary>
public string FixtureNo
{
get { return _FixtureNo; }
set { _FixtureNo = value; RaisePropertyChanged(() => FixtureNo); }
}
private string _OpNo; private string _OpNo;
/// <summary> /// <summary>
/// 员工编号 /// 员工编号

BIN
GroupLine.App/ReportFile/GCylinderBurnEbTemplate.xlsx
View File

Binary file not shown.

5
GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml
View File

@@ -132,6 +132,11 @@
Binding="{Binding ATrayNo}" Binding="{Binding ATrayNo}"
Header="A托盘号" /> Header="A托盘号" />
<DataGridTextColumn
Width="200"
Binding="{Binding FixtureNo}"
Header="治具号" />
<DataGridTextColumn <DataGridTextColumn
Width="200" Width="200"
Binding="{Binding OpNo}" Binding="{Binding OpNo}"

9
GroupLine.App/ViewModel/GCylinderBurnEbViewModel.cs
View File

@@ -285,15 +285,16 @@ namespace GroupLine.App.ViewModel
row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString()); row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
row.CreateCell(1).SetCellValue(ListData[i].StatoNo.ToString()); row.CreateCell(1).SetCellValue(ListData[i].StatoNo.ToString());
row.CreateCell(2).SetCellValue(ListData[i].ATrayNo.ToString()); row.CreateCell(2).SetCellValue(ListData[i].ATrayNo.ToString());
row.CreateCell(3).SetCellValue(ListData[i].OpNo.ToString()); row.CreateCell(3).SetCellValue(ListData[i].FixtureNo?.ToString());
row.CreateCell(4).SetCellValue(ListData[i].CylinderTemp.ToString()); row.CreateCell(4).SetCellValue(ListData[i].OpNo.ToString());
row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm")); row.CreateCell(5).SetCellValue(ListData[i].CylinderTemp.ToString());
row.CreateCell(6).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
//row.GetCell(10).CellStyle = style0; //row.GetCell(10).CellStyle = style0;
style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss"); style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
row.GetCell(5).CellStyle = style0; row.GetCell(6).CellStyle = style0;
//row.GetCell(26).CellStyle = style0; //row.GetCell(26).CellStyle = style0;
//if (ListDat[i].UpperGroupStandDiffResult == "NG") //if (ListDat[i].UpperGroupStandDiffResult == "NG")
//{ //{

4
GroupLine.App/ViewModel/GDynStaticMachViewModel.cs
View File

@@ -34,8 +34,8 @@ namespace GroupLine.App.ViewModel
public GDynStaticMachViewModel() public GDynStaticMachViewModel()
{ {
ListModelDto = new ObservableCollection<GDynStaticMachDto>(); ListModelDto = new ObservableCollection<GDynStaticMachDto>();
SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString(); SearchStartDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString(); SearchEndDate = DateTime.Now.AddDays(2).ToString("yyyy-MM-dd");
MachineName = CurrentMachineName + " - 搜索条件"; MachineName = CurrentMachineName + " - 搜索条件";

5
GroupLine.Model/GCylinderBurnEb.cs
View File

@@ -33,6 +33,11 @@ namespace GroupLine.Model
/// </summary> /// </summary>
[Column(DbType = "nvarchar(10)")] [Column(DbType = "nvarchar(10)")]
public string ATrayNo { get; set; } public string ATrayNo { get; set; }
/// <summary>
/// 治具号
/// </summary>
[Column(DbType = "nvarchar(20)")]
public string FixtureNo { get; set; }
/// <summary> /// <summary>
/// 员工编号 /// 员工编号
/// </summary> /// </summary>