SiemensWarehouse/siemens2-site/src/utils/formatTime.js

@@ -168,13 +168,13 @@
    //return [moment(startOfWeek,"YYYY-MM-DD HH:mm"), moment(endOfWeek,"YYYY-MM-DD HH:mm")];
    //return [moment(startOfWeek), moment(endOfWeek)];

    // const startStr = formatDateV2(startOfWeek,'YYYY-MM-DD HH:mm:ss');
    // const endStr = formatDateV2(endOfWeek,'YYYY-MM-DD HH:mm:ss');
    const startStr = formatDateV2(startOfWeek,'YYYY-MM-DD HH:mm:ss');
    const  endStr= formatDateV2(endOfWeek,'YYYY-MM-DD HH:mm:ss');
    //return [new Date(startStr), new Date(endStr)];
    // const startStr = formatDateV2(startOfWeek, 'yyyy-MM-dd HH:mm:ss');
    // const endStr = formatDateV2(endOfWeek, 'yyyy-MM-dd HH:mm:ss');
    // return [startStr, endStr];
    //alert(startStr);
    return [startStr, endStr];
    
     // âœ… ç›´æŽ¥è¿”回 Date å¯¹è±¡çš„数组
     return [startOfWeek, endOfWeek];
     //return [startOfWeek, endOfWeek];
    //*/
}

 siemenswmssditcode/wmsService/wcftest/BussinessExtension/SAP/SAPHelper.cs

@@ -29,7 +29,7 @@
        {
            string msg = "";
            string result = "";
            

            // return form.textBox7.Text.Trim();
            var logTitle = GetSapLog("moveStockConfirm", "移库确认", moveList);
            try
@@ -37,7 +37,7 @@
                Log4NetHelper.WriteInfoLog(LogType.SAPService, "开始推送" + logTitle);
                MovMaterialEntity[] results = JsonConvert.DeserializeObject<MovMaterialEntity[]>(moveList);
                //ConfirmMOV
                 result = sendSap.ConfirmMOV(results, out msg);
                result = sendSap.ConfirmMOV(results, out msg);

                if (msg == "")
                {
@@ -73,8 +73,10 @@
            }
            catch (Exception ex)
            {
                MovMaterialEntity[] results2 = JsonConvert.DeserializeObject<MovMaterialEntity[]>(moveList);
                SapSendFailRecodInfoHandler.AddForMove(results2, result, msg);//增加 [EditBy shaocx,2022-02-22]
                //失败后，不再推送，看日志即可 ã€Editby shaocx,2025-09-18】
                //MovMaterialEntity[] results2 = JsonConvert.DeserializeObject<MovMaterialEntity[]>(moveList);
                //SapSendFailRecodInfoHandler.AddForMove(results2, result, msg);//增加 [EditBy shaocx,2022-02-22]

                Log4NetHelper.WriteInfoLog(LogType.SAPService, "推送异常:" + logTitle + ",返回结果:" + msg + ",异常:" + ex.Message);
                Log4NetHelper.WriteErrorLog(LogType.SAPService, "推送异常:" + logTitle + ",返回结果:" + msg + ",异常:" + ex.Message, ex);
                var data = new
@@ -143,7 +145,9 @@
                Log4NetHelper.WriteInfoLog(LogType.SAPService, "推送异常:" + logTitle + ",返回结果:" + msg + ",异常:" + ex.Message);
                Log4NetHelper.WriteErrorLog(LogType.SAPService, "推送异常:" + logTitle + ",返回结果:" + msg + ",异常:" + ex.Message, ex);

                SapSendFailRecodInfoHandler.AddForOutStore(results, "WMS抛出异常", "WMS抛出异常:" + ex.Message);//记录失败表
                //失败后，不再推送，看日志即可 ã€Editby shaocx,2025-09-18】
                //SapSendFailRecodInfoHandler.AddForOutStore(results, "WMS抛出异常", "WMS抛出异常:" + ex.Message);//记录失败表

                var data = new
                {
                    result = false,
@@ -194,7 +198,10 @@
                msg = "WMS异常:" + ex.Message;
                Log4NetHelper.WriteInfoLog(LogType.SAPService, "推送异常:" + logTitle + ",返回结果:" + msg + ",异常:" + ex.Message);
                Log4NetHelper.WriteErrorLog(LogType.SAPService, "推送异常:" + logTitle + ",返回结果:" + msg + ",异常:" + ex.Message, ex);
                SapSendFailRecodInfoHandler.AddForReverser(res, result, msg);//记录失败表 [Editby shaocx,2025-06-13]

                //失败后，不再推送，看日志即可 ã€Editby shaocx,2025-09-18】
                //SapSendFailRecodInfoHandler.AddForReverser(res, result, msg);//记录失败表 [Editby shaocx,2025-06-13]

                return msg;
            }
        }
@@ -236,7 +243,10 @@
                msg = "WMS异常:" + ex.Message;
                Log4NetHelper.WriteInfoLog(LogType.SAPService, "推送异常:" + logTitle + ",返回结果:" + msg + ",异常:" + ex.Message);
                Log4NetHelper.WriteErrorLog(LogType.SAPService, "推送异常:" + logTitle + ",返回结果:" + msg + ",异常:" + ex.Message, ex);
                SapSendFailRecodInfoHandler.AddForSH(results, info, msg);//记录失败表 [Editby shaocx,2025-06-13]

                //失败后，不再推送，看日志即可 ã€Editby shaocx,2025-09-18】
                //SapSendFailRecodInfoHandler.AddForSH(results, info, msg);//记录失败表 [Editby shaocx,2025-06-13]

                return false;
            }
        }

 siemenswmssditcode/wmsService/wcftest/Form1.cs

