From d27af0b8ad77d2218f15806fc5d78447dd5606ba Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 25 三月 2025 15:28:04 +0800
Subject: [PATCH] 1123
---
/dev/null | 6 -
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 22 ++++
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs | 2
CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs | 192 +++++++++++++++++++++++++++++++++++++----------
4 files changed, 170 insertions(+), 52 deletions(-)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
index ba5dfc1..8bd3eb5 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs
@@ -283,7 +283,19 @@
{
string isTrue = string.Empty;
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+
ResultTrayCellsStatus result = GetResultTrayCellsStatus(command, stationManager);
+
+ if (result.SerialNos.Count == 0)
+ {
+ var Traycontent = await _taskService.RequestWMSTask(command.Barcode, childDeviceCode);
+ if (Traycontent.Status)
+ {
+ ConsoleHelper.WriteSuccessLine("璇锋眰鍥炴祦闈欑疆");
+ ExecuteConveyorLineTask(conveyorLine, command, ProtocalDetailValue, childDeviceCode);
+ }
+ }
List<string> strings = stationManager.Roadway.Split(",").ToList();
foreach (string item in strings)
@@ -504,61 +516,157 @@
}
}
}
- public void ExecuteConveyorLineTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, int ProtocalDetailValue ,string childDeviceCode)
+
+ //public void ExecuteConveyorLineTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, int ProtocalDetailValue ,string childDeviceCode)
+ //{
+ // var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
+ // if (task != null)
+ // {
+ // var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
+ // var valueList = value.Split(',').ToList();
+ // if (valueList.Contains(task.SourceAddress))
+ // {
+ // conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
+
+ // var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵task.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵task.PalletCode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵1000}銆�";
+ // ConsoleHelper.WriteWarningLine(log);
+
+ // _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
+ // WriteInfo(conveyorLine.DeviceName, log);
+
+ // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ // }
+ // else if (task.TargetAddress == "1020-1")
+ // {
+ // var next = task.NextAddress;
+ // var taskCommand = MapTaskCommand(task, command);
+ // task.NextAddress = next;
+
+ // var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
+ // ConsoleHelper.WriteWarningLine(log);
+
+ // _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
+ // WriteInfo(conveyorLine.DeviceName, log);
+
+ // conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+
+ // var taskHty = task.Adapt<Dt_Task_Hty>();
+ // _task_HtyRepository.AddData(taskHty);
+ // _taskService.DeleteData(task);
+ // }
+ // else
+ // {
+ // var next = task.NextAddress;
+ // var taskCommand = MapTaskCommand(task, command);
+ // task.NextAddress = next;
+
+ // var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
+ // ConsoleHelper.WriteWarningLine(log);
+
+ // _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
+ // WriteInfo(conveyorLine.DeviceName, log);
+
+ // conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ // ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ // _taskService.UpdateTaskStatusToNext(task);
+ // }
+ // }
+ //}
+
+ /// <summary>
+ /// 鎵ц杈撻�佺嚎浠诲姟
+ /// </summary>
+ /// <param name="conveyorLine">杈撻�佺嚎瀵硅薄</param>
+ /// <param name="command">杈撻�佺嚎浠诲姟鍛戒护</param>
+ /// <param name="ProtocalDetailValue">鍗忚鏄庣粏鍊�</param>
+ /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+ public void ExecuteConveyorLineTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, int ProtocalDetailValue, string childDeviceCode)
{
+ // 鏌ヨ浠诲姟淇℃伅
var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
- if (task != null)
+
+ if (task == null) return;
+
+ // 鑾峰彇閰嶇疆鍊煎苟杞崲涓哄垪琛�
+ var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
+ var valueList = value.Split(',').ToList();
+
+ // 鏃ュ織妯℃澘
+ var logMessage = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵task.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵task.PalletCode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵{0}}銆�";
+
+ // 鍒ゆ柇浠诲姟鐨勮捣濮嬪湴鍧�鏄惁鍦ㄩ厤缃垪琛ㄤ腑
+ if (valueList.Contains(task.SourceAddress))
{
- var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
- var valueList = value.Split(',').ToList();
- if (valueList.Contains(task.SourceAddress))
+ // 璁剧疆鐩爣鍦板潃涓� "1000"
+ conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
+
+ // 璁板綍鏃ュ織骞跺彂閫佸畬鎴愪俊鍙�
+ LogAndSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, logMessage, "1000");
+ }
+ else if (task.Roadway.Contains("JZ"))
+ {
+ // 鏌ヨ鏄惁瀛樺湪闈欑疆鍑哄簱浠诲姟
+ var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway &&
+ (x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting ||
+ x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting ||
+ x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish));
+
+ if (outJZTask.IsNullOrEmpty())
{
- conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);
-
- var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵task.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵task.PalletCode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵1000}銆�";
- ConsoleHelper.WriteWarningLine(log);
-
- _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
- WriteInfo(conveyorLine.DeviceName, log);
-
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- }
- else if (task.TargetAddress == "1020-1")
- {
- var next = task.NextAddress;
+ // 鏄犲皠浠诲姟鍛戒护
var taskCommand = MapTaskCommand(task, command);
- task.NextAddress = next;
- var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
- ConsoleHelper.WriteWarningLine(log);
-
- _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
- WriteInfo(conveyorLine.DeviceName, log);
-
+ // 鍙戦�佷换鍔″懡浠�
conveyorLine.SendCommand(taskCommand, childDeviceCode);
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- var taskHty = task.Adapt<Dt_Task_Hty>();
- _task_HtyRepository.AddData(taskHty);
- _taskService.DeleteData(task);
+ // 璁板綍鏃ュ織骞跺彂閫佸畬鎴愪俊鍙�
+ LogAndSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, logMessage, taskCommand.TargetAddress.ToString());
+
+ // 鏇存柊浠诲姟鐘舵��
+ _taskService.UpdateTaskStatusToNext(task);
}
else
{
- var next = task.NextAddress;
- var taskCommand = MapTaskCommand(task, command);
- task.NextAddress = next;
-
- var log = $"銆恵conveyorLine._deviceName}銆戜换鍔″彿锛氥�恵command.TaskNum}銆�,鎵樼洏鏉＄爜锛氥�恵command.Barcode}銆戝凡鍒拌揪銆恵childDeviceCode}銆戣姹傛壂鐮佸叆搴�(瀹炵洏),涓嬩竴鐩爣鍦板潃銆恵taskCommand.TargetAddress}銆�";
- ConsoleHelper.WriteWarningLine(log);
-
- _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
- WriteInfo(conveyorLine.DeviceName, log);
-
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
- ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
- _taskService.UpdateTaskStatusToNext(task);
+ ConsoleHelper.WriteWarningLine("宸插瓨鍦ㄩ潤缃嚭搴撲换鍔�,闈欑疆鍏ュ簱浠诲姟鏃犳硶涓嬪彂鑷崇嚎浣�");
}
}
+ else
+ {
+ // 鏄犲皠浠诲姟鍛戒护
+ var taskCommand = MapTaskCommand(task, command);
+
+ // 鍙戦�佷换鍔″懡浠�
+ conveyorLine.SendCommand(taskCommand, childDeviceCode);
+
+ // 璁板綍鏃ュ織骞跺彂閫佸畬鎴愪俊鍙�
+ LogAndSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, logMessage, taskCommand.TargetAddress.ToString());
+
+ // 鏇存柊浠诲姟鐘舵��
+ _taskService.UpdateTaskStatusToNext(task);
+ }
}
+
+ /// <summary>
+ /// 璁板綍鏃ュ織骞跺彂閫佸畬鎴愪俊鍙�
+ /// </summary>
+ /// <param name="conveyorLine">杈撻�佺嚎瀵硅薄</param>
+ /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+ /// <param name="ProtocalDetailValue">鍗忚鏄庣粏鍊�</param>
+ /// <param name="logMessage">鏃ュ織娑堟伅妯℃澘</param>
+ /// <param name="targetAddress">鐩爣鍦板潃</param>
+ private void LogAndSendFinish(CommonConveyorLine conveyorLine, string childDeviceCode, int ProtocalDetailValue, string logMessage, string targetAddress)
+ {
+ // 鏍煎紡鍖栨棩蹇楁秷鎭�
+ var log = string.Format(logMessage, targetAddress);
+ // 杈撳嚭璀﹀憡鏃ュ織
+ ConsoleHelper.WriteWarningLine(log);
+ // 璁板綍鏃ュ織
+ _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log, time = DateTime.Now.ToString("G"), color = "red" });
+ WriteInfo(conveyorLine.DeviceName, log);
+ // 鍙戦�佸畬鎴愪俊鍙�
+ ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
+ }
+
}
}
\ No newline at end of file
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
index 59588af..4ace90d 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs
@@ -189,7 +189,7 @@
//var proAddress = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == stationInfo.stationChildCode).Where(x => x.DeviceProParamName == ConveyorLineDBName_After.Reserve5.ToString()).FirstOrDefault().DeviceProAddress;
var cache = Convert.ToInt16(conveyorLine.ReadValue(ConveyorLineDBName_After.Reserve5, stationInfo.stationChildCode));
ConsoleHelper.WriteColorLine($"宸茬粡鏈墈taskNew.Count}涓换鍔�,鍙互鏀緖cache}涓┖鎵樼洏", ConsoleColor.DarkCyan);
- if (taskNew.Count + 1 <= cache) //涓嶅瓨鍦ㄧ┖妗嗗嚭搴撲换鍔� 鍒欒姹俉MS鍑虹┖搴�
+ if (taskNew.Count + 1 < cache) //涓嶅瓨鍦ㄧ┖妗嗗嚭搴撲换鍔� 鍒欒姹俉MS鍑虹┖搴�
{
//ConsoleHelper.WriteWarningLine("璇锋眰绌烘墭鐩�");
if (_taskService.RequestTask(command.ConveyorLineBarcode, stationInfo).Result.Status)
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
index a19211a..8765f22 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs
@@ -1,4 +1,5 @@
锘縰sing Mapster;
+using Masuit.Tools;
using Newtonsoft.Json;
using Quartz;
using System.Diagnostics.CodeAnalysis;
@@ -60,7 +61,6 @@
{
try
{
-
CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
if (commonStackerCrane != null)
{
@@ -218,7 +218,7 @@
/// <returns></returns>
private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
{
- Dt_Task task;
+ Dt_Task task = null;
if (commonStackerCrane.LastTaskType == null)
{
task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
@@ -266,6 +266,22 @@
return task;
}
+ #region 闈欑疆鍑哄簱鍒ゆ柇鏄惁鑳芥墽琛屼换鍔�
+
+ if (!task.IsNullOrEmpty() && task.Roadway.Contains("JZ") && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ {
+ // 鏌ヨ鏄惁瀛樺湪闈欑疆鍏ュ簱浠诲姟
+ var inJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway &&
+ (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting ||
+ x.TaskState == (int)TaskInStatusEnum.SC_InExecuting ||
+ x.TaskState == (int)TaskInStatusEnum.Line_InFinish));
+
+ ConsoleHelper.WriteErrorLine($"褰撳墠闈欑疆绾夸綋瀛樺湪鍏ュ簱浠诲姟{inJZTask.Count()}鏉�,{(inJZTask.Count() > 0 ? "鍙叆搴�" : "涓嶅彲鍏ュ簱")}");
+ if (!inJZTask.IsNullOrEmpty())
+ return null;
+ }
+
+ #endregion 闈欑疆鍑哄簱鍒ゆ柇鏄惁鑳芥墽琛屼换鍔�
}
else if (task == null)
{
@@ -414,7 +430,7 @@
{
var value = _sys_ConfigService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStation, SysConfigKeyConst.JZNGInBoundStation).ConfigValue;
var valueList = value.Split(',').ToList();
- if ((valueList.Contains(task.SourceAddress)) && task.Roadway.Contains("CH")||task.Roadway.Contains("JZ"))
+ if ((valueList.Contains(task.SourceAddress)) && task.Roadway.Contains("CH") || task.Roadway.Contains("JZ"))
{
string[] souredCodes = task.CurrentAddress.Split("-");
if (souredCodes.Length == 3)
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/2024-09-04\347\224\265\346\216\247\346\217\220\344\276\233\347\232\204\345\233\276\347\272\270/08\344\272\214\346\245\274\350\276\223\351\200\201\345\270\203\345\261\200\347\202\271\344\275\215\345\233\2761106\0504\051.dwg.bak" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/2024-09-04\347\224\265\346\216\247\346\217\220\344\276\233\347\232\204\345\233\276\347\272\270/08\344\272\214\346\245\274\350\276\223\351\200\201\345\270\203\345\261\200\347\202\271\344\275\215\345\233\2761106\0504\051.dwg.bak"
deleted file mode 100644
index e5cc257..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/2024-09-04\347\224\265\346\216\247\346\217\220\344\276\233\347\232\204\345\233\276\347\272\270/08\344\272\214\346\245\274\350\276\223\351\200\201\345\270\203\345\261\200\347\202\271\344\275\215\345\233\2761106\0504\051.dwg.bak"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/09\344\270\211\346\245\274\350\276\223\351\200\201\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108\0501\051.dwl" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/09\344\270\211\346\245\274\350\276\223\351\200\201\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108\0501\051.dwl"
deleted file mode 100644
index b7df6c7..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/09\344\270\211\346\245\274\350\276\223\351\200\201\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108\0501\051.dwl"
+++ /dev/null
@@ -1,3 +0,0 @@
-玛卡巴卡
-DESKTOP-9EVT5GR
-2025-03-20星期四 21:53:32
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/09\344\270\211\346\245\274\350\276\223\351\200\201\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108\0501\051.dwl2" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/09\344\270\211\346\245\274\350\276\223\351\200\201\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108\0501\051.dwl2"
deleted file mode 100644
index 56ffb60..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/09\344\270\211\346\245\274\350\276\223\351\200\201\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108\0501\051.dwl2"
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8">
-<whprops>
-<username>玛卡巴卡</username>
-<machinename>DESKTOP-9EVT5GR</machinename>
-<fullname></fullname>
-<datetime>2025-03-20星期四 21:53:32</datetime></whprops>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/\347\224\265\350\212\257\350\275\246\351\227\264\344\270\211\346\245\27409\347\274\226\345\217\267\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108.dwl" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/\347\224\265\350\212\257\350\275\246\351\227\264\344\270\211\346\245\27409\347\274\226\345\217\267\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108.dwl"
deleted file mode 100644
index 9998bf7..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/\347\224\265\350\212\257\350\275\246\351\227\264\344\270\211\346\245\27409\347\274\226\345\217\267\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108.dwl"
+++ /dev/null
@@ -1,3 +0,0 @@
-玛卡巴卡
-DESKTOP-9EVT5GR
-2025-03-20星期四 22:40:00
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/\347\224\265\350\212\257\350\275\246\351\227\264\344\270\211\346\245\27409\347\274\226\345\217\267\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108.dwl2" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/\347\224\265\350\212\257\350\275\246\351\227\264\344\270\211\346\245\27409\347\274\226\345\217\267\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108.dwl2"
deleted file mode 100644
index 11b35c5..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\345\220\216\346\256\265\347\272\277\344\275\223\347\202\271\344\275\215\345\233\276/\347\224\265\350\212\257\350\275\246\351\227\264\344\270\211\346\245\27409\347\274\226\345\217\267\345\205\211\347\224\265\344\275\215\347\275\256\345\233\2761108.dwl2"
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8">
-<whprops>
-<username>玛卡巴卡</username>
-<machinename>DESKTOP-9EVT5GR</machinename>
-<fullname></fullname>
-<datetime>2025-03-20星期四 22:40:00</datetime></whprops>
\ No newline at end of file
--
Gitblit v1.9.3