增加新表 deviceGeneralInfoForDetail

schangxiang@126.com

2025-09-18 0454641bf40fe81dad66592a3a03e8c3775d2377

增加新表  deviceGeneralInfoForDetail

 siemenswmssditcode/wmsService/wcftest/Form1.cs

@@ -3610,6 +3610,11 @@
            //重新计算设备等待时间 ã€Editby shaocx,2024-12-30】
            todayDeviceInfo.deviceWaitTime = 1440 - (todayDeviceInfo.deviceRunTime + todayDeviceInfo.deviceAlarmTime);
        }
        private void CommonCalcWaitTime(ref deviceGeneralInfoForDetail todayDeviceInfo)
        {
            //重新计算设备等待时间 ã€Editby shaocx,2024-12-30】
            todayDeviceInfo.deviceWaitTime = 1440 - (todayDeviceInfo.deviceRunTime + todayDeviceInfo.deviceAlarmTime);
        }

        #endregion


 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; }

 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; }
    }
}

 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;

 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" />