From 75c4ed0d3c640e66bc95dc170de52b753629e3ed Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:09:14 +0800
Subject: [PATCH] 最新
---
项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 deletions(-)
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 17065cd..397d188 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"
@@ -14,6 +14,10 @@
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;
@@ -39,6 +43,12 @@
_stationMangerRepository = stationMangerRepository;
_unitOfWorkManage = unitOfWorkManage;
}
+ /// <summary>
+ /// 鍒嗛厤鐮佸灈浠诲姟
+ /// </summary>
+ /// <param name="barCode"></param>
+ /// <param name="deviceCode"></param>
+ /// <returns></returns>
public WebResponseContent ReqPackTask(string barCode,string deviceCode)
{
WebResponseContent content= new WebResponseContent();
@@ -139,6 +149,11 @@
}
return content;
}
+ /// <summary>
+ /// 鐮佸灈缁撴墭骞朵笂浼犵爜鍨涘伐浣嶇爜鍨涙槑缁嗘暟鎹�
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <returns></returns>
public WebResponseContent BoxingInBound(string stationCode)
{
WebResponseContent content = new WebResponseContent();
@@ -186,11 +201,17 @@
}
return content;
}
+ /// <summary>
+ /// 鐮佸灈浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="packaxisTask"></param>
+ /// <returns></returns>
public WebResponseContent TaskCompleted(int taskNum=0,Dt_PackaxisTask? packaxisTask=null)
{
try
{
- _unitOfWorkManage.BeginTran();
+
Dt_PackaxisTask? packaxisTaskFinish = null;
if (packaxisTask!=null)
{
@@ -211,15 +232,16 @@
StationPackId = stationPackInfo.id,
BoxCode = packaxisTaskFinish.BarCode
};
+ _unitOfWorkManage.BeginTran();
_stationPackInfoRepository.UpdateData(stationPackInfo);
_stationPackDetailRepository.AddData(stationPackDetail);
BaseDal.DeleteAndMoveIntoHty(packaxisTaskFinish, App.User?.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
}
else
{
return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔�");
}
- _unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -228,5 +250,42 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+<<<<<<< HEAD
+=======
+ /// <summary>
+ /// 鍒犻櫎鐮佸灈浠诲姟淇℃伅
+ /// </summary>
+ /// <param name="packTaskNum"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public WebResponseContent PickaixsTaskDele(int PackTaskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+
+ Dt_PackaxisTask packaxisTask = BaseDal.QueryFirst(x => x.PackTaskNum == PackTaskNum);
+ if(packaxisTask == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔�");
+ }
+ else
+ {
+ Dt_Packinfo packinfo = _packinfoRepository.QueryFirst(x => x.BarCode == packaxisTask.BarCode);
+ packinfo.PackStatus = 0;
+ _packinfoRepository.UpdateData(packinfo);
+ BaseDal.DeleteAndMoveIntoHty(packaxisTask, App.User?.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐鍒犻櫎);
+ content.Status = true;
+ }
+ }
+ catch (Exception e)
+ {
+ return WebResponseContent.Instance.Error(e.Message);
+ }
+ return content;
+ }
+
+
+>>>>>>> main
}
}
--
Gitblit v1.9.3