From d82252f08a32f5786ffe231b7fd301b6a60781d6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 07 三月 2026 17:56:58 +0800
Subject: [PATCH] 解决代码冲突更新WCS日志记录
---
项目资料/通信协议/纸杯上料桁架通讯协议.xlsx | 0
项目代码/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackInfoService.cs | 6 -
项目代码/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs | 8 --
项目代码/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs | 15 ---
项目代码/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.cs | 3
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj | 3
项目代码/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json | 13 ---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/ConveyorLineJob_CPC.cs | 14 ++
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs | 4 -
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/ConveyorLineJob_CPB.cs | 7 +
项目代码/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs | 3
项目代码/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs | 9 --
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoRepository/StationPackDetailRepository.cs | 5 -
/dev/null | 0
项目代码/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs | 3
项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs | 8 --
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs | 108 +++++++++++---------------
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs | 7 -
项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackDetailService.cs | 5 -
19 files changed, 63 insertions(+), 158 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.cs"
index 6359de3..33d281f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.cs"
@@ -10,9 +10,6 @@
{
public interface IStationPackDetailRepository : IRepository<Dt_StationPackDetail>
{
-<<<<<<< HEAD
-=======
->>>>>>> main
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs"
index e125a2a..6190341 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs"
@@ -10,9 +10,6 @@
{
public interface IStationPackDetailService : IService<Dt_StationPackDetail>
{
-<<<<<<< HEAD
-=======
->>>>>>> main
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackInfoService.cs"
index 0fdf0fa..6bdabb8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackInfoService.cs"
@@ -3,10 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-<<<<<<< HEAD
-=======
using WIDESEAWCS_Core;
->>>>>>> main
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Model.Models;
@@ -14,14 +11,11 @@
{
public interface IStationPackInfoService : IService<Dt_StationPackInfo>
{
-<<<<<<< HEAD
-=======
/// <summary>
/// 鎵嬪姩娓呯┖鐮佸灈鎵ц宸ヤ綅鏁版嵁
/// </summary>
/// <param name="taskNum"></param>
/// <returns></returns>
WebResponseContent ManualClearPalletStationData(string StationCode);
->>>>>>> main
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs"
index 39f47d6..70b399f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs"
@@ -7,10 +7,7 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
-<<<<<<< HEAD
-=======
using WIDESEAWCS_DTO.TaskInfo;
->>>>>>> main
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_ITaskInfoService
@@ -33,17 +30,11 @@
WebResponseContent TaskCompleted(int taskNum=0,Dt_PackaxisTask? packaxisTask=null);
//鐮佸灈缁撴墭骞朵笂浼犵爜鍨涘伐浣嶇爜鍨涙槑缁嗘暟鎹�
WebResponseContent BoxingInBound(string stationCode);
-<<<<<<< HEAD
-=======
-
///// <summary>
///// 鍒犻櫎鐮佸灈浠诲姟
///// </summary>
///// <param name="packaxisTasks"></param>
///// <returns></returns>
WebResponseContent PickaixsTaskDele(int PackTaskNum);
-
-
->>>>>>> main
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs"
index 45580ae..881ee76 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs"
@@ -15,12 +15,7 @@
/// 涓婚敭
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
-<<<<<<< HEAD
- public int id { get; set; }
-=======
public int Id { get; set; }
->>>>>>> main
-
/// <summary>
/// 鐮佸灈鍨涘瀷闀垮害
/// </summary>
@@ -38,13 +33,10 @@
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "鐮佸灈鍨涘瀷楂樺害")]
public int PackHeight { get; set; }
-<<<<<<< HEAD
-=======
/// <summary>
/// 澶囨敞
/// </summary>
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
->>>>>>> main
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs"
index aa15472..c53e5ac 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs"
@@ -15,11 +15,7 @@
/// 涓婚敭
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
-<<<<<<< HEAD
- public int id { get; set; }
-=======
public int Id { get; set; }
->>>>>>> main
/// <summary>
/// 璁惧缂栧彿
@@ -43,11 +39,7 @@
/// 鐮佸灈鏁伴噺
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "鐮佸灈鏁伴噺")]
-<<<<<<< HEAD
- public int PackNum { get; set; }
-=======
public int PackNum { get; set; } = 0;
->>>>>>> main
/// <summary>
/// X鍧愭爣
@@ -103,14 +95,7 @@
[SugarColumn(IsNullable = true, ColumnDescription = "Z鍧愭爣闂磋窛")]
public int AxisZSpacing { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
-<<<<<<< HEAD
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "澶囨敞")]
-=======
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "澶囨敞")]
->>>>>>> main
public string Remark { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoRepository/StationPackDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoRepository/StationPackDetailRepository.cs"
index 136b7d8..e28d7da 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoRepository/StationPackDetailRepository.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoRepository/StationPackDetailRepository.cs"
@@ -14,10 +14,5 @@
public StationPackDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
{
}
-<<<<<<< HEAD
-=======
-
-
->>>>>>> main
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs"
index 74cea7d..87ed560 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs"
@@ -15,27 +15,20 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_IPackInfoService;
-<<<<<<< HEAD
-=======
using WIDESEAWCS_IBasicInfoRepository;
-
->>>>>>> main
-
namespace WIDESEAWCS_PackInfoService
{
public class PackaxisService : ServiceBase<Dt_Packaxis, IPackaxisRepository>, IPackaxisService
{
-<<<<<<< HEAD
public PackaxisService(IPackaxisRepository BaseDal) : base(BaseDal)
{
-=======
+ }
private readonly IPackTypeRepository _packTypeRepository;
private readonly IStationMangerRepository _stationMangerRepository;
public PackaxisService(IPackaxisRepository BaseDal, IPackTypeRepository packTypeRepository, IStationMangerRepository stationMangerRepository) : base(BaseDal)
{
_packTypeRepository = packTypeRepository;
_stationMangerRepository = stationMangerRepository;
->>>>>>> main
}
public override WebResponseContent Import(List<IFormFile> files)
{
@@ -70,11 +63,6 @@
using (ImportExcelHelper excelHelper = new ImportExcelHelper(fullPath))
{
dtExcel = excelHelper.ExcelToDataTable();
-<<<<<<< HEAD
-
-=======
-
->>>>>>> main
}
List<Dt_Packaxis> addAxis = new List<Dt_Packaxis>();
List<Dt_Packaxis> updateAxis = new List<Dt_Packaxis>();
@@ -100,51 +88,48 @@
string AxisZCount = row["AxisZCount"]?.ToString() ?? string.Empty;
string AxisZSpacing = row["AxisZSpacing"]?.ToString() ?? string.Empty;
var axis = BaseDal.QueryFirst(x => x.DeviceCode == DeviceCode && x.StationCode == StationCode && x.PackType == PackType);
-<<<<<<< HEAD
- if(axis == null)
-=======
if (axis == null)
->>>>>>> main
- {
- Dt_Packaxis packaxis = new Dt_Packaxis()
+ if (axis == null)
{
- DeviceCode = DeviceCode,
- StationCode = StationCode,
- PackType = PackType,
- PackNum = Convert.ToInt32(PackNum),
- AxisX = Convert.ToInt32(AxisX),
- AxisXCount = Convert.ToInt32(AxisXCount),
- AxisXSpacing = Convert.ToInt32(AxisXSpacing),
- AxisY = Convert.ToInt32(AxisY),
- AxisYCount = Convert.ToInt32(AxisYCount),
- AxisYSpacing = Convert.ToInt32(AxisYSpacing),
- AxisZ = Convert.ToInt32(AxisZ),
- AxisZCount = Convert.ToInt32(AxisZCount),
- AxisZSpacing = Convert.ToInt32(AxisZSpacing),
- Creater = App.User.UserId > 0 ? App.User.UserName : "System",
- CreateDate = DateTime.Now
- };
- addAxis.Add(packaxis);
- }
- else
- {
- axis.DeviceCode = DeviceCode;
- axis.StationCode = StationCode;
- axis.PackType = PackType;
- axis.PackNum = Convert.ToInt32(PackNum);
- axis.AxisX = Convert.ToInt32(AxisX);
- axis.AxisXCount = Convert.ToInt32(AxisXCount);
- axis.AxisXSpacing = Convert.ToInt32(AxisXSpacing);
- axis.AxisY = Convert.ToInt32(AxisY);
- axis.AxisYCount = Convert.ToInt32(AxisYCount);
- axis.AxisYSpacing = Convert.ToInt32(AxisYSpacing);
- axis.AxisZ = Convert.ToInt32(AxisZ);
- axis.AxisZCount = Convert.ToInt32(AxisZCount);
- axis.AxisZSpacing = Convert.ToInt32(AxisZSpacing);
- axis.Modifier = App.User.UserId > 0 ? App.User.UserName : "System";
- axis.ModifyDate = DateTime.Now;
- updateAxis.Add(axis);
- }
+ Dt_Packaxis packaxis = new Dt_Packaxis()
+ {
+ DeviceCode = DeviceCode,
+ StationCode = StationCode,
+ PackType = PackType,
+ PackNum = Convert.ToInt32(PackNum),
+ AxisX = Convert.ToInt32(AxisX),
+ AxisXCount = Convert.ToInt32(AxisXCount),
+ AxisXSpacing = Convert.ToInt32(AxisXSpacing),
+ AxisY = Convert.ToInt32(AxisY),
+ AxisYCount = Convert.ToInt32(AxisYCount),
+ AxisYSpacing = Convert.ToInt32(AxisYSpacing),
+ AxisZ = Convert.ToInt32(AxisZ),
+ AxisZCount = Convert.ToInt32(AxisZCount),
+ AxisZSpacing = Convert.ToInt32(AxisZSpacing),
+ Creater = App.User.UserId > 0 ? App.User.UserName : "System",
+ CreateDate = DateTime.Now
+ };
+ addAxis.Add(packaxis);
+ }
+ else
+ {
+ axis.DeviceCode = DeviceCode;
+ axis.StationCode = StationCode;
+ axis.PackType = PackType;
+ axis.PackNum = Convert.ToInt32(PackNum);
+ axis.AxisX = Convert.ToInt32(AxisX);
+ axis.AxisXCount = Convert.ToInt32(AxisXCount);
+ axis.AxisXSpacing = Convert.ToInt32(AxisXSpacing);
+ axis.AxisY = Convert.ToInt32(AxisY);
+ axis.AxisYCount = Convert.ToInt32(AxisYCount);
+ axis.AxisYSpacing = Convert.ToInt32(AxisYSpacing);
+ axis.AxisZ = Convert.ToInt32(AxisZ);
+ axis.AxisZCount = Convert.ToInt32(AxisZCount);
+ axis.AxisZSpacing = Convert.ToInt32(AxisZSpacing);
+ axis.Modifier = App.User.UserId > 0 ? App.User.UserName : "System";
+ axis.ModifyDate = DateTime.Now;
+ updateAxis.Add(axis);
+ }
}
BaseDal.AddData(addAxis);
BaseDal.UpdateData(updateAxis);
@@ -158,8 +143,6 @@
return content;
}
-<<<<<<< HEAD
-=======
/// <summary>
/// 娣诲姞鍧愭爣鏁版嵁
/// </summary>
@@ -172,7 +155,7 @@
{
string json = JsonConvert.SerializeObject(saveModel.MainData);
Dt_Packaxis dt_Pack = JsonConvert.DeserializeObject<Dt_Packaxis>(json);
- Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == dt_Pack.StationCode && x.StackerCraneCode == dt_Pack.DeviceCode);
+ Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == dt_Pack.StationCode && x.StackerCraneCode == dt_Pack.DeviceCode);
Dt_PackType packTyp = _packTypeRepository.QueryFirst(x => x.Id == dt_Pack.PackType);
int w = 1200;//杩欎釜鏄爜鍨涙墭鐩樺1.2绫�
@@ -194,11 +177,11 @@
Dt_Packaxis packaxis = BaseDal.QueryFirst(x => x.DeviceCode == dt_Pack.DeviceCode && x.StationCode == dt_Pack.StationCode && x.PackType == dt_Pack.PackType);
-
+
if (packaxis.IsNullOrEmpty())
{
-
+
saveModel.MainData["PackNum"] = dt_Pack.AxisXCount * dt_Pack.AxisYCount * dt_Pack.AxisZCount;
return base.AddData(saveModel);
@@ -248,7 +231,7 @@
Dt_Packaxis packaxis = BaseDal.QueryFirst(x => x.Id != dt_Pack.Id && x.DeviceCode == dt_Pack.DeviceCode && x.StationCode == dt_Pack.StationCode && x.PackType == dt_Pack.PackType);
if (packaxis.IsNullOrEmpty())
{
-
+
saveModel.MainData["PackNum"] = dt_Pack.AxisXCount * dt_Pack.AxisYCount * dt_Pack.AxisZCount;
return base.UpdateData(saveModel);
@@ -264,6 +247,5 @@
return content;
}
->>>>>>> main
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs"
index 48b15d7..a6006d4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs"
@@ -45,11 +45,7 @@
Dt_PackType? packType = packTypes.FirstOrDefault(x=>x.PackWidth==item.Width && x.PackLength==item.Length && x.PackHeight==item.Height);
if (packType == null) throw new Exception($"鏈壘鍒版潯鐮亄item.BarCode},{item.Length}*{item.Width}*{item.Height}鐮佸灈閰嶇疆");
Dt_Packinfo packinfo = _mapper.Map<Dt_Packinfo>(item);
-<<<<<<< HEAD
- packinfo.PackType = packType.id;
-=======
packinfo.PackType = packType.Id;
->>>>>>> main
packinfos.Add(packinfo);
}
BaseDal.AddData(packinfos);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackDetailService.cs"
index 9c4e173..40fe065 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackDetailService.cs"
@@ -22,12 +22,7 @@
{
public StationPackDetailService(IStationPackDetailRepository BaseDal) : base(BaseDal)
{
-<<<<<<< HEAD
- }
-=======
}
-
->>>>>>> main
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs"
index 23dd1b4..639a8f0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs"
@@ -7,7 +7,6 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-<<<<<<< HEAD
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
@@ -16,7 +15,6 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_IPackInfoService;
-=======
using WIDESEAWCS_Common.Utilities;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
@@ -27,16 +25,14 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_PackInfoRepository;
->>>>>>> main
namespace WIDESEAWCS_PackInfoService
{
public class StationPackInfoService : ServiceBase<Dt_StationPackInfo, IStationPackInfoRepository>, IStationPackInfoService
{
-<<<<<<< HEAD
public StationPackInfoService(IStationPackInfoRepository BaseDal) : base(BaseDal)
{
-=======
+ }
private readonly IStationPackDetailRepository _stationPackDetailRepository;
private readonly IPackinfoRepository _packInfoRepository;
private readonly IPackaxisTaskRepository _packaxisTaskRepository;
@@ -89,7 +85,6 @@
WebResponseContent.Instance.Error(e.Message);
}
return content;
->>>>>>> main
}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj"
index d099901..9ae1d8a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj"
@@ -7,13 +7,10 @@
</PropertyGroup>
<ItemGroup>
-<<<<<<< HEAD
<ProjectReference Include="..\WIDESEAWCS_IPackInfoService\WIDESEAWCS_IPackInfoService.csproj" />
-=======
<ProjectReference Include="..\WIDESEAWCS_IBasicInfoRepository\WIDESEAWCS_IBasicInfoRepository.csproj" />
<ProjectReference Include="..\WIDESEAWCS_IPackInfoService\WIDESEAWCS_IPackInfoService.csproj" />
<ProjectReference Include="..\WIDESEAWCS_ITaskInfoRepository\WIDESEAWCS_ITaskInfoRepository.csproj" />
->>>>>>> main
</ItemGroup>
</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs"
index 40d3c7a..8dfe4f1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs"
@@ -24,8 +24,6 @@
{
return Service.TaskCompleted(taskNum);
}
-<<<<<<< HEAD
-=======
[HttpPost, Route("PickaixsTaskDele")]
public WebResponseContent PickaixsTaskDele(int PackTaskNum)
@@ -33,6 +31,5 @@
return Service.PickaixsTaskDele(PackTaskNum);
}
->>>>>>> main
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json"
index 01c0c3d..d2226e3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json"
@@ -12,21 +12,8 @@
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
"DBType": "SqlServer",
//杩炴帴瀛楃涓�
- //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
-<<<<<<< HEAD
"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=192.168.35.3;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=Sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=TESTWCSCP_WCS;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
"WMSConnectionStrings": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
-=======
- "ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=192.168.35.3;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=Sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=TESTWCSCP_WCS;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "WMSConnectionStrings": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
->>>>>>> main
- //"WMSConnectionStrings": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"WMSConnectionStrings": "Data Source=10.30.4.92;Initial Catalog=WIDESEAWMS_HUAIAN;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs"
index 12bd851..aaf20c8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs"
@@ -15,10 +15,7 @@
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
-<<<<<<< HEAD
-=======
using WIDESEAWCS_DTO.TaskInfo;
->>>>>>> main
using WIDESEAWCS_IBasicInfoRepository;
using WIDESEAWCS_IPackInfoRepository;
using WIDESEAWCS_ITaskInfoRepository;
@@ -255,8 +252,6 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
-<<<<<<< HEAD
-=======
/// <summary>
/// 鍒犻櫎鐮佸灈浠诲姟淇℃伅
/// </summary>
@@ -289,9 +284,6 @@
}
return content;
}
-
-
->>>>>>> main
}
public class MDCount
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPB.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPB.cs"
index 026554b..6b2e7bb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPB.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPB.cs"
@@ -132,6 +132,10 @@
else if (item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && deviceProRead != null)
{//鍏ュ簱RGV鎺ラ┏浣嶄氦浜�
R_ConveyorLineCPInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_ConveyorLineCPInfo>(deviceProRead.DeviceProAddress);
+ if (conveyorLineInfoRead != null)
+ {
+ WriteInfo(item.StationName, $"鐘舵�亄conveyorLineInfoRead}");
+ }
if (conveyorLineInfoRead != null && conveyorLineInfoRead.Command == 4 && conveyorLineInfoRead.TaskNo > 0)
{
Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.TaskNo && x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt() && x.DeviceCode == device.DeviceCode);
@@ -221,7 +225,8 @@
}
}
else if (item.StationType == StationTypeEnum.StationType_StackingPlates.ObjToInt() && item.IsOccupied==StationOccupiedEnum.None.ObjToInt() && deviceProRead != null && deviceProWrite != null)
- {//鍙犵洏鏈哄伐浣嶅彨鏂�
+ {
+ //鍙犵洏鏈哄伐浣嶅彨鏂�
R_ConveyorLineCPInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_ConveyorLineCPInfo>(deviceProRead.DeviceProAddress);
if (conveyorLineInfoRead != null && conveyorLineInfoRead.Command == 7 && conveyorLineInfoRead.TaskNo <= 0)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPC.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPC.cs"
index 2c5a958..3b09885 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPC.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPC.cs"
@@ -65,6 +65,7 @@
try
{
bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
+ bool isUpdate = false;
if (flag && value != null)
{
OtherDevice device = (OtherDevice)value;
@@ -96,18 +97,25 @@
Thread.Sleep(1000);
}
}
- if (conveyorLineInfoRead != null && conveyorLineInfoRead.StatusPV == 2 && conveyorLineInfoRead.Command == 10)
+ if (conveyorLineInfoRead != null && conveyorLineInfoRead.StatusPV == 2 && conveyorLineInfoRead.Command == 10 && item.IsOccupied == 1)
{
item.IsOccupied = 0;
+ isUpdate = true;
+ WriteInfo("鐮佸灈宸ヤ綅鐘舵�佹洿鏂�",$"{item.StationCode}{DateTime.Now}鏇存柊宸ヤ綅鐘舵��:{conveyorLineInfoRead.Command}");
}
- else
+ else if (item.IsOccupied == 0)
{
item.IsOccupied = 1;
+ isUpdate = true;
+ WriteInfo("鐮佸灈宸ヤ綅鐘舵�佹洿鏂�", $"{item.StationCode}{DateTime.Now}鏇存柊宸ヤ綅鐘舵�佷笉鍙敤");
}
}
}
- _stationMangerRepository.UpdateData(stationMangers);
+ if (isUpdate)
+ {
+ _stationMangerRepository.UpdateData(stationMangers);
+ }
}
}
catch (Exception ex)
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\346\235\257&\347\272\270\347\256\261\344\270\212\346\226\231\346\241\201\346\236\266\351\200\232\350\256\257\345\215\217\350\256\256.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\346\235\257\344\270\212\346\226\231\346\241\201\346\236\266\351\200\232\350\256\257\345\215\217\350\256\256.xlsx"
similarity index 100%
rename from "\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\346\235\257&\347\272\270\347\256\261\344\270\212\346\226\231\346\241\201\346\236\266\351\200\232\350\256\257\345\215\217\350\256\256.xlsx"
rename to "\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\346\235\257\344\270\212\346\226\231\346\241\201\346\236\266\351\200\232\350\256\257\345\215\217\350\256\256.xlsx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\346\235\257\347\272\270\347\256\261\344\270\212\346\226\231\346\241\201\346\236\266\351\200\232\350\256\257\345\215\217\350\256\256-251118.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\346\235\257\347\272\270\347\256\261\344\270\212\346\226\231\346\241\201\346\236\266\351\200\232\350\256\257\345\215\217\350\256\256-251118.xlsx"
deleted file mode 100644
index 0df087e..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\346\235\257\347\272\270\347\256\261\344\270\212\346\226\231\346\241\201\346\236\266\351\200\232\350\256\257\345\215\217\350\256\256-251118.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\211\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_1763189335703.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\211\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_1763189335703.png"
deleted file mode 100644
index 92c7acc..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\211\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_1763189335703.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\211\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631893492052.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\211\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631893492052.png"
deleted file mode 100644
index 851a511..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\211\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631893492052.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\244\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631892881691.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\244\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631892881691.png"
deleted file mode 100644
index aa7355c..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\244\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631892881691.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\244\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631893013030.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\244\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631893013030.png"
deleted file mode 100644
index 7dd9d97..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\344\270\244\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631893013030.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\345\233\233\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631895456628.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\345\233\233\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631895456628.png"
deleted file mode 100644
index be057d4..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\345\233\233\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631895456628.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\345\233\233\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631895685290.png" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\345\233\233\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631895685290.png"
deleted file mode 100644
index 2c56713..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\345\233\233\345\217\260\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256/\344\274\201\344\270\232\345\276\256\344\277\241\346\210\252\345\233\276_17631895685290.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256.zip" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256.zip"
deleted file mode 100644
index a040f9b..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\347\272\270\347\211\207\346\226\231\346\236\266DB\345\235\227\346\225\260\346\215\256.zip"
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3