22
schangxiang@126.com
2024-12-23 f92f06042907f92f75f6e4cf68a43854d2de8027
22
已修改6个文件
85 ■■■■■ 文件已修改
CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/FormCC.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/02_BZ39工位(补板后工位)/Inbound/2、DataProcess_BZ39_IssueInboundTask.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/04_BZ21(搬运整垛机器人)/1、DataProcess_BZ21.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareSql/DataAccess/ClearDataHandler.cs 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Pda/manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs
@@ -579,7 +579,7 @@
                SystemWarningMsg._lbl_Alert_Srm1ReleaseFinish = errMsg1;
                SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = errMsg2;
                SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask = errMsg3;
                SystemWarningMsg._lbl_Alert_DataProcess_BZ21 = errMsg4;
                Thread.Sleep(2000);//设置2秒一次
            }
        }
CC/iWareCC_ASRS/FormCC.cs
@@ -685,14 +685,16 @@
                {
                    if (SystemValue.isAllowRuning_DeleteData && SystemValue.isStartedModel)
                    {
                        ClearDataHandler.Delete_Base_SysExceptionInfo(7);
                        ClearDataHandler.Delete_Task_RequestLog(7);
                        ClearDataHandler.Delete_Task_Part(10);
                        ClearDataHandler.Delete_Device_Warning(30);
                        ClearDataHandler.Delete_HttpRequestRecord(14);
                        ClearDataHandler.Delete_wms_record_print(7);
                        ClearDataHandler.Delete_mes_push_papercut(7);
                        ClearDataHandler.Delete_mes_push_packagecode(10);
                        ClearDataHandler.Delete_wms_rbline_task(10);
                        ClearDataHandler.Delete_MES_BTJReceiveReq(30);
                        ClearDataHandler.Delete_MES_OnLineReq(30);
                        //ClearDataHandler.Delete_Device_Warning(30);
                        //ClearDataHandler.Delete_HttpRequestRecord(14);
                        //ClearDataHandler.Delete_MES_BTJReceiveReq(30);
                        //ClearDataHandler.Delete_MES_OnLineReq(30);
                        LogTextHelper.BatchDeleteLog();
CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Inbound/2¡¢DataProcess_BZ39_IssueInboundTask.cs
@@ -45,7 +45,7 @@
                        using (WmsDBModel wmsDB = new WmsDBModel())
                        {
                            /*
                            //要是有已下发的任务,就不要执行
                            var isValidate = TaskHandler.ValidateIssueOutTaskForRobotBuffer(wmsDB);
                            if (!isValidate)
CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/1¡¢DataProcess_BZ21.cs
@@ -30,7 +30,7 @@
            while (true)
            {
                Thread.Sleep(2000);//休眠2秒,将休眠写到前面,是为了下面的continue方法执行后不显示错误信息的提示!!!【EditBy shaocx,2022-05-24】
                SystemWarningMsg._lbl_alert_DataProcess_BZ21 = string.Empty;
                //SystemWarningMsg._lbl_alert_DataProcess_BZ21 = string.Empty;
                try
                {
                    if (SystemValue.isStartedModel)
CC/iWareSql/DataAccess/ClearDataHandler.cs
@@ -19,21 +19,21 @@
    public class ClearDataHandler
    {
        /// <summary>
        /// ç§»é™¤XX天前的 å¼‚常表 æ•°æ®
        /// ç§»é™¤XX天前的 wms_record_print æ•°æ®
        /// </summary>
        /// <param name="edm"></param>
        public static void Delete_Base_SysExceptionInfo(int days)
        public static void Delete_wms_record_print(int days)
        {
            try
            {
                using (DbModel edm = new DbModel())
                using (WmsDBModel.WmsDBModel edm = new WmsDBModel.WmsDBModel())
                {
                    var queryTime = DateTime.Now.AddDays(-days);
                    var removeList = edm.Base_SysExceptionInfo.Where(x => x.createTime <= queryTime).ToList();
                    var removeList = edm.wms_record_print.Where(x => x.CreateTime <= queryTime).ToList();
                    if (removeList != null && removeList.Count > 0)
                    {
                        edm.Base_SysExceptionInfo.RemoveRange(removeList);
                        edm.wms_record_print.RemoveRange(removeList);
                    }
                    edm.SaveChanges();
                }
@@ -71,21 +71,21 @@
        }
        /// <summary>
        /// ç§»é™¤XX天前的 è¯·æ±‚日志 æ•°æ®
        /// ç§»é™¤XX天前的 mes_push_papercut æ•°æ®
        /// </summary>
        /// <param name="edm"></param>
        public static void Delete_Task_RequestLog(int days)
        public static void Delete_mes_push_papercut(int days)
        {
            try
            {
                using (DbModel edm = new DbModel())
                using (WmsDBModel.WmsDBModel edm = new WmsDBModel.WmsDBModel())
                {
                    var queryTime = DateTime.Now.AddDays(-days);
                    var removeList = edm.Task_RequestLog.Where(x => x.CreateTime <= queryTime).ToList();
                    var removeList = edm.mes_push_papercut.Where(x => x.CreateTime <= queryTime).ToList();
                    if (removeList != null && removeList.Count > 0)
                    {
                        edm.Task_RequestLog.RemoveRange(removeList);
                        edm.mes_push_papercut.RemoveRange(removeList);
                    }
                    edm.SaveChanges();
                }
@@ -179,23 +179,48 @@
        /// ç§»é™¤XX天前的 è®¾å¤‡ä»»åŠ¡è¡¨ æ•°æ®
        /// </summary>
        /// <param name="edm"></param>
        public static void Delete_Task_Part(int days)
        public static void Delete_mes_push_packagecode(int days)
        {
            try
            {
                using (DbModel edm = new DbModel())
                using (WmsDBModel.WmsDBModel edm = new WmsDBModel.WmsDBModel())
                {
                    var queryTime = DateTime.Now.AddDays(-days);
                    var queryTaskState1 = (int)DeviceTaskStatusEnum.已取消;
                    var queryTaskState2 = (int)DeviceTaskStatusEnum.已完成;
                    var removeList = edm.Task_Part.Where(x => x.CreateTime <= queryTime
                        && (x.TaskState == queryTaskState1 || x.TaskState == queryTaskState2)
                    var removeList = edm.mes_push_packagecode.Where(x => x.CreateTime <= queryTime
                        ).ToList();
                    if (removeList != null && removeList.Count > 0)
                    {
                        edm.Task_Part.RemoveRange(removeList);
                        edm.mes_push_packagecode.RemoveRange(removeList);
                    }
                    edm.SaveChanges();
                }
            }
            catch (Exception ex)
            {
                Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "移除XX天前的 è¯·æ±‚日志 æ•°æ® å‡ºçް异叏", ex);
            }
        }
        /// <summary>
        /// ç§»é™¤XX天前的 è®¾å¤‡ä»»åŠ¡è¡¨ æ•°æ®
        /// </summary>
        /// <param name="edm"></param>
        public static void Delete_wms_rbline_task(int days)
        {
            try
            {
                using (WmsDBModel.WmsDBModel edm = new WmsDBModel.WmsDBModel())
                {
                    var queryTime = DateTime.Now.AddDays(-days);
                    var removeList = edm.wms_rbline_task.Where(x => x.CreateTime <= queryTime
                        ).ToList();
                    if (removeList != null && removeList.Count > 0)
                    {
                        edm.wms_rbline_task.RemoveRange(removeList);
                    }
                    edm.SaveChanges();
                }
LA24030_LuLiPackageLine_Pda/manifest.json
@@ -1,8 +1,8 @@
{
    "name" : "LuLiMuYe_Package_Pda",
    "appid" : "__UNI__28D87EB",
    "description" : "2024.12.17",
    "versionName" : "1.0.6",
    "description" : "2024.12.23",
    "versionName" : "1.0.7",
    "versionCode" : "100",
    "transformPx" : false,
    "app-plus" : {