From e3aaaa22a7cee2b7c7a33e98f843abc0cd15fb1b Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 05 八月 2025 13:36:12 +0800
Subject: [PATCH] 同步
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 279 +++++++++++++++++++++++++++----------------------------
1 files changed, 139 insertions(+), 140 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index b568d0c..d57a2d1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -5,10 +5,12 @@
using System.Diagnostics;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
+using WIDESEA_Comm.WCSInterface.Requst;
using WIDESEA_Core.Const;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_StoragIntegrationServices;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.Models;
@@ -28,19 +30,21 @@
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
private readonly IDt_PalletStockInfoRepository _palletStockInfoRepository;
+ private readonly IDt_PalletStockInfoDetailRepository _palletStockInfoDetailRepository;
+ private readonly IDt_PalletStockInfo_htyRepository _palletStockInfo_HtyRepository;
+ private readonly IBoxingInfoRepository _boxingInfoRepository;
+
+ public static string AGV_Interface = "http://192.168.1.195:10200/";
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderRepository outOrderRepository,
- IStockInfoRepository stockInfoRepository,
IDt_Task_HtyRepository task_HtyRepository,
IMapper mapper,
ILocationInfoRepository locationRepository,
ITaskExecuteDetailRepository taskExecuteDetailRepository,
ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
- IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
- ISys_ConfigService configService, IDt_PalletStockInfoRepository palletStockInfoRepository) : base(BaseDal)
+ ISys_ConfigService configService, IDt_PalletStockInfoRepository palletStockInfoRepository, IDt_PalletStockInfo_htyRepository palletStockInfo_HtyRepository, IBoxingInfoRepository boxingInfoRepository, IDt_PalletStockInfoDetailRepository palletStockInfoDetailRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
@@ -52,12 +56,14 @@
_stationManagerRepository = stationManagerRepository;
_configService = configService;
_palletStockInfoRepository = palletStockInfoRepository;
+ _palletStockInfo_HtyRepository = palletStockInfo_HtyRepository;
+ _boxingInfoRepository = boxingInfoRepository;
+ _palletStockInfoDetailRepository = palletStockInfoDetailRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
#region 鍏ュ簱浠诲姟瀹屾垚
-
/// <summary>
/// 瀹屾垚鍏ュ簱浠诲姟
/// </summary>
@@ -70,8 +76,7 @@
try
{
- // 鑾峰彇MES淇℃伅鍜岀洰鏍囦綅缃俊鎭�
- //var mes_Wheels = await _InWheels_MesRepository.QueryFirstNavAsync(x => x.Wheels_Num == task.PalletCode);
+ // 鑾峰彇搴撲綅淇℃伅
var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.RoadwayNo == task.Roadway);
int lastStatus = locationInf.LocationStatus;
@@ -81,14 +86,24 @@
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
var taskHty = CreateHistoricalTask(task);
+ //鑾峰彇缁勭洏淇℃伅
+ var boxinginfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
+
// 鏍规嵁鍒涘缓搴撳瓨瀹炰緥妯″瀷
+ var boxDetail = boxinginfo.BoxingInfoDetails.Adapt<List<Dt_PalletStockInfoDetail>>();
Dt_PalletStockInfo palletStockInfo = new Dt_PalletStockInfo
{
-
+ CreateDate = DateTime.Now,
+ Creater = task.Creater,
+ LocationCode = task.TargetAddress,
+ StockStatus = 2,
+ PalletCode = task.PalletCode,
+ AreaCode = task.Roadway,
+ StockInfoDetails = boxDetail
};
// 鎵ц鏁版嵁搴撲簨鍔�
- bool isResult = await ExecuteTransaction(palletStockInfo, taskHty, locationInf, task.TaskId);
+ bool isResult = await ExecuteTransaction(palletStockInfo, taskHty, locationInf, task.TaskId, boxinginfo);
if (isResult)
{
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
@@ -111,28 +126,43 @@
#endregion 鍏ュ簱浠诲姟瀹屾垚
#region 鍑哄簱浠诲姟瀹屾垚
- public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, Dt_PalletStockInfo stock)
+ public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task)
{
WebResponseContent content = new WebResponseContent();
try
{
// 鏇存柊搴撲綅鐘舵�佷笌浠诲姟鐘舵��
- //(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
- //var taskHty = task.Adapt<Dt_Task_Hty>();
- //taskHty.FinishTime = DateTime.Now;
- //taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+ var stock = _palletStockInfoRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
- //Dt_WheelsStock_hty stockInfo_Hty = stock.Adapt<Dt_WheelsStock_hty>();
- //stockInfo_Hty.FinishWheelDate = DateTime.Now;
- //stockInfo_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+ (var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
+ var taskHty = task.Adapt<Dt_Task_Hty>();
+ taskHty.FinishTime = DateTime.Now;
+ taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
- //// 浜嬪姟澶勭悊
- //await _unitOfWorkManage.UseTranAsync(async () =>
- //{
- // var isLocationUpdate = await _locationRepository.UpdateDataAsync(loc); //鏇存柊搴撲綅
- // //var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(task.TaskId); //鍒犻櫎浠诲姟
- // var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0; //鍔犲叆鍘嗗彶浠诲姟
- //});
+ Dt_PalletStockInfo_hty stockInfo_Hty = stock.Adapt<Dt_PalletStockInfo_hty>();
+ stockInfo_Hty.FinishTime = DateTime.Now;
+ stockInfo_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+
+ var boxinfo = _boxingInfoRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
+
+ // 浜嬪姟澶勭悊
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ var isLocationUpdate = await _locationRepository.UpdateDataAsync(loc); //鏇存柊搴撲綅
+ var isPalletHty = await _palletStockInfo_HtyRepository.AddDataAsync(stockInfo_Hty); //娣诲姞鍘嗗彶搴撳瓨璁板綍
+ //var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(task.TaskId); //鍒犻櫎浠诲姟
+ await BaseDal.UpdateDataAsync(task); //鍙栨秷鍒犻櫎浠诲姟锛屾敼涓哄畬鎴愮姸鎬侊紱骞禬MS鐣岄潰鐢变汉宸ョ‘璁ゅ畬鎴�
+ var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0; //鍔犲叆鍘嗗彶浠诲姟
+ var isDelete = await _palletStockInfoRepository.DeleteDataAsync(stock); //鍒犻櫎搴撳瓨
+ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails); //鍒犻櫎搴撳瓨鏄庣粏
+ //if (boxinfo != null)
+ //{
+ // var isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxinfo.Id)
+ // .Include(x => x.BoxingInfoDetails)
+ // .ExecuteCommandAsync(); //鍒犻櫎缁勭洏
+ //}
+
+ });
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
}
@@ -143,7 +173,7 @@
}
}
- private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus(Dt_WheelsStock stock, Dt_Task task)
+ private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus(Dt_PalletStockInfo stock, Dt_Task task)
{
var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
int lastStatus = location.LocationStatus;
@@ -184,22 +214,18 @@
// 楠岃瘉搴撳瓨鏄惁瀛樺湪
- var stock = await _palletStockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
+ //var stock = await _palletStockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
// 鏍规嵁浠诲姟绫诲瀷璋冪敤鐩稿簲鐨勫畬鎴愪换鍔℃柟娉�
switch (task.TaskType)
{
case (int)TaskInboundTypeEnum.Inbound:
- case (int)TaskInboundTypeEnum.InWheels:
- case (int)TaskInboundTypeEnum.InBrake:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟", "");
return await CompleteInboundTaskAsync(task);
case (int)TaskOutboundTypeEnum.Outbound:
- case (int)TaskOutboundTypeEnum.OutBrake:
- case (int)TaskOutboundTypeEnum.OutWheels:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
- return await CompleteStackTaskAsync(task, stock);
+ return await CompleteStackTaskAsync(task);
default:
return content.Error("浠诲姟绫诲瀷涓嶅瓨鍦�");
}
@@ -208,11 +234,6 @@
#endregion 浠诲姟瀹屾垚
#region 璇锋眰浠诲姟鍏ュ簱
-
- #region
-
- #endregion 璇锋眰浠诲姟鍏ュ簱
-
/// <summary>
/// 鏇存柊浠诲姟璐т綅
/// </summary>
@@ -227,7 +248,7 @@
if (task == null)
return content.Error($"鏆傛湭鎵惧埌銆恵input.PalletCode}銆戠殑浠诲姟");
- return content = await UpdateExistingTask(input, task);
+ return content; //= await UpdateExistingTask(input, task);
}
catch (Exception err)
{
@@ -237,29 +258,6 @@
#endregion 澶栭儴鎺ュ彛鏂规硶
- #region 璇锋眰鍑哄簱锛堝疄鐩橈級
-
-
- /// <summary>
- /// 鍒涘缓浠诲姟DTO
- /// </summary>
- private WMSTaskDTO CreateTaskDTO(Dt_Task task)
- {
- return new WMSTaskDTO
- {
- TaskNum = task.TaskNum.Value,
- Grade = task.Grade.Value,
- PalletCode = task.PalletCode,
- RoadWay = task.Roadway,
- SourceAddress = task.SourceAddress,
- TargetAddress = task.TargetAddress,
- TaskState = task.TaskState.Value,
- Id = 0,
- TaskType = task.TaskType
- };
- }
-
- #endregion 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
#region 浠诲姟鐘舵�佹洿鏀�
@@ -328,9 +326,9 @@
return content.Error("鏈煡璇㈠埌瀵瑰簲鐨勫簱瀛樹俊鎭�");
}
- if (stockInfo.StockStatus != 1) return content.Error("鎸囧畾澶辫触锛氬綋鍓嶇姸鎬佷笉鍏佽鎸囧畾鍑哄簱");
+ if (stockInfo.StockStatus != 2) return content.Error("鎸囧畾澶辫触锛氬綋鍓嶇姸鎬佷笉鍏佽鎸囧畾鍑哄簱");
- stockInfo.StockStatus = 4;
+ stockInfo.StockStatus = 3;
//鏌ヨ搴撲綅鏄惁閿佸畾锛�
var location = _locationRepository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
@@ -344,67 +342,80 @@
{
return content.Error($"銆恵palletCode}銆戝凡瀛樺湪浠诲姟");
}
- // var stationInfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == station);
+
+ var stationInfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == station);
+
// 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
+ string agvId = Guid.NewGuid().ToString().Replace("-", "").Take(16);
task = new Dt_Task
{
Grade = 1,
- Roadway = "SC1",
- TargetAddress = station,
+ Roadway = stationInfo.Roadway,
+ TargetAddress = stationInfo.stationLocation,
Dispatchertime = DateTime.Now,
MaterialNo = "",
- NextAddress = "2010",
+ NextAddress = stationInfo.stationLocation,
OrderNo = null,
PalletCode = stockInfo.PalletCode,
SourceAddress = stockInfo.LocationCode,
CurrentAddress = stockInfo.LocationCode,
TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = (int)TaskOutboundTypeEnum.OutWheels,
+ TaskType = (int)TaskOutboundTypeEnum.Outbound,
TaskNum = BaseDal.GetTaskNo().Result,
Creater = "System",
CreateDate = DateTime.Now,
TaskId = 0,
- //task_bak1 = JsonConvert.SerializeObject(checkInfo)
+ AGVtaskId = agvId
};
- // 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
- var taskDTO = CreateTaskDTO(task);
- // 鑾峰彇WMS IP鍦板潃鐢ㄤ簬鍙戦�佷换鍔¤姹�
- var wmsIpAddress = GetWCSIpReceiveTask();
- if (wmsIpAddress == null)
+ addtask schedulingTask = new addtask
{
- throw new InvalidOperationException("WMS IP 鏈厤缃�");
- }
+ task_id = task.AGVtaskId,
+ task_type = task.TaskType == (int)TaskTypeEnum.Inbound ? "push" : "pop",
+ work_begin = task.SourceAddress,
+ work_end = task.TargetAddress
+ };
- var tasks = new List<WMSTaskDTO>() { taskDTO };
- // 鍙戦�佷换鍔¤姹傚埌WMS
- var result = HttpHelper.Post(wmsIpAddress, tasks.ToJsonString());
+ string address = AGV_Interface + "add_task";
+
+ string result = HttpsClient.PostAsync(address, schedulingTask.ToDictionary()).Result;
+
content = JsonConvert.DeserializeObject<WebResponseContent>(result);
- if (content.Status)
+
+ if (content.ack != 0)
{
- // 娣诲姞浠诲姟鍒版暟鎹簱
- BaseDal.AddData(task);
- // 鏇存柊搴撲綅浣嶇疆鐘舵�佷负涓嶅彲鐢�
- _locationRepository.UpdateData(location);
- _palletStockInfoRepository.UpdateData(stockInfo);
+ Console.WriteLine($"璇锋眰RCS寮傚父锛歿content.msg}");
+ LogFactory.GetLog("涓嬪彂AGV浠诲姟").Info(true, $"\r\r--------------------------------------");
+ LogFactory.GetLog("涓嬪彂AGV浠诲姟").Info(true, $"璇锋眰鍙傛暟锛歿schedulingTask.ToJsonString()}");
+ LogFactory.GetLog("涓嬪彂AGV浠诲姟").Info(true, $"鍝嶅簲鍙傛暟锛歿content.ToJsonString()}");
+ throw new Exception(content.msg);
}
+
+ _unitOfWorkManage.BeginTran();
+ // 娣诲姞浠诲姟鍒版暟鎹簱
+ BaseDal.AddData(task);
+ // 鏇存柊搴撲綅浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ _locationRepository.UpdateData(location);
+ _palletStockInfoRepository.UpdateData(stockInfo);
+
+ _unitOfWorkManage.CommitTran();
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
Console.WriteLine($"鍙戠敓寮傚父: {ex.Message}");
content.Error(ex.Message);
}
-
return content;
}
- private string GetWCSIpReceiveTask()
+ private string GetAGVIpReceiveTask()
{
var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
- var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
- var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue;
+ var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.AGVIPAddress)?.ConfigValue;
+ var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.addTask)?.ConfigValue;
if (wmsBase == null || ipAddress == null)
{
return null;
@@ -600,6 +611,20 @@
#region private 鍐呴儴鏂规硶
+
+ private async Task DeleteStockInfoDetailsAsync(IEnumerable<Dt_PalletStockInfoDetail> details)
+ {
+ if (details != null)
+ {
+ var ids = details.Select(x => (object)x.Id).ToArray();
+ var isStockDetailUpdated = await _palletStockInfoDetailRepository.DeleteDataByIdsAsync(ids);
+ if (!isStockDetailUpdated)
+ {
+ throw new Exception("搴撳瓨璇︽儏淇℃伅鏇存柊澶辫触");
+ }
+ }
+ }
+
/// <summary>
/// 鍒涘缓鍘嗗彶浠诲姟璁板綍
/// </summary>
@@ -625,27 +650,6 @@
return taskHty;
}
- /// <summary>
- /// 鏇存柊搴撳瓨浣嶇疆
- /// </summary>
- /// <param name="stock">搴撳瓨瀵硅薄</param>
- /// <param name="toLocation">鐩爣浣嶇疆</param>
- // 鏇存柊搴撳瓨鍜屼綅缃俊鎭�
- private (Dt_WheelsStock, DtLocationInfo, DtLocationInfo) UpdateStockLocation(Dt_WheelsStock stock, Dt_Task task)
- {
- //淇敼鏉ユ簮搴撲綅鍜� 鐩爣搴撲綅鐘舵��
- var fromLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
- fromLocation.LocationStatus = (int)LocationEnum.Free;
- var toLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.TargetAddress && x.RoadwayNo == task.Roadway);
- toLocation.LocationStatus = (int)LocationEnum.InStock;
-
- // 灏嗗簱瀛樹綅缃缃负鐩爣浣嶇疆
- stock.Wheels_Location = task.TargetAddress;
-
- // 杩斿洖鏇存柊鍚庣殑搴撳瓨鍜屼綅缃俊鎭�
- return (stock, fromLocation, toLocation);
- }
-
#region 鎵ц鏁版嵁搴撲簨鍔�
/// <summary>
/// 鎵ц鏁版嵁搴撲簨鍔�
@@ -654,30 +658,25 @@
/// <param name="taskHty">鍘嗗彶浠诲姟瀵硅薄</param>
/// <param name="taskId">浠诲姟ID</param>
/// <returns></returns>
- private async Task<bool> ExecuteTransaction(Dt_PalletStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId /*Dt_InWheels_mes inWheels_Mes = null*/)
+ private async Task<bool> ExecuteTransaction(Dt_PalletStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId, DtBoxingInfo boxingInfo)
{
_unitOfWorkManage.BeginTran();
try
{
- var isUpdateStock = false;
- var isDeleteWheelsMes = false;
-
-
+ var isUpdateStock = true;
+ var isDeleteBoxing = true;
// 娣诲姞搴撳瓨
- isUpdateStock = _palletStockInfoRepository.AddData(stock) > 0;
- //if (inWheels_Mes != null)
- //{
- // isDeleteWheelsMes = _InWheels_MesRepository.DeleteData(inWheels_Mes);
+ isUpdateStock = await _palletStockInfoRepository.AddDataNavAsync(stock);
- // //var wheels_Mes_Hty = inWheels_Mes.Adapt<Dt_InWheels_mes_hty>();
-
- // //wheels_Mes_Hty.Wheels_CurrentStatue = "2";
- // //wheels_Mes_Hty.FinishDate = DateTime.Now;
- // //wheels_Mes_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
-
- // //_InWheels_Mes_HtyRepository.AddData(wheels_Mes_Hty);
- //}
-
+ //鍒犻櫎缁勭洏鏁版嵁
+ if (boxingInfo != null)
+ {
+ boxingInfo.CurrentStatue = 5;
+ isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
+ .Include(x => x.BoxingInfoDetails)
+ .ExecuteCommandAsync();
+ }
+ //var box = _boxingInfoRepository.dele(boxingInfo);
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
@@ -689,7 +688,7 @@
var isTaskDelete = await Delete(taskId);
// 鎻愪氦鎴栧洖婊氫簨鍔�
- if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc && isDeleteWheelsMes)
+ if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc && isDeleteBoxing)
{
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊鎴栨坊鍔犲簱瀛橈細{isUpdateStock},淇敼鍏ュ簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
_unitOfWorkManage.CommitTran();
@@ -733,24 +732,24 @@
var content = new WebResponseContent();
// 鑾峰彇搴撲綅
- var location = RequestLocation(input);
- if (location == null)
- {
- return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
- }
+ //var location = RequestLocation(input);
+ //if (location == null)
+ //{
+ // return content.Error("鏃犳硶鑾峰彇璐т綅淇℃伅");
+ //}
- string toAddress = location.LocationCode;
- int taskState = (int)TaskInStatusEnum.Line_InFinish;
- int beforeStatus = location.LocationStatus;
- // 鏇存柊璐т綅淇℃伅
- location.LocationStatus = (int)LocationEnum.Lock;
+ //string toAddress = location.LocationCode;
+ //int taskState = (int)TaskInStatusEnum.Line_InFinish;
+ //int beforeStatus = location.LocationStatus;
+ //// 鏇存柊璐т綅淇℃伅
+ //location.LocationStatus = (int)LocationEnum.Lock;
// 鏇存柊浠诲姟淇℃伅
- MapTaskProperties(task, input, toAddress, taskState);
+ //MapTaskProperties(task, input, toAddress, taskState);
_unitOfWorkManage.BeginTran();
// 寮�濮嬩簨鍔�
- var isResult = await UpdateTaskAsync(task, location, beforeStatus);
+ var isResult = false; //await UpdateTaskAsync(task, location, beforeStatus);
if (!isResult)
{
_unitOfWorkManage.RollbackTran();
--
Gitblit v1.9.3