From cdf20a4525a2ff9f6fe2c1e9b69fa2854c5848fd Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期二, 27 五月 2025 17:17:03 +0800
Subject: [PATCH] 巨石
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/models/PlcDeviceTable.cs | 86 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/models/PlcDeviceTable.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/models/PlcDeviceTable.cs
index 22693d0..dbfa7ad 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/models/PlcDeviceTable.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/models/PlcDeviceTable.cs
@@ -1,57 +1,67 @@
using HH.WCS.JuShi.models;
using SqlSugar;
using System;
+using System.Collections.Generic;
namespace HH.WCS.JuShi
{
[SugarTable("PlcDeviceTable")]
public class PlcDeviceTable : BaseModel
- { /// <summary>
- /// 线体编号
- /// </summary>
- public int DeviceNo { get; set; }
+ {
+ ///// <summary>
+ // /// 线体编号
+ // /// </summary>
+ //public int DeviceNo { get; set; }
+ ///// <summary>
+ ///// 设备货位编码
+ ///// </summary>
+ //public string Location { get; set; }
+ ///// <summary>
+ ///// 工作模式 待机=1 运行中=2 脱机=0
+ ///// </summary>
+ //public int workMode { get; set; }
+ ///// <summary>
+ ///// 光电信号 有货 =1 无货=0
+ ///// </summary>
+ //public int lightAction { get; set; }
+ ///// <summary>
+ ///// 故障报警
+ ///// </summary>
+ //public int errorAlarm { get; set; }
+ ///// <summary>
+ ///// 设备状态 无状态=0 运行状态=1 手动状态=2 有料等待=3 异常报警=4
+ ///// </summary>
+ //public int deviceState { get; set; }
+ //public string TaskNo { get; set; }
+ ///// <summary>
+ ///// 目标地址
+ ///// </summary>
+ //public int targetAddr { get; set; }
+ ///// <summary>
+ ///// 重量
+ ///// </summary>
+ //public float weight { get; set; }
+ ///// <summary>
+ ///// 托盘码
+ ///// </summary>
+ //public string trayCode { get; set; }
/// <summary>
- /// 设备货位编码
+ /// 3寸输送线请求取框
/// </summary>
- public string Location { get; set; }
+ public bool requestTake1 { get; set; }
/// <summary>
- /// 工作模式 待机=1 运行中=2 脱机=0
+ /// 3寸输送线允许放框
/// </summary>
- public int workMode { get; set; }
+ public bool requestPut1 { get; set; }
/// <summary>
- /// 光电信号 有货 =1 无货=0
+ /// 6寸输送线请求取框
/// </summary>
- public int lightAction { get; set; }
+ public bool requestTake2 { get; set; }
/// <summary>
- /// 故障报警
+ /// 6寸输送线允许放框
/// </summary>
- public int errorAlarm { get; set; }
- /// <summary>
- /// 设备状态 无状态=0 运行状态=1 手动状态=2 有料等待=3 异常报警=4
- /// </summary>
- public int deviceState { get; set; }
- public string TaskNo { get; set; }
- /// <summary>
- /// 目标地址
- /// </summary>
- public int targetAddr { get; set; }
- /// <summary>
- /// 重量
- /// </summary>
- public float weight { get; set; }
- /// <summary>
- /// 托盘码
- /// </summary>
- public string trayCode { get; set; }
- /// <summary>
- /// 输送线请求取框
- /// </summary>
- public bool requestTake { get; set; }
- /// <summary>
- /// 输送线允许放框
- /// </summary>
- public bool requestPut { get; set; }
-
+ public bool requestPut2 { get; set; }
+ public Dictionary<int, int> RGVAllowUnload { get; internal set; }
}
}
--
Gitblit v1.9.1