From f92f06042907f92f75f6e4cf68a43854d2de8027 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 17:08:47 +0800
Subject: [PATCH] 22
---
CC/iWareSql/DataAccess/ClearDataHandler.cs | 61 +++++++++++++++++++++---------
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/1、DataProcess_BZ21.cs | 4 +-
CC/iWareCC_ASRS/FormCC.cs | 16 ++++---
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/2、DataProcess_BZ39_IssueInboundTask.cs | 2
CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs | 2
LA24030_LuLiPackageLine_Pda/manifest.json | 4 +-
6 files changed, 58 insertions(+), 31 deletions(-)
diff --git a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs
index 1380376..6b6023b 100644
--- a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs
+++ b/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绉掍竴娆�
}
}
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index b6db60b..133ea01 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/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();
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_BZ39_IssueInboundTask.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_BZ39_IssueInboundTask.cs"
index ef9933b..23f784a 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_BZ39_IssueInboundTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_BZ39_IssueInboundTask.cs"
@@ -45,7 +45,7 @@
using (WmsDBModel wmsDB = new WmsDBModel())
{
-
+ /*
//瑕佹槸鏈夊凡涓嬪彂鐨勪换鍔★紝灏变笉瑕佹墽琛�
var isValidate = TaskHandler.ValidateIssueOutTaskForRobotBuffer(wmsDB);
if (!isValidate)
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
index 075a77a..48eecf4 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
@@ -30,7 +30,7 @@
while (true)
{
Thread.Sleep(2000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
- SystemWarningMsg._lbl_alert_DataProcess_BZ21 = string.Empty;
+ //SystemWarningMsg._lbl_alert_DataProcess_BZ21 = string.Empty;
try
{
if (SystemValue.isStartedModel)
@@ -240,7 +240,7 @@
//澶勭悊琛� mes_order_gather
var errmsg = "";
-
+
var resultAlert = MyExtendHelper.HandlerOrderGather(wmsDB, package, "", "", out errmsg);
if (resultAlert == false)
{
diff --git a/CC/iWareSql/DataAccess/ClearDataHandler.cs b/CC/iWareSql/DataAccess/ClearDataHandler.cs
index bfb5ff8..6b7e989 100644
--- a/CC/iWareSql/DataAccess/ClearDataHandler.cs
+++ b/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();
}
diff --git a/LA24030_LuLiPackageLine_Pda/manifest.json b/LA24030_LuLiPackageLine_Pda/manifest.json
index 3821c06..9e48497 100644
--- a/LA24030_LuLiPackageLine_Pda/manifest.json
+++ b/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" : {
--
Gitblit v1.9.3