MES / DataAcquisition · Commits

Commit f19df7537b46eff55aadfb9a7e7c2b6fc43bab6c

Authored by 唐召明
1 parent b0bb09ac

调整地址

Inline Side-by-side
Showing 7 changed files with 55 additions and 13 deletions
ApiControllers/BoardController.cs
  View file @f19df75
... ... @@ -63,7 +63,7 @@ namespace DataAcquisition.ApiControllers
63 63 _ = double.TryParse(robotEquipment[RobotProps.Pos_E3.ToString()].Value, out var pos_E3);
64 64 _ = double.TryParse(robotEquipment[RobotProps.Pos_E4.ToString()].Value, out var pos_E4);
65 65  
66   - _ = bool.TryParse(robotEquipment[RobotProps.Weld_CleanGun.ToString()].Value, out var weld_CleanGun);
  66 + //_ = bool.TryParse(robotEquipment[RobotProps.Weld_CleanGun.ToString()].Value, out var weld_CleanGun);
67 67 _ = bool.TryParse(robotEquipment[RobotProps.WeldFlag.ToString()].Value, out var weldFlag);
68 68 _ = bool.TryParse(robotEquipment[RobotProps.Weld_Gas.ToString()].Value, out var weld_Gas);
69 69 _ = bool.TryParse(robotEquipment[RobotProps.WeldCompleteFlag.ToString()].Value, out var weldCompleteFlag);
... ... @@ -79,8 +79,11 @@ namespace DataAcquisition.ApiControllers
79 79 _ = float.TryParse(robotEquipment[RobotProps.Weld_Speed.ToString()].Value, out var weld_Speed);
80 80 _ = int.TryParse(robotEquipment[RobotProps.Work_Mode.ToString()].Value, out var work_Mode);
81 81 _ = int.TryParse(robotEquipment[RobotProps.Program_No.ToString()].Value, out var program_no);
82   - _ = int.TryParse(robotEquipment[RobotProps.Type.ToString()].Value, out var type);
  82 + //_ = int.TryParse(robotEquipment[RobotProps.Type.ToString()].Value, out var type);
83 83 _ = int.TryParse(robotEquipment[RobotProps.Station.ToString()].Value, out var station);
  84 + _ = int.TryParse(robotEquipment[RobotProps.WireFeeder.ToString()].Value, out var wireFeeder);
  85 +
  86 + var type = robotEquipment[RobotProps.Type.ToString()].Value;
84 87  
85 88 var equipmentState = "在线";
86 89 if (!bootFalgValue)
... ... @@ -160,9 +163,14 @@ namespace DataAcquisition.ApiControllers
160 163  
161 164 EqInfoLeft = new EquipmentInfoLeftVM
162 165 {
163   - ClearSpearState = weld_CleanGun,
  166 + ClearSpearState = wireFeeder switch
  167 + {
  168 + 1 => "1#",
  169 + 2 => "2#",
  170 + _ => "无数据"
  171 + },
164 172 ArcingState = weldFlag,
165   - NowProject = type == 0 ? "无" : $"程序{type}",
  173 + //NowProject = type == 0 ? "无" : $"程序{type}",
166 174 ProjectRow = program_no,
167 175 X = Math.Round(pos_X, 1),
168 176 Y = Math.Round(pos_Y, 1),
... ... @@ -196,7 +204,7 @@ namespace DataAcquisition.ApiControllers
196 204 WorkTime = Math.Round(TimeSpan.FromTicks(context.EquipmentPropertyRecords.Where(x => x.EquipmentCode == robotEquipment.Code && x.EquipmentPropertyCode == RobotProps.WorkFlag.ToString() && x.CreateTime.Date == dateTime.Date).Sum(x => x.UpdateTime.Ticks - x.CreateTime.Ticks)).TotalHours, 2),
197 205 ArcingTime = Math.Round(TimeSpan.FromTicks(context.EquipmentPropertyRecords.Where(x => x.EquipmentCode == robotEquipment.Code && x.EquipmentPropertyCode == RobotProps.WeldFlag.ToString() && x.CreateTime.Date == dateTime.Date).Sum(x => x.UpdateTime.Ticks - x.CreateTime.Ticks)).TotalHours, 2),
198 206 }).ToList(),
199   - ProductInfo = type.ToString(),
  207 + ProductInfo = type ?? "无数据",
200 208 ProductState = productStateName,
201 209 TimeSum = timeSum,
202 210 YieldList = new YieldListVM
... ...
Common/Enums/RobotProps.cs
  View file @f19df75
... ... @@ -144,6 +144,12 @@
144 144 ArcVoltageTracking,
145 145  
146 146 /// <summary>
  147 + /// 送丝机选择
  148 + /// </summary>
  149 + /// <remarks>0：无数据，1：1#，2：2#</remarks>
  150 + WireFeeder,
  151 +
  152 + /// <summary>
