From 0454641bf40fe81dad66592a3a03e8c3775d2377 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 18 9月 2025 15:03:46 +0800
Subject: [PATCH] 增加新表 deviceGeneralInfoForDetail
---
siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs | 10 ++--
siemenswmssditcode/wmsService/wcftest/orm/dbModel.cs | 1
siemenswmssditcode/wmsService/wcftest/wmsService.csproj | 1
siemenswmssditcode/wmsService/wcftest/orm/deviceGeneralInfoForDetail.cs | 56 ++++++++++++++++++++++++++++
siemenswmssditcode/wmsService/wcftest/Form1.cs | 5 ++
5 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/siemenswmssditcode/wmsService/wcftest/Form1.cs b/siemenswmssditcode/wmsService/wcftest/Form1.cs
index 92306f0..34b1f6c 100644
--- a/siemenswmssditcode/wmsService/wcftest/Form1.cs
+++ b/siemenswmssditcode/wmsService/wcftest/Form1.cs
@@ -3610,6 +3610,11 @@
//閲嶆柊璁＄畻璁惧绛夊緟鏃堕棿 銆怑ditby shaocx,2024-12-30銆�
todayDeviceInfo.deviceWaitTime = 1440 - (todayDeviceInfo.deviceRunTime + todayDeviceInfo.deviceAlarmTime);
}
+ private void CommonCalcWaitTime(ref deviceGeneralInfoForDetail todayDeviceInfo)
+ {
+ //閲嶆柊璁＄畻璁惧绛夊緟鏃堕棿 銆怑ditby shaocx,2024-12-30銆�
+ todayDeviceInfo.deviceWaitTime = 1440 - (todayDeviceInfo.deviceRunTime + todayDeviceInfo.deviceAlarmTime);
+ }
#endregion
diff --git a/siemenswmssditcode/wmsService/wcftest/orm/dbModel.cs b/siemenswmssditcode/wmsService/wcftest/orm/dbModel.cs
index 70ab02b..81137ae 100644
--- a/siemenswmssditcode/wmsService/wcftest/orm/dbModel.cs
+++ b/siemenswmssditcode/wmsService/wcftest/orm/dbModel.cs
@@ -41,6 +41,7 @@
public virtual DbSet<SapSendInfo> SapSendInfo { get; set; }
public virtual DbSet<TakeStock> TakeStock { get; set; }
public virtual DbSet<deviceGeneralInfo> deviceGeneralInfo { get; set; }
+ public virtual DbSet<deviceGeneralInfoForDetail> deviceGeneralInfoForDetail { get; set; }
public virtual DbSet<Sys_User_Log> Sys_User_Log { get; set; }
public virtual DbSet<OutInStockTask> OutInStockTask { get; set; }
public virtual DbSet<VmaterialInfo> VmaterialInfo { get; set; }
diff --git a/siemenswmssditcode/wmsService/wcftest/orm/deviceGeneralInfoForDetail.cs b/siemenswmssditcode/wmsService/wcftest/orm/deviceGeneralInfoForDetail.cs
new file mode 100644
index 0000000..79e253a
--- /dev/null
+++ b/siemenswmssditcode/wmsService/wcftest/orm/deviceGeneralInfoForDetail.cs
@@ -0,0 +1,56 @@
+namespace wcftest.orm
+{
+ using System;
+ using System.Collections.Generic;
+ using System.ComponentModel.DataAnnotations;
+ using System.ComponentModel.DataAnnotations.Schema;
+ using System.Data.Entity.Spatial;
+
+ /// <summary>
+ /// 更细致的设备状态监控表 【Editby shaocx,2025-09-18】
+ /// </summary>
+
+ [Table("deviceGeneralInfoForDetail")]
+ public partial class deviceGeneralInfoForDetail
+ {
+ public int id { get; set; }
+
+ public int? taskEnterCount { get; set; }
+
+ public int? taskOutCount { get; set; }
+
+ public int? stockProportion { get; set; }
+
+ public int? outDate { get; set; }
+
+ /// <summary>
+ /// 运行时间
+ /// </summary>
+ public decimal? deviceRunTime { get; set; }
+ /// <summary>
+ /// 等待时间
+ /// </summary>
+ public decimal? deviceWaitTime { get; set; }
+ /// <summary>
+ /// 报警时间
+ /// </summary>
+ public decimal? deviceAlarmTime { get; set; }
+
+ public DateTime? createTime { get; set; }
+
+ /// <summary>
+ /// 车号
+ /// </summary>
+ [StringLength(50)]
+ public string ext1 { get; set; }
+
+ [StringLength(50)]
+ public string ext2 { get; set; }
+
+ [StringLength(50)]
+ public string ext3 { get; set; }
+
+ [StringLength(50)]
+ public string ext4 { get; set; }
+ }
+}
diff --git a/siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs b/siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs
index a509f97..412f660 100644
--- a/siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs
+++ b/siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs
@@ -3306,16 +3306,16 @@
/// <returns></returns>
public string QueryPageDeviceGeneralInfo(string param)
{
- msgss<deviceGeneralInfo> msg = new msgss<deviceGeneralInfo>();
+ msgss<deviceGeneralInfoForDetail> msg = new msgss<deviceGeneralInfoForDetail>();
DeviceGeneralInfoInput page = JsonConvert.DeserializeObject<DeviceGeneralInfoInput>(param);
try
{
using (dbModel mod = new dbModel())
{
- List<deviceGeneralInfo> fiveDayDeviceInfo = null;
+ List<deviceGeneralInfoForDetail> fiveDayDeviceInfo = null;
if (page.datatime == null)
{
- fiveDayDeviceInfo = mod.deviceGeneralInfo
+ fiveDayDeviceInfo = mod.deviceGeneralInfoForDetail
.OrderByDescending(x => x.createTime)
.ToList();
}
@@ -3323,7 +3323,7 @@
{
DateTime _startTime = Convert.ToDateTime(page.datatime[0]);
DateTime _endTime = Convert.ToDateTime(page.datatime[1]);
- fiveDayDeviceInfo = mod.deviceGeneralInfo
+ fiveDayDeviceInfo = mod.deviceGeneralInfoForDetail
.Where(x => x.createTime >= _startTime && x.createTime <= _endTime)
.OrderByDescending(x => x.createTime)
.ToList();
@@ -3338,7 +3338,7 @@
}
}
- List<deviceGeneralInfo> fenyeRerult = new List<deviceGeneralInfo>();
+ List<deviceGeneralInfoForDetail> fenyeRerult = new List<deviceGeneralInfoForDetail>();
if (fiveDayDeviceInfo.Count > 0)
{
msg.status = 200;
diff --git a/siemenswmssditcode/wmsService/wcftest/wmsService.csproj b/siemenswmssditcode/wmsService/wcftest/wmsService.csproj
index 7e8a704..739cf53 100644
--- a/siemenswmssditcode/wmsService/wcftest/wmsService.csproj
+++ b/siemenswmssditcode/wmsService/wcftest/wmsService.csproj
@@ -419,6 +419,7 @@
<Compile Include="orm\C__Base_DriveInfo_WillDel.cs" />
<Compile Include="orm\dbModel - 澶嶅埗.cs" />
<Compile Include="orm\dbModel.cs" />
+ <Compile Include="orm\deviceGeneralInfoForDetail.cs" />
<Compile Include="orm\deviceGeneralInfo.cs" />
<Compile Include="orm\eBay_OrderList_Relation.cs" />
<Compile Include="orm\ERP_Interface.cs" />
--
Gitblit v1.9.3