icewint/wcs_server_kate_suzhou
5
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: icewint:1986f6dc06aa72597c7c1e4796199f462956044d
Branches Tags
icewint:master
icewint:whm
icewint:doubleIn
..
compare: icewint:14ff462b79574c50ec7a017790393842f6e5d4b8
Branches Tags
icewint:master
icewint:whm
icewint:doubleIn

No commits in common. "1986f6dc06aa72597c7c1e4796199f462956044d" and "14ff462b79574c50ec7a017790393842f6e5d4b8" have entirely different histories.
1986f6dc06 ... 14ff462b79

8 changed files with 20 additions and 138 deletions
Show Stats Expand all files Collapse all files

9
WcsMain/ApiServe/Controllers/WmsController/ConveyController.cs
View File

@ -28,13 +28,4 @@ public class ConveyController(ConveyService conveyService) : ControllerBase
[HttpPost("disposeVehicle")]
public WmsApiResponse DisposeVehicle([FromBody] DisposeVehicleRequest request) => conveyService.DisposeVehicle(request);
/// <summary>
/// 接收上位系统发过来的取消输送任务的指令
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("cancel")]
public WmsApiResponse CancelVehicle([FromBody] List<GetConveyTaskRequest> request) => conveyService.CancelConveyTask(request);
}

1
WcsMain/ApiServe/Controllers/WmsController/WmsTaskController.cs
View File

@ -39,4 +39,5 @@ public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase
/// <returns></returns>
[HttpPost("setStackerTaskNewDestination")]
public WmsApiResponse GetStackerTaskNewDestination([FromBody] GetStackerTaskNewDestinationRequest request) => wmsTaskService.GetStackerTaskNewDestination(request);
}

45
WcsMain/ApiServe/Service/WmsService/ConveyService.cs
View File

@ -70,49 +70,4 @@ public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTas
if(string.IsNullOrEmpty(writeResult)) return WmsApiResponseFactory.Success();
return WmsApiResponseFactory.Fail(writeResult);
}
/// <summary>
/// 取消wms的箱式线任务
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public WmsApiResponse CancelConveyTask(List<GetConveyTaskRequest> request)
{
try
{
foreach (var item in request)
{
if (string.IsNullOrEmpty(item.VehicleNo) || item.TaskType == default || item.Locations == default || item.Locations.Length < 1)
{
return WmsApiResponseFactory.RequestErr("存在必填项未填");
}
//遍历所有点位
foreach (var location in item.Locations)
{
//生成删除的对象
var taskToDelete = new AppConveyTask
{
VehicleNo = item.VehicleNo,
Location = location
};
int deleteResult = conveyTaskDao.VehicledDelete(taskToDelete);
if (deleteResult > 0)
{
return WmsApiResponseFactory.Success("删除成功");
}
else
{
return WmsApiResponseFactory.DataBaseErr("删除失败");
}
}
}
}
catch (Exception ex)
{
ConsoleLog.Error(ex.ToString());
return WmsApiResponseFactory.Fail(ex);
}
return WmsApiResponseFactory.Success("没有找到匹配的记录");
}
}

11
WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs
View File

@ -7,7 +7,6 @@ using WcsMain.Business.CommonAction;
using WcsMain.Common;
using WcsMain.DataBase.Dao;
using WcsMain.DataBase.TableEntity;
using WcsMain.Enum.Convey;
using WcsMain.Enum.Stacker;
using WcsMain.ExtendMethod;
using WcsMain.Plugins;
@ -29,7 +28,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
/// <returns></returns>
public WmsApiResponse<List<GetStackerRequest>> GetStackerTask(List<GetStackerRequest> request)
{
if (request.Count < 1 || request.Count > 26) return WmsApiResponseFactory.RequestErr<List<GetStackerRequest>>(null, "请求的任务数量只能在 1 至 26 范围内");
if (request.Count < 1 || request.Count > 20) return WmsApiResponseFactory.RequestErr<List<GetStackerRequest>>(null, "请求的任务数量只能在 1 至 20 范围内");
List<GetStackerRequest> errRequest = []; // 存放错误的请求
/* 插入库存信息 */ // ---- 库存由WMS管理，数据库表也无需操作
List<AppWmsTask> wmsTasks = [];
@ -174,5 +173,13 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa
//
//
// }
}
}

2
WcsMain/Business/CommonAction/SendWmsTaskStatus.cs
View File