@@ -3195,24 +3195,11 @@
                            totalInfo.list11[1] = outTaskCount.Count;
                        }

                        //更改数量 ã€Editby shaocx,2024-11-22】
                        /*
                        if (stockUsingCount != null)
                        {
                            decimal cout = stockUsingCount.Count / 1140M * 100;
                            totalInfo.list11[2] = Convert.ToInt32(cout);
                        }
                        if (outTimeStockCount != null)
                        {
                            totalInfo.list11[3] = outTimeStockCount.Count;
                        }
                        //*/
                       
                        totalInfo.list11[2] = 1152;
                        totalInfo.list11[3] = 1152 - stockUsingCount.Count();

                        if (lastHour != today.Hour)
                        //int aaaa = 1;
                        //if (aaaa == 2)
                        {
                            //每隔一小时保存一次设备状态时间
                            lastHour = today.Hour;
@@ -3232,7 +3219,7 @@
                            }
                            else
                            {
                                //todayDeviceInfo.deviceWaitTime = deviceWaitTime.TotalMinutes > 0 ? Convert.ToDecimal(deviceWaitTime.TotalMinutes) : 0M;// deviceWaitTime.Hours * 60M + deviceWaitTime.Minutes;
                                
                                todayDeviceInfo.deviceRunTime = deviceRunTime.TotalMinutes > 0 ? Convert.ToDecimal(deviceRunTime.TotalMinutes) : 0M;
                                todayDeviceInfo.deviceAlarmTime = deviceAlarmTime.TotalMinutes > 0 ? Convert.ToDecimal(deviceAlarmTime.TotalMinutes) : 0M;
                                //重新计算设备等待时间 ã€Editby shaocx,2024-12-30】
@@ -3241,7 +3228,6 @@
                                todayDeviceInfo.taskEnterCount = enterTaskCount.Count;//入库任务数
                                todayDeviceInfo.taskOutCount = outTaskCount.Count;//出库任务数
                                //更改数量 ã€Editby shaocx,2024-11-22】
                                //decimal cout = stockUsingCount.Count / 1140M * 100;
                                decimal cout = stockUsingCount.Count / 1152M * 100;
                                todayDeviceInfo.stockProportion = Convert.ToInt32(cout);//已使用的库位
                                todayDeviceInfo.outDate = outTimeStockCount.Count;//过期时间小于一个月的库存数据
@@ -3610,6 +3596,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

@@ -2673,7 +2673,7 @@
                    if (page.datatime.Length == 2)
                    {

                        StockWhere = StockWhere + " and creatTime > '" + page.datatime[0].ToString() + "' and  creatTime < '" + page.datatime[1].ToString() + "'";
                        StockWhere = StockWhere + " and CreateTime > '" + page.datatime[0].ToString() + "' and  CreateTime < '" + page.datatime[1].ToString() + "'";
                    }
                }

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