147 153 /// 焊丝统计/日
148 154 /// </summary>
149 155 /// <remarks>写</remarks>
... ... @@ -153,6 +159,6 @@
153 159 /// 焊丝统计/月
154 160 /// </summary>
155 161 /// <remarks>写</remarks>
156   - Weld_statistics_Month
  162 + Weld_statistics_Month,
157 163 }
158 164 }
... ...
DataAccess/DataSeeding.cs
  View file @f19df75
... ... @@ -55,13 +55,24 @@ namespace DataAcquisition.DataAccess
55 55 Remark = "1:T1模式，2：T2模式；3：自动模式；4：外部自动模式；WCS做状态显示，及做设备利用率计算；",
56 56 CreateTime = DateTime.Now,
57 57 },
  58 + //new EquipmentProperty
  59 + //{
  60 + // EquipmentId = 1,
  61 + // Code = RobotProps.Type.ToString(),
  62 + // Name = "工件型号",
  63 + // DataAddress = "DB7101.14.0",
  64 + // DataType= DataTypeConst.Int16,
  65 + // Enable = true,
  66 + // Remark = "机器人示教程序开始给定，",
  67 + // CreateTime = DateTime.Now,
  68 + //},
58 69 new EquipmentProperty
59 70 {
60 71 EquipmentId = 1,
61 72 Code = RobotProps.Type.ToString(),
62 73 Name = "工件型号",
63   - DataAddress = "DB7101.14.0",
64   - DataType= DataTypeConst.Int16,
  74 + DataAddress = "DB7101.64,10",
  75 + DataType= DataTypeConst.String,
65 76 Enable = true,
66 77 Remark = "机器人示教程序开始给定，",
67 78 CreateTime = DateTime.Now,
... ... @@ -309,6 +320,17 @@ namespace DataAcquisition.DataAccess
309 320 Remark = "true为开启，false为关闭",
310 321 CreateTime = DateTime.Now,
311 322 },
  323 + new EquipmentProperty
  324 + {
  325 + EquipmentId = 1,
  326 + Code = RobotProps.WireFeeder.ToString(),
  327 + Name = "送丝机选择",
  328 + DataAddress = "DB7101.62",
  329 + DataType= DataTypeConst.Int16,
  330 + Enable = true,
  331 + Remark = "0：无数据，1：送丝机1#，2：送丝机2#",
  332 + CreateTime = DateTime.Now,
  333 + },
312 334  
313 335 #endregion
314 336  
... ...
DataAcquisition.csproj
  View file @f19df75
... ... @@ -32,7 +32,7 @@
32 32 <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
33 33 </PackageReference>
34 34 <PackageReference Include="NPOI" Version="2.7.1" />
35   - <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
  35 + <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
36 36 <PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
37 37 </ItemGroup>
38 38  
... ...
Services/DataAnalysis/RobotDataAnalysis.cs
  View file @f19df75
... ... @@ -213,13 +213,14 @@ namespace DataAcquisition.Services.DataAnalysis
213 213 }
214 214 else
215 215 {
216   - _ = int.TryParse(equipment[RobotProps.Type.ToString()].Value, out var type);
  216 + //_ = int.TryParse(equipment[RobotProps.Type.ToString()].Value, out var type);
  217 + var type = equipment[RobotProps.Type.ToString()].Value ?? string.Empty;
217 218 _ = int.TryParse(equipment[RobotProps.Program_No.ToString()].Value, out var program_No);
218 219 context.WorkpieceProductions.Add(new WorkpieceProduction
219 220 {
220 221 EquipmentCode = equipment.Code,
221 222 EquipmentName = equipment.Name,
222   - WorkpieceCode = type.ToString(),//待完善
  223 + WorkpieceCode = type,//待完善
223 224 ProgramNo = program_No,
224 225 IsEnd = false,
225 226 CreateTime = DateTime.Now,
... ...
ViewModels/Board/Board1VM.cs
  View file @f19df75
... ... @@ -209,10 +209,15 @@
209 209 /// </summary>
210 210 public bool ArcingState { get; set; }
211 211  
  212 + ///// <summary>
  213 + ///// 清枪状态
  214 + ///// </summary>
  215 + //public bool ClearSpearState { get; set; }
  216 +
212 217 /// <summary>
213   - /// 清枪状态
  218 + /// 送丝机选择
214 219 /// </summary>
215   - public bool ClearSpearState { get; set; }
  220 + public string ClearSpearState { get; set; } = null!;
216 221  
217 222 /// <summary>
218 223 /// X轴
... ...
No preview for this file type