@ -16,8 +16,6 @@ namespace WcsMain.Business.CommonAction;
public class SendWmsTaskStatus(AppWmsTaskDao wmsTaskDao, WmsWebApiPost wmsWebApiPost)
{
/// <summary>
/// 发送 WMS 任务异常
/// </summary>

50
WcsMain/Business/Convey/HistoryDataHandler/HisGetData/StackerOutC1.cs
View File

@ -129,50 +129,18 @@ public class StackerOutC1(ConveyOperation conveyOperation, DataBaseData dataBase
}
else // 两个地区都存在任务
{
// 比对两个区的箱子数量
var readResult_1 = CommonTool.Siemens.ReadInt16WithName($"数量1");
var readResult_2 = CommonTool.Siemens.ReadInt16WithName($"数量2");
ConsoleLog.Info($"前区箱子数量{readResult_1.Value}，后区箱子数量{readResult_2.Value}");
if (readResult_1.Value >= readResult_2.Value)//前区数量多去后区
ConsoleLog.Info($"出库分流：{area} 箱码：{msg} 存在 1~5 站台任务且存在 6~9 区域任务");
Random random = new();
var id = random.Next(0, 100);
ConveyPLCTask plcTask = new(plcId, id < Convert.ToInt32(CommonData.AppConfig.Pick2Lv) ? (short)ConveyRouterEnum.Move : (short)ConveyRouterEnum.Go);
string errText = conveyOperation.WriteTask(area, plcTask);
if (string.IsNullOrEmpty(errText))
{
ConsoleLog.Info($"出库分流：{area} 箱码：{msg} 存在 1~5 站台任务且存在 6~9 区域任务");
ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Move);
string errText = conveyOperation.WriteTask(area, plcTask);
if (string.IsNullOrEmpty(errText))
{
ConsoleLog.Success($"出库分流：{area} 箱码：{msg}，写入PLC成功，{plcTask}");
return;
}
ConsoleLog.Warning($"【警告】出库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}");
return ;
}
else//后区数量多去前区
{
ConsoleLog.Info($"出库分流：{area} 箱码：{msg} 存在 1~5 站台任务且存在 6~9 区域任务");
ConveyPLCTask plcTask = new(plcId, (short)ConveyRouterEnum.Go);
string errText = conveyOperation.WriteTask(area, plcTask);
if (string.IsNullOrEmpty(errText))
{
ConsoleLog.Success($"出库分流：{area} 箱码：{msg}，写入PLC成功，{plcTask}");
return;
}
ConsoleLog.Warning($"【警告】出库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}");
ConsoleLog.Success($"出库分流：{area} 箱码：{msg}，写入PLC成功，{plcTask}");
return;
}
//ConsoleLog.Info($"出库分流：{area} 箱码：{msg} 存在 1~5 站台任务且存在 6~9 区域任务");
//Random random = new();
//var id = random.Next(0, 100);
//ConveyPLCTask plcTask = new(plcId, id < Convert.ToInt32(CommonData.AppConfig.Pick2Lv) ? (short)ConveyRouterEnum.Move : (short)ConveyRouterEnum.Go);
//string errText = conveyOperation.WriteTask(area, plcTask);
//if (string.IsNullOrEmpty(errText))
//{
// ConsoleLog.Success($"出库分流：{area} 箱码：{msg}，写入PLC成功，{plcTask}");
// return;
//}
//ConsoleLog.Warning($"【警告】出库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}");
//return;
ConsoleLog.Warning($"【警告】出库分流：{area} 箱码：{msg}，写入PLC失败，{plcTask}，信息：{errText}");
return;
}
}

38
WcsMain/DataBase/Dao/AppConveyTaskDao.cs
View File

@ -93,44 +93,6 @@ public class AppConveyTaskDao
}
}
/// <summary>
/// 删除数据，以主键为条件
/// </summary>
/// <param name="appConveyTask"></param>
/// <returns></returns>
public int Delete(AppConveyTask appConveyTask)
{
try
{
var sqlFuc = CommonTool.DbServe.Deleteable(appConveyTask);
return sqlFuc.ExecuteCommand();
}
catch (Exception ex)
{
_ = ex;
return 0;
}
}
/// <summary>
/// 根据箱号和点位删除任务
/// </summary>
/// <param name="appConveyTask"></param>
/// <returns></returns>
public int VehicledDelete(AppConveyTask appConveyTask)
{
try
{
var deleteResult = CommonTool.DbServe.Deleteable<AppConveyTask>().Where(it => it.VehicleNo == appConveyTask.VehicleNo && it.Location == appConveyTask.Location).ExecuteCommand();
return deleteResult;
}
catch (Exception ex)
{
_ = ex;
return 0;
}
}
/// <summary>

2
WcsMain/EquipOperation/ElTag/AtopOperation.cs
View File

@ -62,7 +62,7 @@ public class AtopOperation
/// <param name="ledColor"></param>
/// <param name="ledStatus"></param>
/// <returns></returns>
public Exception? ShowMsg(string? controllerDisplayName, int? tagId, string? value, LedColor ledColor = LedColor.Green, LedStatus ledStatus = LedStatus.LEDOn)
public Exception? ShowMsg(string? controllerDisplayName, int? tagId, string? value, LedColor ledColor = LedColor.Green, LedStatus ledStatus = LedStatus._0_5secblinking)
{
if (controllerDisplayName == default || tagId == default || value == default)
{