From 786c5ca17012ff3a01faf466b751bdbe70629b97 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期一, 25 八月 2025 15:25:46 +0800
Subject: [PATCH] 1
---
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs | 132 ++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 47 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
index a9f031a..565b952 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskCZService.cs"
@@ -38,6 +38,8 @@
using OfficeOpenXml.FormulaParsing.Excel.Functions.Numeric;
using WIDESEAWCS_Core.Tool;
using System.Net;
+using System.Web;
+using WIDESEAWCS_TaskInfoRepository;
namespace WIDESEAWCS_TaskInfoService
{
public class TaskCZService : ServiceBase<DtCZTask, ITaskCZRepository>, ITaskCZService
@@ -69,6 +71,11 @@
{
response.Error("浠诲姟宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛�");
}
+ var station = _stationinfoRepository.QueryFirst(x => x.StationCode == dto.InputValue);
+ if (station == null)
+ {
+ response.Error("鍙枡鏈哄彴涓嶅瓨鍦�");
+ }
var taskModel = new DtCZTask()
{
TaskTaskID = dto.DTaskId,
@@ -99,6 +106,31 @@
return Task.FromResult(response);
}
+
+ public Task<WebResponseContent> DeleteTaskCZAsync(CZTaskDto dto)
+ {
+ var response = new WebResponseContent();
+ try
+ {
+ var task = BaseDal.QueryFirst(x => (x.TaskTaskID == dto.DTaskId) || (x.TaskEndAddress == dto.InputValue) || (x.TaskType == dto.TaskType));
+ if (task == null)
+ {
+ response.Error("鍒犻櫎浠诲姟涓嶅瓨鍦�");
+ return Task.FromResult(response);
+ }
+ var isTrue = BaseDal.DeleteData(task);
+ if (isTrue)
+ response.OK("浠诲姟鍒犻櫎鎴愬姛锛佽閲嶆柊涓嬪彂");
+ else
+ response.Error("浠诲姟鍒犻櫎澶辫触锛佽鎿嶄綔绯荤粺鍒犻櫎");
+ }
+ catch (System.Exception ex)
+ {
+ response.Error(ex.Message);
+ }
+ return Task.FromResult(response);
+ }
+
/// <summary>
/// 瀹屾垚浠诲姟
/// </summary>
@@ -119,24 +151,7 @@
response.Error("浠诲姟涓嶅瓨鍦紒");
return Task.FromResult(response);
}
- //if (dto.Tags.Contains("姝ｆ瀬"))
- //{
- // czTask.TaskZJFinishNumber += 1;
- //}
- //else
- //{
- // czTask.TaskFJFinishNumber += 1;
- //}
- //if (czTask.TaskZJFinishNumber == czTask.TaskNumber || czTask.TaskFJFinishNumber == czTask.TaskNumber)
- //{
- // czTask.TaskStatus = TaskInStatusEnum.InFinish.ToString();
- // czTask.TaskEndDate = DateTime.Now;
- //}
- //else
- //{
czTask.TaskStatus = TaskInStatusEnum.Line_InExecuting.ToString();
- //}
-
var details = new DtCZTaskDetails()
{
MaterialBarCode = dto.MaterialBarcode,
@@ -149,27 +164,6 @@
TaskTaskID = czTask.TaskTaskID,
};
_detailsRepository.AddData(details);
-
- //if (dto.FinishNum is < 1 or > 4)
- // throw new ArgumentException("鍙傛暟閿欒锛丗inishNum 蹇呴』涓� 1-4");
-
- //var detail = dto.FinishNum == 1
- // ? new CZTaskBarCodeDto()
- // : JsonSerializer.Deserialize<CZTaskBarCodeDto>(czTask.DtCZTaskDetails) ?? new CZTaskBarCodeDto();
-
- //var property = dto.FinishNum switch
- //{
- // 1 => nameof(CZTaskBarCodeDto.BarCode1),
- // 2 => nameof(CZTaskBarCodeDto.BarCode2),
- // 3 => nameof(CZTaskBarCodeDto.BarCode3),
- // 4 => nameof(CZTaskBarCodeDto.BarCode4),
- // _ => throw new ArgumentOutOfRangeException("鍙傛暟閿欒锛佽妫�鏌ャ�怓inishNum銆戯紒")
- //};
-
- //typeof(CZTaskBarCodeDto).GetProperty(property)?.SetValue(detail, dto.MaterialBarcode);
-
- //czTask.DtCZTaskDetails = JsonSerializer.Serialize(detail);
-
var isTrue = BaseDal.UpdateData(czTask);
if (isTrue)
{
@@ -193,11 +187,8 @@
if (task.SourceAddress.Contains("SL-0"))
{
var address = task.SourceAddress.Split("||");
- WriteLog.Info("1").Write($"{address}", "1");
Dt_Stationinfo Stationinfo = _stationinfoRepository.QueryFirst(x => x.StationCode == address[0]);
- WriteLog.Info("1").Write($"{Stationinfo.StationCode}", "1");
Dt_Stationinfo Stationinfo1 = _stationinfoRepository.QueryFirst(x => x.StationCode == address[1]);
- WriteLog.Info("1").Write($"{Stationinfo.StationCode}", "1");
Stationinfo.Location_state = LocationStatusEnum.Free.ObjToInt();
_stationinfoRepository.UpdateData(Stationinfo);
Stationinfo1.Location_state = LocationStatusEnum.Free.ObjToInt();
@@ -207,9 +198,7 @@
{
var address = task.TargetAddress.Split("||");
Dt_Stationinfo Stationinfo = _stationinfoRepository.QueryFirst(x => x.StationCode == address[0]);
- WriteLog.Info("2").Write($"{Stationinfo.StationCode}", "2");
Dt_Stationinfo Stationinfo1 = _stationinfoRepository.QueryFirst(x => x.StationCode == address[1]);
- WriteLog.Info("2").Write($"{Stationinfo.StationCode}", "2");
Stationinfo.Location_state = LocationStatusEnum.InStock.ObjToInt();
_stationinfoRepository.UpdateData(Stationinfo);
Stationinfo1.Location_state = LocationStatusEnum.InStock.ObjToInt();
@@ -242,7 +231,7 @@
//閫氳繃绔欑偣琛ㄥ垽鏂紦瀛樻灦鏄偅涓尯鍩熷幓閭ｆ潯杈撻�佺嚎鍥炴祦鍙ｃ�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘��
string Saddress = saveModel.MainData["sourceAddress"].ToString();
string Saddress1 = saveModel.MainData["sourceAddress1"].ToString();
- string Taddress = saveModel.MainData["targetAddress"].ToString();
+ //string Taddress = saveModel.MainData["targetAddress"].ToString();
if (Saddress == Saddress1)
{
webResponseContent.Error("鍚屼竴缂撳瓨鏋朵笉鑳芥壂鎻忎袱娆★紒");
@@ -315,13 +304,20 @@
dt_Tasks.TaskType = 16;
dt_Tasks.Grade = 1;
dt_Tasks.PalletCode = "";
- dt_Tasks.TargetAddress = Taddress;
- dt_Tasks.NextAddress = Taddress;
+ if (dt_Task.CurrentAddress.Contains("ZJ"))
+ {
+ dt_Tasks.TargetAddress = "ZJSL-WLX002";
+ }
+ else
+ {
+ dt_Tasks.TargetAddress = "FJSL-WLS002";
+ }
+ dt_Tasks.NextAddress = dt_Tasks.TargetAddress;
dt_Tasks.Barcode = "";
dt_Tasks.Roadway = "AGV";
dt_Tasks.WMSId = 0;
dt_Tasks.Remark = "绌烘墭鍥炴祦";
- dt_Task.Floor = 3;
+ dt_Tasks.Floor = 3;
}
var isTrue1 = _taskRepository.AddData(dt_Tasks);
@@ -509,5 +505,47 @@
}
return Task.FromResult(webResponseContent);
}
+
+ /// <summary>
+ /// 鏆傚瓨鍖洪�佹枡
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ public Task<WebResponseContent> TemporarilyTasks(SaveModel saveModel)
+ {
+ WebResponseContent webResponseContent = new WebResponseContent();
+ try
+ {
+ string sourceAddress = saveModel.MainData["sourceAddress"].ToString();
+ string targetAddress = saveModel.MainData["targetAddress"].ToString();
+ Dt_Task dt_Tasks = new Dt_Task();
+ {
+ dt_Tasks.TaskNum = _taskService.GetTaskNum();
+ dt_Tasks.CreateDate = DateTime.Now;
+ dt_Tasks.Creater = "system";
+ dt_Tasks.CurrentAddress = sourceAddress;
+ dt_Tasks.SourceAddress = sourceAddress;
+ dt_Tasks.TaskState = (int)TaskInStatusEnum.InNew;
+ dt_Tasks.TaskType = 4;
+ dt_Tasks.Grade = 1;
+ dt_Tasks.PalletCode = "";
+ dt_Tasks.TargetAddress = targetAddress;
+ dt_Tasks.NextAddress = targetAddress;
+ dt_Tasks.Barcode = "";
+ dt_Tasks.Roadway = "AGV";
+ dt_Tasks.WMSId = 0;
+ dt_Tasks.Remark = "鏆傚瓨鍖洪�佹枡";
+ dt_Tasks.Floor = 3;
+ }
+
+ var isTrue1 = _taskRepository.AddData(dt_Tasks);
+ webResponseContent.OK("浠诲姟涓嬪彂鎴愬姛锛�");
+ }
+ catch (Exception ex)
+ {
+ webResponseContent.Error(ex.Message);
+ }
+ return Task.FromResult(webResponseContent);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3