From 79949594d0ce05704353369e755dbc771a96739f Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 29 一月 2026 09:40:18 +0800
Subject: [PATCH] 1
---
项目资料/托盘编码/1楼托盘.zip | 0
项目资料/托盘编码/大料箱.zip | 0
项目资料/托盘编码/小料笼.zip | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs | 51 +++++++++++-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 9 ++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 11 +-
项目资料/托盘编码/小料箱.zip | 0
项目资料/托盘编码/转运车.zip | 0
项目资料/虚拟机账号密码/07b704884e00843828029c22fded7604.png | 0
项目资料/托盘编码/托盘编码规则.xlsx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISTaskInfo.cs | 6
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs | 101 ++++++++++++++++++++++++
/dev/null | 0
项目资料/与设备交互接口/所需接口及问题点.xlsx | 0
项目资料/托盘编码/大料笼.zip | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 27 +++++-
17 files changed, 187 insertions(+), 20 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISTaskInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISTaskInfo.cs"
index 850dcd9..4b3940b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISTaskInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGV/GALAXIS/GALAXISTaskInfo.cs"
@@ -13,7 +13,7 @@
{
public string groupId { get; set; }
public string msgTime { get; set; }
- public GALAXISTask tasks { get; set; }
+ public List<GALAXISTask> tasks { get; set; }
}
public class GALAXISTask
@@ -34,11 +34,11 @@
/// <summary>
/// 浠诲姟搴撳尯锛孯CS瀹氫箟
/// </summary>
- public string district { get; set; }
+ public string district { get; set; } = "cy";
/// <summary>
/// 瀹瑰櫒绫诲瀷锛屽緟瀹�
/// </summary>
- public int containerType { get; set; }
+ public int containerType { get; set; } = 1;
/// <summary>
/// 瀹瑰櫒缂栧彿
/// </summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 47d0556..6f2c688 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -32,6 +32,7 @@
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.LocationEnum;
namespace WIDESEAWCS_ITaskInfoService
{
@@ -199,5 +200,13 @@
/// <returns></returns>
int GetTaskNum(string sequenceName);
WebResponseContent UpdateTaskStatus(object TaskDTO, DeviceTypeEnum deviceTypeEnum);
+ /// <summary>
+ /// 淇敼璐т綅鐘舵��
+ /// </summary>
+ /// <param name="LocationCode"></param>
+ /// <param name="deviceTypeEnum"></param>
+ /// <param name="locationStatusEnum"></param>
+ /// <returns></returns>
+ WebResponseContent UpdateLocationStatus(string LocationCode, DeviceTypeEnum deviceTypeEnum, LocationStatusEnum locationStatusEnum);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index c87c48b..2ac621f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -30,7 +30,7 @@
"ApiName": "WIDESEAWCS",
"ExpMinutes": 120,
"QuartzJobAutoStart": true,
- "DBSeedEnable": true,
+ "DBSeedEnable": false,
"QuartzDBSeedEnable": false,
"LogDeubgEnable": true, //鏄惁璁板綍璋冭瘯鏃ュ織
"PrintSql": false, //鎵撳嵃SQL璇彞
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
index a9ff92c..dc11e96 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
@@ -15,8 +15,9 @@
{
public partial class TaskService
{
+ #region 鍑箰澹换鍔″垱寤�
/// <summary>
- /// 鍒涘缓鍏ュ簱浠诲姟
+ /// 鍒涘缓鍑箰澹獳GV鍏ュ簱浠诲姟
/// </summary>
/// <param name="taskDTO"></param>
/// <returns></returns>
@@ -54,7 +55,12 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
-
+ /// <summary>
+ /// 鍒涘缓鍑箰澹獳GV鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
public WebResponseContent CreateKLSNewOutTask(TaskDTO taskDTO, int taskType)
{
try
@@ -88,5 +94,96 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ #endregion
+
+ #region RGV浠诲姟鍒涘缓
+ /// <summary>
+ /// 鍒涘缓鍥涘悜杞﹀叆搴撲换鍔�
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
+ public WebResponseContent CreateRGVNewInTask(TaskDTO taskDTO, int taskType)
+ {
+ try
+ {
+ Db.Ado.BeginTran();
+
+ Db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鍒涘缓鍥涘悜杞﹀嚭搴撲换鍔�
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
+ public WebResponseContent CreateRGVNewOutTask(TaskDTO taskDTO, int taskType)
+ {
+ try
+ {
+ Db.Ado.BeginTran();
+
+ Db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ #endregion
+
+ #region 娴峰悍AGV浠诲姟鍒涘缓
+ /// <summary>
+ /// 鍒涘缓娴峰悍AGV鍏ュ簱浠诲姟
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
+ public WebResponseContent CreateHKNewInTask(TaskDTO taskDTO, int taskType)
+ {
+ try
+ {
+ Db.Ado.BeginTran();
+
+ Db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鍒涘缓娴峰悍AGV鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <param name="taskType"></param>
+ /// <returns></returns>
+ public WebResponseContent CreateHKNewOutTask(TaskDTO taskDTO, int taskType)
+ {
+ try
+ {
+ Db.Ado.BeginTran();
+
+ Db.Ado.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ #endregion
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index 0b14d18..64c6398 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -66,7 +66,7 @@
{
throw new Exception(ex.Message);
}
- }
+ }
#endregion
#region 浠诲姟鐘舵�佽浆鎹�
@@ -85,6 +85,7 @@
6 => TaskStatusEnum.TaskTypeError,
7 => TaskStatusEnum.ParameterError,
8 => TaskStatusEnum.RCSError,
+ 10 => TaskStatusEnum.Takeing,
13 => TaskStatusEnum.Cancel,
_ => throw new ArgumentOutOfRangeException(
nameof(status),
@@ -107,7 +108,7 @@
{
throw new Exception(ex.Message);
}
- }
+ }
#endregion
#region 浠诲姟璧风偣瀹屾垚
@@ -133,7 +134,7 @@
Db.Ado.RollbackTran();
throw new Exception(ex.Message);
}
- }
+ }
#endregion
#region 浠诲姟瀹屾垚
@@ -159,7 +160,7 @@
Db.Ado.RollbackTran();
throw new Exception(ex.Message);
}
- }
+ }
#endregion
#region 鏇存柊璐т綅鐘舵��
@@ -211,7 +212,7 @@
{
throw new Exception(ex.Message);
}
- }
+ }
#endregion
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index b7e92f2..e51c6cf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -86,10 +86,29 @@
{
continue;
}
- if (item.taskType == TaskTypeEnum.MLInbound.ObjToInt())
- CreateKLSNewInTask(task, item.taskType);
- else if (item.taskType == TaskTypeEnum.MLOutbound.ObjToInt())
- CreateKLSNewOutTask(task, item.taskType);
+ switch (item.taskType)
+ {
+ case (int)TaskTypeEnum.MLInbound:
+ CreateKLSNewInTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.MLOutbound:
+ CreateKLSNewOutTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.CPInbound:
+ CreateRGVNewInTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.CPOutbound:
+ CreateRGVNewOutTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.CJInbound:
+ CreateHKNewInTask(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.CJOutbound:
+ CreateHKNewOutTask(task, item.taskType);
+ break;
+ default:
+ break;
+ }
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
index 9ce6cb4..eb767fa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
@@ -1,10 +1,13 @@
-锘縰sing System;
+锘縰sing OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using System;
using System.Collections.Generic;
using System.Linq;
+using System.Net;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_Tasks
@@ -19,10 +22,13 @@
{
try
{
- var newTask = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.New.ObjToInt()).ToList();
- if (newTask.Count > 0)
+ var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.New).ToList();
+ if (newTasks.Count > 0)
{
-
+ #region 鏌ユ壘鍑箰澹换鍔�
+ var Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.MLInbound || x.TaskType == (int)TaskTypeEnum.MLOutbound).ToList();
+ if (Tasks.Count > 0) SendGALAXISTask(Tasks);
+ #endregion
}
}
catch (Exception ex)
@@ -52,7 +58,42 @@
#region 涓嬪彂鍑箰澹獳GV浠诲姟
public void SendGALAXISTask(List<Dt_Task> tasks)
{
-
+ GALAXISTaskInfo gALAXISTaskInfo = new GALAXISTaskInfo();
+ try
+ {
+ gALAXISTaskInfo.groupId = DateTime.Now.ToString("yyMMddHHmmss");
+ gALAXISTaskInfo.msgTime = DateTime.Now.ToString();
+ foreach (var task in tasks)
+ {
+ GALAXISTask gALAXISTask = new GALAXISTask()
+ {
+ taskId = task.WMSTaskNum,
+ taskType = task.TaskType == (int)TaskTypeEnum.MLInbound ? 0 : 1,
+ barCode = task.PalletCode,
+ endNode = task.TargetAddress,
+ startNode = task.SourceAddress,
+ priorityCode = task.Grade
+ };
+ gALAXISTaskInfo.tasks.Add(gALAXISTask);
+ }
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(GALAXISTaskInfo));
+ if (apiInfo == null) throw new Exception("鏈壘鍒板嚡涔愬＋AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, gALAXISTaskInfo.Serialize());
+ GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
+ if (agvContent.success)
+ {
+ if (agvContent.data.returnStatus != 0) throw new Exception(agvContent.data.returnInfo);
+ tasks.ForEach(task =>
+ {
+ task.TaskState = (int)TaskStatusEnum.Execut;
+ });
+ _taskService.UpdateData(tasks);
+ }
+ }
+ catch (Exception ex)
+ {
+ WriteError(nameof(TaskJob), ex.Message, ex);
+ }
}
#endregion
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/~$S\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V1.1.5.docx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/~$S\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V1.1.5.docx"
deleted file mode 100644
index 6e2ef34..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\344\270\212\346\270\270\347\263\273\347\273\237\346\216\245\345\217\243\346\270\205\345\215\225/~$S\346\216\245\345\217\243\345\257\271\346\216\245\346\226\207\346\241\243_V1.1.5.docx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\350\256\276\345\244\207\344\272\244\344\272\222\346\216\245\345\217\243/\346\211\200\351\234\200\346\216\245\345\217\243\345\217\212\351\227\256\351\242\230\347\202\271.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\350\256\276\345\244\207\344\272\244\344\272\222\346\216\245\345\217\243/\346\211\200\351\234\200\346\216\245\345\217\243\345\217\212\351\227\256\351\242\230\347\202\271.xlsx"
index 5d9d115..5187dca 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\350\256\276\345\244\207\344\272\244\344\272\222\346\216\245\345\217\243/\346\211\200\351\234\200\346\216\245\345\217\243\345\217\212\351\227\256\351\242\230\347\202\271.xlsx"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\350\256\276\345\244\207\344\272\244\344\272\222\346\216\245\345\217\243/\346\211\200\351\234\200\346\216\245\345\217\243\345\217\212\351\227\256\351\242\230\347\202\271.xlsx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/1\346\245\274\346\211\230\347\233\230.zip" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/1\346\245\274\346\211\230\347\233\230.zip"
new file mode 100644
index 0000000..c29f709
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/1\346\245\274\346\211\230\347\233\230.zip"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\244\247\346\226\231\347\254\274.zip" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\244\247\346\226\231\347\254\274.zip"
new file mode 100644
index 0000000..bce1449
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\244\247\346\226\231\347\254\274.zip"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\244\247\346\226\231\347\256\261.zip" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\244\247\346\226\231\347\256\261.zip"
new file mode 100644
index 0000000..a9eb7b5
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\244\247\346\226\231\347\256\261.zip"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\260\217\346\226\231\347\254\274.zip" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\260\217\346\226\231\347\254\274.zip"
new file mode 100644
index 0000000..bf976d8
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\260\217\346\226\231\347\254\274.zip"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\260\217\346\226\231\347\256\261.zip" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\260\217\346\226\231\347\256\261.zip"
new file mode 100644
index 0000000..bba4e9a
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\345\260\217\346\226\231\347\256\261.zip"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201\350\247\204\345\210\231.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\346\211\230\347\233\230\347\274\226\347\240\201\350\247\204\345\210\231.xlsx"
similarity index 100%
rename from "\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201\350\247\204\345\210\231.xlsx"
rename to "\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\346\211\230\347\233\230\347\274\226\347\240\201\350\247\204\345\210\231.xlsx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\350\275\254\350\277\220\350\275\246.zip" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\350\275\254\350\277\220\350\275\246.zip"
new file mode 100644
index 0000000..46bb2f4
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\211\230\347\233\230\347\274\226\347\240\201/\350\275\254\350\277\220\350\275\246.zip"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\350\231\232\346\213\237\346\234\272\350\264\246\345\217\267\345\257\206\347\240\201/07b704884e00843828029c22fded7604.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\350\231\232\346\213\237\346\234\272\350\264\246\345\217\267\345\257\206\347\240\201/07b704884e00843828029c22fded7604.png"
new file mode 100644
index 0000000..9e53c5d
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\350\231\232\346\213\237\346\234\272\350\264\246\345\217\267\345\257\206\347\240\201/07b704884e00843828029c22fded7604.png"
Binary files differ
--
Gitblit v1.9.3