From 00bf7fd07edc7f23c29c00c1193f55defb88b71d Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 26 十一月 2024 11:24:02 +0800
Subject: [PATCH] 分容组盘 电芯属性获取
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 142 ++++++++++++++++++++++++++++++++---------------
1 files changed, 96 insertions(+), 46 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index 93021c6..637842f 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -386,25 +386,25 @@
}
}
- // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
- //TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
- //{
- // Software = "WMS",
- // TrayBarcode = input.PalletCode,
- // //EquipmentCode = "EQ_CWJZ01"
- // EquipmentCode = input.EquiCodeMOM
- //};
+ //鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
+ TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+ {
+ Software = "WMS",
+ TrayBarcode = input.PalletCode,
+ //EquipmentCode = "EQ_CWJZ01"
+ EquipmentCode = input.EquiCodeMOM
+ };
- //// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
- //content = await GetTrayCellStatusAsync(trayCells);
- //// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- //if (!content.Status) return content;
+ // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+ content = await GetTrayCellStatusAsync(trayCells);
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+ if (!content.Status) return content;
- //// 娣诲姞缁勭洏淇℃伅
- //// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
- //var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- //if (result.SerialNos.Count <= 0)
- // return content.Error(result.MOMMessage);
+ // 娣诲姞缁勭洏淇℃伅
+ // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (result.SerialNos.Count <= 0)
+ return content.Error(result.MOMMessage);
//Console.WriteLine(result);
//// TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
@@ -413,9 +413,8 @@
//// return content.Error("鏂欐灞炴�т笉瀛樺湪");
//// 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
-
- //var boxing = await CreateBoxingInfo(result, input.PalletCode);
- //if (boxing == null) return content.Error("缁勭洏澶辫触");
+ var boxing = CreateBoxingInfo(result, input.PalletCode);
+ if (boxing == null) return content.Error("缁勭洏澶辫触");
//// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
//ProcessApplyDto process = await GetProcessApplyAsync(input, result);
@@ -433,10 +432,10 @@
////var processResponse = await GetProcessResponseAsync(process, input.Position);
// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
content = await CreateNewTask(input);
- //if (content.Status)
- //{
- // var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
- //}
+ if (content.Status)
+ {
+ var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+ }
}
catch (Exception err)
{
@@ -533,9 +532,10 @@
//case 4:
case 5:
task = await CreateInToOutTaskAsync(input, stationManager); break;
-
+ case 7:
+ task = await CreateEmptyOutTaskAsync(input, stationManager); break;
default:
- throw new Exception("浣嶇疆绔欏彴绫诲瀷");
+ throw new Exception("鏈煡绔欏彴绫诲瀷");
}
return task;
}
@@ -575,7 +575,16 @@
{
if (stationManager.stationType != 1 && stationManager.stationType != 6) throw new Exception("閿欒鐨勮皟鍙�");
- DtLocationInfo locationInfo = await RequestLocation(input);
+ DtLocationInfo locationInfo = null;
+ if (stationManager.stationType == 1 && stationManager.Roadway.Contains("FR"))
+ {
+ locationInfo = await RequestLocation(input, true);
+ }
+ else
+ {
+ locationInfo = await RequestLocation(input);
+ }
+ //DtLocationInfo locationInfo = await RequestLocation(input);
if (locationInfo == null) throw new Exception("搴撲綅宸叉弧");
@@ -590,16 +599,15 @@
EquipmentCode = input.EquiCodeMOM
};
- //// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
- //content = await GetTrayCellStatusAsync(trayCells);
- //// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- //if (!content.Status) return content;
+ // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
+ WebResponseContent content = await GetTrayCellStatusAsync(trayCells);
+ // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
+ if (!content.Status) throw new Exception(content.Message);
- //// 娣诲姞缁勭洏淇℃伅
- //// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
- //var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- //if (result.SerialNos.Count <= 0)
- // return content.Error(result.MOMMessage);
+ // 娣诲姞缁勭洏淇℃伅
+ // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (result.SerialNos.Count <= 0) throw new Exception(result.MOMMessage);
//Console.WriteLine(result);
//// TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
@@ -608,9 +616,8 @@
//// return content.Error("鏂欐灞炴�т笉瀛樺湪");
//// 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
-
- //var boxing = await CreateBoxingInfo(result, input.PalletCode);
- //if (boxing == null) return content.Error("缁勭洏澶辫触");
+ var boxing = CreateBoxingInfo(result, input.PalletCode);
+ if (boxing == null) throw new Exception("缁勭洏澶辫触");
//// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
//ProcessApplyDto process = await GetProcessApplyAsync(input, result);
@@ -659,13 +666,13 @@
/// </summary>
/// <param name="requestTask">璇锋眰鍙傛暟</param>
/// <returns></returns>
- private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask)
+ private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask, bool isCheckRequest = false)
{
#region 鑾峰彇璐т綅
try
{
List<DtLocationInfo> locations;
- if (requestTask.Roadways.Contains("FR"))
+ if (isCheckRequest)
{
locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 2 && x.Remark == "1");
}
@@ -687,7 +694,7 @@
return null;
}
#endregion 鑾峰彇璐т綅
- }
+ }
#endregion
// 鑾峰彇宸ヨ壓鐢宠
@@ -706,8 +713,52 @@
};
}
- #endregion 璇锋眰浠诲姟鍏ュ簱
+ #endregion 璇锋眰绌烘鍑哄簱
+ public async Task<Dt_Task> CreateEmptyOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
+ {
+ try
+ {
+ if (stationManager.stationType != 7) throw new Exception("閿欒鐨勮皟鍙�");
+
+ var stockinfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.LocationInfo)
+ //.Includes(x=>x.StockInfoDetails)
+ .Where(x => !x.IsFull && x.LocationInfo.RoadwayNo == stationManager.Roadway)
+ .OrderBy(x => x.CreateDate)
+ .FirstAsync();
+
+ if (stockinfo == null) return null;
+
+ var task = new Dt_Task
+ {
+ CurrentAddress = input.Position,
+ Grade = 1,
+ Roadway = input.Roadways,
+ TargetAddress = stationManager.stationLocation,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = input.Roadways,
+ OrderNo = null,
+ PalletCode = input.PalletCode,
+ SourceAddress = stockinfo.LocationCode,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = (int)TaskOutboundTypeEnum.OutTray,
+ TaskNum = await BaseDal.GetTaskNo(),
+ Creater = "Systeam"
+ };
+
+ return task;
+ }
+ catch (Exception ex)
+ {
+
+ throw new Exception(ex.Message);
+ }
+ }
+
+
+ #region 鐩存帴鍑哄簱浠诲姟瀹屾垚
public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
{
WebResponseContent content = new WebResponseContent();
@@ -723,10 +774,9 @@
}
catch (Exception ex)
{
- return content.Error (ex.Message);
+ return content.Error(ex.Message);
}
-
- return content;
}
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3