schangxiang@126.com
2025-09-18 49a51c068d62084bc4c3e77c4be94a20de556c4a
去掉 不用额代码
已修改1个文件
18 ■■■■ 文件已修改
siemenswmssditcode/wmsService/wcftest/Form1.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;//过期时间小于一个月的库存数据