From b2b779905bc8a71b52d0e14f91652309d9279878 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 03 二月 2026 14:37:38 +0800
Subject: [PATCH] 一堆逻辑修改
---
项目资料/接口协议/博斯通利拓接口.V2.xlsx | 0
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs | 2
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs | 21 +
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs | 4
项目代码/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs | 2
项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs | 32 +
项目代码/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs | 5
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/ConveyorLineJob_CPH.cs | 226 +++++++------
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs | 75 ++--
项目代码/WMS/WMSServices/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs | 2
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs | 8
项目资料/通信协议/原料库输送线故障读取.xls | 0
项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs | 22 +
项目代码/WMS/WMSServices/WIDESEA_InboundService/MESProInOrderInfoService.cs | 2
项目代码/WMS/WMSServices/WIDESEA_InboundService/ReturnBSTOrderService.cs | 144 +++-----
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob_CP.cs | 1
项目代码/WMS/WMSClient/src/views/taskinfo/task_hty.vue | 7
项目代码/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json | 4
项目代码/WCS/WCSServices/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs | 40 ++
项目代码/WMS/WMSServices/WIDESEA_IStockService/IProStockViewService.cs | 1
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs | 14
项目代码/WMS/WMSServices/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs | 30 +
项目代码/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs | 13
项目代码/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs | 8
项目代码/WMS/WMSServices/WIDESEA_Common/StockEnum/OutLockStockStatusEnum.cs | 1
项目代码/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPickInfoDTO.cs | 2
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 263 +++++++++-------
项目代码/WMS/WMSClient/src/views/taskinfo/task.vue | 7
28 files changed, 538 insertions(+), 398 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
index 9c78130..b56670b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
@@ -82,10 +82,16 @@
OutCarton = 360,
/// <summary>
+ /// 浜屾ゼ绾哥渚涙枡
+ /// </summary>
+ [Description("绾告澂绾哥墖渚涙枡")]
+ OutScrapsPaper = 370,
+
+ /// <summary>
/// 鏃犵汉甯冩穻鑶滃嚭搴�
/// </summary>
[Description("鏃犵汉甯冩穻鑶滃嚭搴�")]
- OutWFBLM = 370,
+ OutWFBLM = 380,
/// <summary>
/// 鍐插垏鍖哄嚭搴�
@@ -130,12 +136,6 @@
InPick = 530,
/// <summary>
- /// 绌烘墭鍥炲彔鐩�
- /// </summary>
- [Description("绌烘墭鍥炲彔鐩�")]
- EmptyPaletteBack = 535,
-
- /// <summary>
/// 鎴愬搧鍏ュ簱
/// </summary>
[Description("鎴愬搧鍏ュ簱")]
@@ -148,10 +148,34 @@
EmptyProductBack = 630,
/// <summary>
+ /// 鍒嗗垏鍗婃垚鍝佸叆搴�
+ /// </summary>
+ [Description("鍒嗗垏鍗婃垚鍝佸叆搴�")]
+ PartOffInbound = 680,
+
+ /// <summary>
+ /// 妯″垏鍗婃垚鍝佸叆搴�
+ /// </summary>
+ [Description("妯″垏鍗婃垚鍝佸叆搴�")]
+ DieCutInbound = 685,
+
+ /// <summary>
+ /// 鍐插垏鍗婃垚鍝佸叆搴�
+ /// </summary>
+ [Description("鍐插垏鍗婃垚鍝佸叆搴�")]
+ PunchingInbound = 690,
+
+ /// <summary>
/// 鏃犵汉甯冨崐鎴愬搧鍏ュ簱
/// </summary>
[Description("鏃犵汉甯冨崐鎴愬搧鍏ュ簱")]
- WFBYLInbound = 700,
+ WFBYLInbound = 695,
+
+ /// <summary>
+ /// 鏃犵汉甯冩穻鑶滃崐鎴愬搧鍏ュ簱
+ /// </summary>
+ [Description("鏃犵汉甯冩穻鑶滃崐鎴愬搧鍏ュ簱")]
+ WFBLMYLInbound = 700,
/// <summary>
/// 绾稿紶娣嬭啘鍗婃垚鍝佸叆搴�
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs"
index 253b416..72142e3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs"
@@ -13,8 +13,21 @@
{
public interface IPackaxisTaskService : IService<Dt_PackaxisTask>
{
+ /// <summary>
+ /// 鍒嗛厤鐮佸灈浠诲姟
+ /// </summary>
+ /// <param name="barCode"></param>
+ /// <param name="deviceCode"></param>
+ /// <returns></returns>
WebResponseContent ReqPackTask(string barCode, string deviceCode);
+ /// <summary>
+ /// 鐮佸灈浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <param name="packaxisTask"></param>
+ /// <returns></returns>
WebResponseContent TaskCompleted(int taskNum=0,Dt_PackaxisTask? packaxisTask=null);
+ //鐮佸灈缁撴墭骞朵笂浼犵爜鍨涘伐浣嶇爜鍨涙槑缁嗘暟鎹�
WebResponseContent BoxingInBound(string stationCode);
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs"
index 47afbcf..6db9852 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs"
@@ -244,7 +244,7 @@
}
else
{
- if (task.TaskType == TaskTypeEnum.PrintYLInbound.ObjToInt() || task.TaskType == TaskTypeEnum.PrintYLBackInbound.ObjToInt() || task.TaskType == TaskTypeEnum.EmptyPaletteBack.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.PrintYLInbound.ObjToInt() || task.TaskType == TaskTypeEnum.PrintYLBackInbound.ObjToInt())
{
var content = TakeFinish(task.CurrentAddress);
if (!content.Status)
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..a680a09 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"
@@ -39,6 +39,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 +145,11 @@
}
return content;
}
+ /// <summary>
+ /// 鐮佸灈缁撴墭骞朵笂浼犵爜鍨涘伐浣嶇爜鍨涙槑缁嗘暟鎹�
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <returns></returns>
public WebResponseContent BoxingInBound(string stationCode)
{
WebResponseContent content = new WebResponseContent();
@@ -186,11 +197,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 +228,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)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 9830b27..ccfabbc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -102,6 +102,7 @@
}
}
}
+ private readonly static object lockerCompleted = new object();
/// <summary>
/// 浠诲姟瀹屾垚
/// </summary>
@@ -109,22 +110,25 @@
{
try
{
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- if (task != null)
+ lock (lockerCompleted)
{
- task.TaskState = TaskStatusEnum.Finish.ObjToInt();
- BaseDal.DeleteAndMoveIntoHty(task, App.User?.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task != null)
+ {
+ task.TaskState = TaskStatusEnum.Finish.ObjToInt();
+ BaseDal.DeleteAndMoveIntoHty(task, App.User?.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ }
+ string? url = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.FeedBackWMSTaskCompleted.ToString())?.ApiAddress;
+ if (string.IsNullOrEmpty(url))
+ {
+ _taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"鏈壘鍒癢MS浠诲姟瀹屾垚鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
+ UpdateTaskExceptionMessage(taskNum, $"鏈壘鍒癢MS浠诲姟瀹屾垚鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
+ return WebResponseContent.Instance.Error($"{taskNum},鏈壘鍒癢MS浠诲姟瀹屾垚鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
+ }
+ string responseStr = HttpHelper.Get(url + "?taskNum=" + taskNum);
+ WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(responseStr) ?? WebResponseContent.Instance.Error($"{taskNum},鏈帴鏀跺埌浠诲姟瀹屾垚杩斿洖鍊�");
+ return content;
}
- string? url = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.FeedBackWMSTaskCompleted.ToString())?.ApiAddress;
- if (string.IsNullOrEmpty(url))
- {
- _taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"鏈壘鍒癢MS浠诲姟瀹屾垚鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
- UpdateTaskExceptionMessage(taskNum, $"鏈壘鍒癢MS浠诲姟瀹屾垚鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
- return WebResponseContent.Instance.Error($"{taskNum},鏈壘鍒癢MS浠诲姟瀹屾垚鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
- }
- string responseStr = HttpHelper.Get(url + "?taskNum=" + taskNum);
- WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(responseStr) ?? WebResponseContent.Instance.Error($"{taskNum},鏈帴鏀跺埌浠诲姟瀹屾垚杩斿洖鍊�");
- return content;
}
catch (Exception ex)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs"
index c93f3c1..409cbbb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPH.cs"
@@ -89,133 +89,151 @@
List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StationDeviceCode == device.DeviceCode);
Task.Run(() =>
{
- try
+ bool shouldRestart = true;
+
+ while (shouldRestart)
{
- Dt_StationManger? RequestIn = stationMangers.FirstOrDefault(x => x.StationDeviceCode == device.DeviceCode && x.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt());
- while (true)
+ try
{
- if (RequestIn != null)
+ shouldRestart = false;
+ Dt_StationManger? RequestIn = stationMangers.FirstOrDefault(x => x.StationDeviceCode == device.DeviceCode && x.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt());
+ WriteError($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}","寮�濮嬫墽琛�");
+ while (true)
{
- DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == RequestIn.StationCode && x.DeviceProParamType == nameof(R_CLineCPHDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
- DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == RequestIn.StationCode && x.DeviceProParamType == nameof(W_CLineCPHDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
- if (deviceProRead != null && deviceProWrite != null)
+ if (RequestIn != null)
{
- R_CLineCPHInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_CLineCPHInfo>(deviceProRead.DeviceProAddress);
- //鐮佸灈鐜嚎璇锋眰浠诲姟
- if (conveyorLineInfoRead != null && (conveyorLineInfoRead.R_State == 2 || conveyorLineInfoRead.R_State == 3) && conveyorLineInfoRead.R_TaskNo <= 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.R_BoxCode) && conveyorLineInfoRead.R_Request == 1)
+ DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == RequestIn.StationCode && x.DeviceProParamType == nameof(R_CLineCPHDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == RequestIn.StationCode && x.DeviceProParamType == nameof(W_CLineCPHDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ if (deviceProRead != null && deviceProWrite != null)
{
- //鍒ゆ柇鏄惁浠诲姟宸茬粡瀛樺湪
- Dt_PackaxisTask packaxisTask = _packaxisTaskRepository.QueryFirst(x => x.BarCode == conveyorLineInfoRead.R_BoxCode.Trim() && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt());
- if (packaxisTask != null)
+ R_CLineCPHInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_CLineCPHInfo>(deviceProRead.DeviceProAddress);
+ //鐮佸灈鐜嚎璇锋眰浠诲姟
+ if (conveyorLineInfoRead != null && (conveyorLineInfoRead.R_State == 2 || conveyorLineInfoRead.R_State == 3) && conveyorLineInfoRead.R_TaskNo <= 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.R_BoxCode) && conveyorLineInfoRead.R_Request == 1)
{
- //鍐欏叆鎵ц鏁版嵁
- device.SetValue(W_CLineCPHDB.W_TaskNo, packaxisTask.PackTaskNum, RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_Channel, packaxisTask.NextAddress, RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_Long, packaxisTask.PackLength, RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_Wide, packaxisTask.PackWidth, RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_High, packaxisTask.PackHeight, RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_TMID, packaxisTask.BarCode, RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_Request, 1, RequestIn.StationCode);
- }
- else
- {
- #region
- WebResponseContent webResponse = _packaxisTaskService.ReqPackTask(conveyorLineInfoRead.R_BoxCode.Trim(), RequestIn.StationDeviceCode);
- if (webResponse.Status)
+ //鍒ゆ柇鏄惁浠诲姟宸茬粡瀛樺湪
+ Dt_PackaxisTask packaxisTask = _packaxisTaskRepository.QueryFirst(x => x.BarCode == conveyorLineInfoRead.R_BoxCode.Trim() && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt());
+ if (packaxisTask != null)
{
- Dt_PackaxisTask _PackaxisTask = webResponse.Data as Dt_PackaxisTask;
//鍐欏叆鎵ц鏁版嵁
- device.SetValue(W_CLineCPHDB.W_TaskNo, _PackaxisTask.PackTaskNum, RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_Channel, _PackaxisTask.NextAddress.ObjToInt(), RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_Long, _PackaxisTask.PackLength, RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_Wide, _PackaxisTask.PackWidth, RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_High, _PackaxisTask.PackHeight, RequestIn.StationCode);
- device.SetValue(W_CLineCPHDB.W_TMID, _PackaxisTask.BarCode, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_TaskNo, packaxisTask.PackTaskNum, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_Channel, packaxisTask.NextAddress, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_Long, packaxisTask.PackLength, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_Wide, packaxisTask.PackWidth, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_High, packaxisTask.PackHeight, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_TMID, packaxisTask.BarCode, RequestIn.StationCode);
device.SetValue(W_CLineCPHDB.W_Request, 1, RequestIn.StationCode);
- WebResponseContent content = _taskService.MESBoxCodeNotice(conveyorLineInfoRead.R_BoxCode.Trim());
- if (content.Status)
- {
- WriteInfo(RequestIn.StationName, content.Message);
- }
- else
- {
- WriteError(RequestIn.StationName, content.Message);
- }
}
else
{
- WriteError(RequestIn.StationName, webResponse.Message);
+ #region
+ WebResponseContent webResponse = _packaxisTaskService.ReqPackTask(conveyorLineInfoRead.R_BoxCode.Trim(), RequestIn.StationDeviceCode);
+ if (webResponse.Status)
+ {
+ Dt_PackaxisTask _PackaxisTask = webResponse.Data as Dt_PackaxisTask;
+ //鍐欏叆鎵ц鏁版嵁
+ device.SetValue(W_CLineCPHDB.W_TaskNo, _PackaxisTask.PackTaskNum, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_Channel, _PackaxisTask.NextAddress.ObjToInt(), RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_Long, _PackaxisTask.PackLength, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_Wide, _PackaxisTask.PackWidth, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_High, _PackaxisTask.PackHeight, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_TMID, _PackaxisTask.BarCode, RequestIn.StationCode);
+ device.SetValue(W_CLineCPHDB.W_Request, 1, RequestIn.StationCode);
+ WebResponseContent content = _taskService.MESBoxCodeNotice(conveyorLineInfoRead.R_BoxCode.Trim());
+ if (content.Status)
+ {
+ WriteInfo(RequestIn.StationName, content.Message);
+ }
+ else
+ {
+ WriteError(RequestIn.StationName, content.Message);
+ }
+ }
+ else
+ {
+ WriteError(RequestIn.StationName, webResponse.Message);
+ }
+ #endregion
}
- #endregion
+ }
+ }
+ else
+ {
+ WriteError(RequestIn.StationName, $"鏈壘鍒拌澶囧瓙缂栧彿{RequestIn.StationCode}鐨勫崗璁俊鎭�");
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ WriteError($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}", $"寮傚父:{ex.Message}");
+ Thread.Sleep(1500);
+ shouldRestart = true;
+ }
+ }
+ });
+ Task.Run(() =>
+ {
+ bool shouldRestart = true;
+
+ while (shouldRestart)
+ {
+ try
+ {
+ shouldRestart = false;
+ //鑾峰彇鎵�鏈夌爜鍨涘彛
+ List<Dt_StationManger> stationMangersMD = stationMangers.Where(x => x.StationDeviceCode == device.DeviceCode && x.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt()).ToList();
+ WriteError($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}", "寮�濮嬫墽琛�");
+ while (true)
+ {
+ if (stationMangersMD.Count > 0)
+ {
+ foreach (var item in stationMangersMD)
+ {
+ DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode && x.DeviceProParamType == nameof(R_CLineCPHDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ if (deviceProRead != null)
+ {
+ R_CLineCPHChannelInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_CLineCPHChannelInfo>(deviceProRead.DeviceProAddress);
+ //鑾峰彇鐮佸灈鍙ｄ换鍔℃洿鏂颁换鍔＄姸鎬�
+ if (conveyorLineInfoRead != null && conveyorLineInfoRead.R_State == 5 && conveyorLineInfoRead.R_TaskNo > 0)
+ {
+ Dt_PackaxisTask packaxisTask = _packaxisTaskRepository.QueryFirst(x => x.PackTaskNum == conveyorLineInfoRead.R_TaskNo && x.NextAddress == item.StationCode && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt() && x.DeviceCode == item.StationDeviceCode);
+ if (packaxisTask != null)
+ {
+ Dt_PackaxisTask packaxisTaskOld = _packaxisTaskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.MD_Executing.ObjToInt() && x.DeviceCode == item.StackerCraneCode);
+ if (packaxisTaskOld != null)
+ {
+ WriteError(item.StationName, $"鐮佸灈{item.StackerCraneCode}姝ｆ墽琛屼换鍔packaxisTaskOld.PackTaskNum},鏃犳硶缁х画涓嬪彂");
+ }
+ else
+ {
+ packaxisTask.CurrentAddress = item.StationCode;
+ packaxisTask.NextAddress = packaxisTask.TargetAddress;
+ packaxisTask.DeviceCode = item.StackerCraneCode;
+ packaxisTask.TaskState = TaskStatusEnum.MD_Executing.ObjToInt();
+ _packaxisTaskRepository.UpdateData(packaxisTask);
+ }
+ }
+ else
+ {
+ WriteError(item.StationName, $"鏈壘鍒颁换鍔conveyorLineInfoRead.R_TaskNo}淇℃伅");
+ }
+ Thread.Sleep(2000);
+ }
}
}
}
else
{
- WriteError(RequestIn.StationName, $"鏈壘鍒拌澶囧瓙缂栧彿{RequestIn.StationCode}鐨勫崗璁俊鎭�");
+ WriteError(nameof(ConveyorLineJob_CPH), $"閿欒淇℃伅锛氭湭鎵惧埌鐮佸灈鍙ｄ俊鎭�");
}
}
}
- }
- catch (Exception ex)
- {
- Thread.Sleep(1000);
- }
- });
- Task.Run(() =>
- {
- try
- {
- //鑾峰彇鎵�鏈夌爜鍨涘彛
- List<Dt_StationManger> stationMangersMD = stationMangers.Where(x => x.StationDeviceCode == device.DeviceCode && x.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt()).ToList();
- while (true)
+ catch (Exception ex)
{
- if (stationMangersMD.Count > 0)
- {
- foreach (var item in stationMangersMD)
- {
- DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode && x.DeviceProParamType == nameof(R_CLineCPHDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
- if (deviceProRead != null)
- {
- R_CLineCPHChannelInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_CLineCPHChannelInfo>(deviceProRead.DeviceProAddress);
- //鑾峰彇鐮佸灈鍙ｄ换鍔℃洿鏂颁换鍔＄姸鎬�
- if (conveyorLineInfoRead != null && conveyorLineInfoRead.R_State == 5 && conveyorLineInfoRead.R_TaskNo > 0)
- {
- Dt_PackaxisTask packaxisTask = _packaxisTaskRepository.QueryFirst(x => x.PackTaskNum == conveyorLineInfoRead.R_TaskNo && x.NextAddress == item.StationCode && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt() && x.DeviceCode == item.StationDeviceCode);
- if (packaxisTask != null)
- {
- Dt_PackaxisTask packaxisTaskOld = _packaxisTaskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.MD_Executing.ObjToInt() && x.DeviceCode == item.StackerCraneCode);
- if (packaxisTaskOld != null)
- {
- WriteError(item.StationName, $"鐮佸灈{item.StackerCraneCode}姝ｆ墽琛屼换鍔packaxisTaskOld.PackTaskNum},鏃犳硶缁х画涓嬪彂");
- }
- else
- {
- packaxisTask.CurrentAddress = item.StationCode;
- packaxisTask.NextAddress = packaxisTask.TargetAddress;
- packaxisTask.DeviceCode = item.StackerCraneCode;
- packaxisTask.TaskState = TaskStatusEnum.MD_Executing.ObjToInt();
- _packaxisTaskRepository.UpdateData(packaxisTask);
- }
- }
- else
- {
- WriteError(item.StationName, $"鏈壘鍒颁换鍔conveyorLineInfoRead.R_TaskNo}淇℃伅");
- }
- Thread.Sleep(2000);
- }
- }
- }
- }
- else
- {
- WriteError(nameof(ConveyorLineJob_CPH), $"閿欒淇℃伅锛氭湭鎵惧埌鐮佸灈鍙ｄ俊鎭�");
- }
+ WriteError($"绾跨▼ {Thread.CurrentThread.ManagedThreadId}", $"寮傚父:{ex.Message}");
+ Thread.Sleep(1500);
+ shouldRestart = true;
}
- }
- catch (Exception ex)
- {
- Thread.Sleep(1000);
}
});
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs"
index 9882eeb..2fb32e2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs"
@@ -82,7 +82,6 @@
{
foreach (var item in stationMangers)
{
-
short Allow = device.GetValue<R_MDDB, short>(R_MDDB.R_MDAllow, item.StackerCraneCode);
#region 璇诲彇宸ヤ綅鐘舵��
short R_MDStatus1 = device.GetValue<R_MDDB, short>(R_MDDB.R_MDStatus1, item.StackerCraneCode);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/taskinfo/task.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/taskinfo/task.vue"
index 3a5627b..adb65fb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/taskinfo/task.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/taskinfo/task.vue"
@@ -275,6 +275,13 @@
width: 100,
align: "left",
},
+ {
+ field: "taskLength",
+ title: "鐗╂枡骞呭",
+ type: "int",
+ width: 100,
+ align: "left",
+ },
]);
const detail = ref({
cnName: "#detailCnName",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/taskinfo/task_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/taskinfo/task_hty.vue"
index 7a93902..9f05fb9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/taskinfo/task_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/taskinfo/task_hty.vue"
@@ -274,6 +274,13 @@
width: 100,
align: "left",
},
+ {
+ field: "taskLength",
+ title: "鐗╂枡骞呭",
+ type: "int",
+ width: 100,
+ align: "left",
+ }
]);
const detail = ref({
cnName: "#detailCnName",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/StockEnum/OutLockStockStatusEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/StockEnum/OutLockStockStatusEnum.cs"
index 0f1cd5d..fd619fb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/StockEnum/OutLockStockStatusEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/StockEnum/OutLockStockStatusEnum.cs"
@@ -14,6 +14,7 @@
/// 2锛氬嚭搴撳畬鎴�<br/>
/// 3锛氭嫞閫夊畬鎴�<br/>
/// 99锛氭挙閿�<br/>
+ /// 100锛氬叧闂�<br/>
/// </summary>
public enum OutLockStockStatusEnum
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
index 09f732a..f7a7320 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
@@ -82,10 +82,16 @@
OutCarton = 360,
/// <summary>
+ /// 浜屾ゼ绾哥渚涙枡
+ /// </summary>
+ [Description("绾告澂绾哥墖渚涙枡")]
+ OutScrapsPaper = 370,
+
+ /// <summary>
/// 鏃犵汉甯冩穻鑶滃嚭搴�
/// </summary>
[Description("鏃犵汉甯冩穻鑶滃嚭搴�")]
- OutWFBLM = 370,
+ OutWFBLM = 380,
/// <summary>
/// 鍐插垏鍖哄嚭搴�
@@ -145,15 +151,33 @@
/// 鍒嗗垏鍗婃垚鍝佸叆搴�
/// </summary>
[Description("鍒嗗垏鍗婃垚鍝佸叆搴�")]
- PartOffInbound = 695,
+ PartOffInbound = 680,
+
+ /// <summary>
+ /// 妯″垏鍗婃垚鍝佸叆搴�
+ /// </summary>
+ [Description("妯″垏鍗婃垚鍝佸叆搴�")]
+ DieCutInbound = 685,
+
+ /// <summary>
+ /// 鍐插垏鍗婃垚鍝佸叆搴�
+ /// </summary>
+ [Description("鍐插垏鍗婃垚鍝佸叆搴�")]
+ PunchingInbound = 690,
/// <summary>
/// 鏃犵汉甯冨崐鎴愬搧鍏ュ簱
/// </summary>
[Description("鏃犵汉甯冨崐鎴愬搧鍏ュ簱")]
- WFBYLInbound = 700,
+ WFBYLInbound = 695,
/// <summary>
+ /// 鏃犵汉甯冩穻鑶滃崐鎴愬搧鍏ュ簱
+ /// </summary>
+ [Description("鏃犵汉甯冩穻鑶滃崐鎴愬搧鍏ュ簱")]
+ WFBLMYLInbound = 700,
+
+ /// <summary>
/// 绾稿紶娣嬭啘鍗婃垚鍝佸叆搴�
/// </summary>
[Description("绾稿紶娣嬭啘鍗婃垚鍝佸叆搴�")]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPickInfoDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPickInfoDTO.cs"
index 6fbc529..66ab28c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPickInfoDTO.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPickInfoDTO.cs"
@@ -41,7 +41,7 @@
/// 棰嗙敤鍛樺伐
/// </summary>
[PropertyValidate("棰嗙敤鍛樺伐", NotNullAndEmpty = true)]
- public long EmployeeName { get; set; }
+ public string EmployeeName { get; set; }
/// <summary>
/// 棰嗙敤鏄庣粏
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IProStockViewService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IProStockViewService.cs"
index 8460ffe..ee4c191 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IProStockViewService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IProStockViewService.cs"
@@ -13,5 +13,6 @@
PageGridData<ProStockViewDTO> GetPageData(PageDataOptions options);
object GetDetailPage(PageDataOptions pageData);
+ WebResponseContent Export(PageDataOptions options);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs"
index 323451d..22ae0ea 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs"
@@ -34,6 +34,11 @@
/// </summary>
List<Dt_StockInfo> GetUseableStocks(string materielCode, decimal width, int warehoseId);
/// <summary>
+ /// 鑾峰彇鑰佸巶缂撳瓨鍙敤搴撳瓨
+ /// </summary>
+ /// <returns></returns>
+ List<Dt_StockInfo> GetUseOldCacheStocks(string materielCode, decimal width);
+ /// <summary>
/// 鑾峰彇鍙娇鐢ㄥ簱瀛�
/// </summary>
List<Dt_StockInfo> GetUseableStocks(string materielCode, int warehoseId);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/MESProInOrderInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/MESProInOrderInfoService.cs"
index e06b88d..9934c3f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/MESProInOrderInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/MESProInOrderInfoService.cs"
@@ -53,7 +53,7 @@
List<Dt_MESProInOrderInfo>? mESProInOrderInfos = BaseDal.QueryData(x => x.ProductOrderNo == orderStopDTO.ProductOrderNo && x.MESProInStatus != InOrderStatusEnum.鍏抽棴.ObjToInt());
if (mESProInOrderInfos == null || mESProInOrderInfos.Count <= 0)
{
- return content.Error($"鎴愬搧鎴栧崐鎴愬搧宸ュ崟{nameof(MESOrderStopDTO.ProductOrderNo)}{orderStopDTO.ProductOrderNo}涓嶅瓨鍦ㄦ垨宸插叧闂�");
+ return content.Error($"鎴愬搧宸ュ崟{nameof(MESOrderStopDTO.ProductOrderNo)}{orderStopDTO.ProductOrderNo}涓嶅瓨鍦ㄦ垨宸插叧闂�");
}
mESProInOrderInfos.ForEach(x =>
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/ReturnBSTOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/ReturnBSTOrderService.cs"
index af724d0..8cb574f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/ReturnBSTOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/ReturnBSTOrderService.cs"
@@ -4,6 +4,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.MaterielEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
@@ -48,134 +49,99 @@
WebResponseContent content = new WebResponseContent();
try
{
- List<Dt_ReturnBSTOrder> OldreturnBSTOrders = BaseDal.Db.Queryable<Dt_ReturnBSTOrder>().Includes(x => x.Details).ToList();
List<Dt_StockInfo> ExiststockInfos = _stockInfoRepository.QueryData(x=>x.WarehouseId==WarehouseEnum.LLDOldCache.ObjToInt());
//鏂板
List<BSTReturnOrderDTO> bSTReturnOrderDTOsAdd = bSTReturnOrderDTOs.Where(x => x.Way == 1).ToList();
+ List<BSTReturnOrderDTOItem>? bSTReturnOrderDTOItemsAdd = null;
//淇敼
List<BSTReturnOrderDTO> bSTReturnOrderDTOsUpdate = bSTReturnOrderDTOs.Where(x => x.Way == 2).ToList();
- //鍒犻櫎
- List<BSTReturnOrderDTO> bSTReturnOrderDTOsDel = bSTReturnOrderDTOs.Where(x => x.Way == 3).ToList();
+ List<BSTReturnOrderDTOItem>? bSTReturnOrderDTOItemsUp = null;
//鑾峰彇鎵�鏈夌墿鏂�
List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && x.MaterialSourceId != 0);
-
- List<Dt_ReturnBSTOrder> returnAddBSTOrders = new List<Dt_ReturnBSTOrder>();
- List<Dt_ReturnBSTOrder> returnUpdateBSTOrders = new List<Dt_ReturnBSTOrder>();
- List<Dt_ReturnBSTOrder> returnDeleteBSTOrders = new List<Dt_ReturnBSTOrder>();
- List<Dt_ReturnBSTOrderDetail> returnBSTOrderDetailsDel = new List<Dt_ReturnBSTOrderDetail>();
+ if (bSTReturnOrderDTOsAdd!=null && bSTReturnOrderDTOsAdd.Count>0)
+ {
+ bSTReturnOrderDTOItemsAdd = bSTReturnOrderDTOsAdd.SelectMany(x => x.BstPaperWreturnDetails).ToList();
+ }
+ if (bSTReturnOrderDTOsUpdate != null && bSTReturnOrderDTOsUpdate.Count > 0)
+ {
+ bSTReturnOrderDTOItemsUp = bSTReturnOrderDTOsUpdate.SelectMany(x => x.BstPaperWreturnDetails).ToList();
+ }
List<Dt_StockInfo> stockInfosUpdate = new List<Dt_StockInfo>();
//鏂板
- if (bSTReturnOrderDTOsAdd.Count > 0)
+ if (bSTReturnOrderDTOItemsAdd!=null && bSTReturnOrderDTOItemsAdd.Count > 0)
{
- //鍒ゆ柇鍗曟嵁
- Dt_ReturnBSTOrder? ExistAddReturn = OldreturnBSTOrders.FirstOrDefault(x => bSTReturnOrderDTOsAdd.Select(x => x.PaperWreturnId).Contains(x.PaperWreturnId));
- if (ExistAddReturn != null)
- {
- return content.Error($"閫�鏂欏崟{nameof(BSTReturnOrderDTO.PaperWreturnId)}:{ExistAddReturn.PaperWreturnId}宸插瓨鍦�");
- }
- List<BSTReturnOrderDTOItem> bSTReturnOrderDTOItemsAdd = bSTReturnOrderDTOsAdd.SelectMany(x => x.BstPaperWreturnDetails).ToList();
//鍒ゆ柇鏄惁瀛樺湪鐗╂枡
BSTReturnOrderDTOItem? bSTReturnOrderDTOItem = bSTReturnOrderDTOItemsAdd.FirstOrDefault(x => !materielInfos.Select(x => x.MaterialSourceId).Contains(x.MaterialId));
if (bSTReturnOrderDTOItem != null)
{
return content.Error($"閫�鏂檣nameof(bSTReturnOrderDTOItem.Barcode)}:{bSTReturnOrderDTOItem.Barcode}鐗╂枡{nameof(BSTReturnOrderDTOItem.MaterialId)}:{bSTReturnOrderDTOItem.MaterialId}涓嶅瓨鍦�");
}
- //楠岃瘉閫�鏂欐潯鐮佹槸鍚﹀湪搴撳瓨涓�
- var ExiststockInfo = bSTReturnOrderDTOItemsAdd.FirstOrDefault(x => !ExiststockInfos.Select(x => x.PalletCode).Contains(x.Barcode));
- if (ExiststockInfo != null)
+ foreach (var item in bSTReturnOrderDTOItemsAdd)
{
- return content.Error($"閫�鏂欐潯鐮亄nameof(ExiststockInfo.Barcode)}:{ExiststockInfo.Barcode}鐗╂枡鏈湪鑰佸巶鏆傚瓨鍖�");
- }
- //鑾峰彇瀵瑰簲搴撳瓨淇搴撳瓨鏁伴噺
- List<Dt_StockInfo> returnStockinfos = ExiststockInfos.Where(x => bSTReturnOrderDTOItemsAdd.Select(x => x.Barcode).Contains(x.PalletCode)).ToList();
- foreach (var item in bSTReturnOrderDTOsAdd)
- {
- if (bSTReturnOrderDTOsUpdate.FirstOrDefault(x => x.PaperWreturnId == item.PaperWreturnId) != null)
+ //灏嗕笉瀛樺湪鐨勫簱瀛樿烦杩�
+ Dt_StockInfo? stockReturn = ExiststockInfos.FirstOrDefault(x => x.PalletCode == item.Barcode);
+ if (stockReturn == null)
{
continue;
}
- List<Dt_ReturnBSTOrderDetail> bSTOrderDetails = item.BstPaperWreturnDetails.Select(x => _mapper.Map<Dt_ReturnBSTOrderDetail>(x)).ToList();
- Dt_ReturnBSTOrder returnBSTOrder = _mapper.Map<Dt_ReturnBSTOrder>(item);
- returnBSTOrder.Details = bSTOrderDetails;
- foreach (var detail in bSTOrderDetails)
+ if (bSTReturnOrderDTOItemsUp!=null && bSTReturnOrderDTOItemsUp.FirstOrDefault(x => x.Barcode == item.Barcode) != null)
{
- Dt_StockInfo stockReturn = stockInfosUpdate.FirstOrDefault(x => x.PalletCode == detail.Barcode);
- stockReturn.MaterielId = detail.MaterialId;
- stockReturn.MaterielCode = detail.MaterialNo;
- stockReturn.MaterielWide=detail.MaterialWide;
- stockReturn.MaterielThickness = detail.MaterialThick;
- stockReturn.MaterielWeight = detail.Qty;
- stockReturn.StockLength = detail.ProcurementLength;
- stockReturn.StockStatus = StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt();
- stockInfosUpdate.Add(stockReturn);
+ continue;
}
- returnAddBSTOrders.Add(returnBSTOrder);
+ stockReturn.MaterielId = item.MaterialId;
+ stockReturn.MaterielCode = item.MaterialNo;
+ stockReturn.MaterielWide = item.W;
+ stockReturn.MaterielThickness = item.Thick;
+ stockReturn.MaterielWeight = item.Qty;
+ stockReturn.StockLength = item.ProcurementLength;
+ stockReturn.StockOutLength = 0;
+ stockReturn.IsPick = WhetherEnum.False.ObjToInt();
+ stockReturn.IsFull = WhetherEnum.True.ObjToInt();
+ stockReturn.StockStatus = StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt();
+ stockInfosUpdate.Add(stockReturn);
}
}
//鏇存柊
- if (bSTReturnOrderDTOsUpdate.Count > 0)
+ if (bSTReturnOrderDTOItemsUp != null && bSTReturnOrderDTOItemsUp.Count > 0)
{
- //瀛樺湪鐨勯噰璐崟
- List<Dt_ReturnBSTOrder>? ExistreturnBSTOrders = OldreturnBSTOrders.Where(x => bSTReturnOrderDTOsUpdate.Select(x => x.PaperWreturnId).Contains(x.PaperWreturnId)).Distinct().ToList();
-
- foreach (var item in bSTReturnOrderDTOsUpdate)
+ //鑾峰彇瀵瑰簲搴撳瓨淇搴撳瓨鏁伴噺
+ List<Dt_StockInfo> returnStockinfos = ExiststockInfos.Where(x => bSTReturnOrderDTOItemsUp.Select(x => x.Barcode).Contains(x.PalletCode)).ToList();
+ foreach (var item in bSTReturnOrderDTOItemsUp)
{
- Dt_ReturnBSTOrder? returnBSTOrderUpdate = ExistreturnBSTOrders.FirstOrDefault(x => x.PaperWreturnId == item.PaperWreturnId);
- //濡傛灉璁㈠崟宸插瓨鍦ㄥ垯杩涜鏇存敼
- if (returnBSTOrderUpdate != null)
+ Dt_StockInfo? returnUpdate = stockInfosUpdate.FirstOrDefault(x => x.PalletCode == item.Barcode);
+ //濡傛灉淇敼宸插瓨鍦紝鍦ㄥ師鍩虹涓婃洿鏂�
+ if (returnUpdate != null)
{
- if (returnBSTOrderUpdate.ReturnOrderStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- return content.Error($"閫�鏂檣nameof(returnBSTOrderUpdate.PaperWreturnId)}:{returnBSTOrderUpdate.PaperWreturnId}璁㈠崟閫�鏂欏叆搴撲腑锛屼笉鍙洿鏀�");
- }
- returnBSTOrderDetailsDel.AddRange(returnBSTOrderUpdate.Details);
-
//鏇存柊
- List<Dt_ReturnBSTOrderDetail> bSTOrderDetails = item.BstPaperWreturnDetails.Select(x => _mapper.Map<Dt_ReturnBSTOrderDetail>(x)).ToList();
- bSTOrderDetails.ForEach(x =>
- {
- x.ReturnBSTOrderId = returnBSTOrderUpdate.Id;
- });
- returnBSTOrderUpdate.Details = bSTOrderDetails;
- returnBSTOrderUpdate.PaperWreturnId = item.PaperWreturnId;
- returnBSTOrderUpdate.PaperWreturnNo = item.PaperWreturnNo;
- returnBSTOrderUpdate.EmployeeName = item.EmployeeName;
- returnBSTOrderUpdate.WreturnDate = DateTimeOffset.FromUnixTimeMilliseconds(item.WreturnDate).DateTime;
- returnUpdateBSTOrders.Add(returnBSTOrderUpdate);
+ returnUpdate.MaterielThickness = item.Thick;
+ returnUpdate.MaterielWeight = item.Qty;
+ returnUpdate.StockLength = item.ProcurementLength;
}
- else //濡傛灉涓嶅瓨鍦ㄥ垯杩涜鏂板
+ else
{
- List<Dt_ReturnBSTOrderDetail> bSTOrderDetails = item.BstPaperWreturnDetails.Select(x => _mapper.Map<Dt_ReturnBSTOrderDetail>(x)).ToList();
- Dt_ReturnBSTOrder returnBSTOrder = _mapper.Map<Dt_ReturnBSTOrder>(item);
- returnBSTOrder.Details = bSTOrderDetails;
- foreach (var detail in bSTOrderDetails)
+ //灏嗕笉瀛樺湪鐨勫簱瀛樿烦杩�
+ Dt_StockInfo? stockReturn = ExiststockInfos.FirstOrDefault(x => x.PalletCode == item.Barcode);
+ if (stockReturn == null)
{
- Dt_StockInfo stockReturn = stockInfosUpdate.FirstOrDefault(x => x.PalletCode == detail.Barcode);
- stockReturn.MaterielId = detail.MaterialId;
- stockReturn.MaterielCode = detail.MaterialNo;
- stockReturn.MaterielWide = detail.MaterialWide;
- stockReturn.MaterielThickness = detail.MaterialThick;
- stockReturn.MaterielWeight = detail.Qty;
- stockReturn.StockLength = detail.ProcurementLength;
- stockReturn.StockStatus = StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt();
- stockInfosUpdate.Add(stockReturn);
+ continue;
}
- returnAddBSTOrders.Add(returnBSTOrder);
+ stockReturn.MaterielId = item.MaterialId;
+ stockReturn.MaterielCode = item.MaterialNo;
+ stockReturn.MaterielWide = item.W;
+ stockReturn.MaterielThickness = item.Thick;
+ stockReturn.MaterielWeight = item.Qty;
+ stockReturn.StockLength = item.ProcurementLength;
+ stockReturn.StockOutLength = 0;
+ stockReturn.IsPick = WhetherEnum.False.ObjToInt();
+ stockReturn.IsFull = WhetherEnum.True.ObjToInt();
+ stockReturn.StockStatus = StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt();
+ stockInfosUpdate.Add(stockReturn);
}
}
-
- }
- //鍒犻櫎
- if (bSTReturnOrderDTOsDel.Count > 0)
- {
-
}
//鏇存柊鏁版嵁
_unitOfWorkManage.BeginTran();
- BaseDal.Db.InsertNav(returnAddBSTOrders).Include(x => x.Details).ExecuteCommand();
_stockInfoRepository.UpdateData(stockInfosUpdate);
- _returnBSTOrderDetailRepository.DeleteData(returnBSTOrderDetailsDel);
- BaseDal.Db.UpdateNav(returnUpdateBSTOrders).Include(x => x.Details).ExecuteCommand();
_unitOfWorkManage.CommitTran();
content.OK("鎺ユ敹鎴愬姛");
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
index 75af67b..d4ac250 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
@@ -196,7 +196,7 @@
/// </summary>
[ImporterHeader(Name = "鐗╂枡鏁伴噺")]
[ExporterHeader(DisplayName = "鐗╂枡鏁伴噺")]
- [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "鐗╂枡鏁伴噺")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鏁伴噺")]
public decimal Quantity { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs"
index eb116ca..506accf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs"
@@ -5,8 +5,10 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Helper;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundRepository;
@@ -72,8 +74,10 @@
foreach (var item in groupDetails)
{
decimal needQuantity = item.XqLen;
- //鑾峰彇鍙敤搴撳瓨
- List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(item.MaterialNo, item.Width, outBSTOrders.FirstOrDefault().WarehouseId).Where(x=>!outStocks.Select(x=>x.PalletCode).Contains(x.PalletCode)).ToList();
+ //鑾峰彇鑰佸巶缂撳瓨鍙敤搴撳瓨
+ List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseOldCacheStocks(item.MaterialNo, item.Width) ?? new List<Dt_StockInfo>();
+ //鑾峰彇绔嬪簱鍙敤搴撳瓨
+ stockInfos.AddRange(_stockService.StockInfoService.GetUseableStocks(item.MaterialNo, item.Width, outBSTOrders.FirstOrDefault().WarehouseId).Where(x=>!outStocks.Select(x=>x.PalletCode).Contains(x.PalletCode)).ToList());
if (!stockInfos.Any())
{
continue;
@@ -132,7 +136,7 @@
}
- locationInfos.AddRange(_basicRepository.LocationInfoRepository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList()));
+ locationInfos.AddRange(_basicRepository.LocationInfoRepository.GetLocationInfos(outStocks.Where(x=>!x.LocationCode.IsNullOrEmpty() && !locationInfos.Select(x=>x.LocationCode).Contains(x.LocationCode)).Select(x => x.LocationCode).ToList()));
}
return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos);
@@ -144,6 +148,10 @@
{
try
{
+ stockInfos.Where(x => x.LocationCode.IsNullOrEmpty()).ToList().ForEach(x =>
+ {
+ x.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
+ });
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
BaseDal.UpdateData(outboundOrderDetails);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
index c26b099..09d08f9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutStockLockInfoService.cs"
@@ -136,7 +136,7 @@
OrderType=OutOrderTypeEnum.OutSGPick.ObjToInt(),
MaterielCode = outSGOrderDetail.MaterialNo,
BatchNo = outSGOrderDetail.BoardFluteNo, //妤炲埆鎵规
- LocationCode = outStock.LocationCode,
+ LocationCode = outStock.LocationCode.IsNullOrEmpty() ? "鑰佸巶缂撳瓨鍖�": outStock.LocationCode,
MaterielName = outStock.MaterielName,
OrderDetailId = outSGOrderDetail.Id,
OrderNo = outSGOrder.OrderId,
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
index c5458b1..444f52a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
@@ -206,6 +206,14 @@
return BaseDal.GetStockInfos(materielCode, width, locationCodes);
}
+ /// <summary>
+ /// 鑾峰彇鑰佸巶缂撳瓨鍙敤搴撳瓨
+ /// </summary>
+ /// <returns></returns>
+ public List<Dt_StockInfo> GetUseOldCacheStocks(string materielCode, decimal width)
+ {
+ return Db.Queryable<Dt_StockInfo>().Where(x => x.MaterielCode.StartsWith(materielCode) && x.StockStatus == StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt() && x.MaterielWide == width && x.StockOutLength <= 0 && x.StockLength > 0).OrderBy(x => x.CreateDate).ToList();
+ }
public List<Dt_StockInfo> GetUseableStocks(string materielCode, int warehoseId)
{
List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
index 5d2fb42..1135b03 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
@@ -244,13 +244,9 @@
return content.Error($"鏈壘鍒版潯鐮亄returnMaterial.BarCode}鐗╂枡淇℃伅");
}
//鍒ゆ柇
- if (returnMaterial.Thickness <= 0 && materielInfo.WarehouseId==WarehouseEnum.LLDYL.ObjToInt())
+ if ((returnMaterial.Thickness <= 0 || returnMaterial.Wide <= 0)&& materielInfo.WarehouseId==WarehouseEnum.LLDYL.ObjToInt())
{
- return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞涓嶈兘灏忎簬0");
- }
- if (returnMaterial.Wide <= 0 && materielInfo.WarehouseId == WarehouseEnum.LLDYL.ObjToInt())
- {
- return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞涓嶈兘灏忎簬0");
+ return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞鎴栧箙瀹戒笉鑳藉皬浜�0");
}
Dt_StockInfo? stockInfoOld = stockInfosOld.FirstOrDefault(x => x.PalletCode == returnMaterial.BarCode);
if (stockInfoOld != null)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
index 3955caa..e98dcbd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
@@ -194,13 +194,24 @@
{
return content;
}
- List<int> ints = _outboundRepository.OutSGOrderDetailRepository.QueryData(x=>x.Id>outDetailId).Select(x=>x.Id).ToList();
- int[] reseponse= new int[ints.Count];
- for (int i = 0; i < ints.Count; i++)
+ //鑾峰彇鎵�鏈夌殑鍑哄簱璇︽儏鍒ゆ柇鏄惁婊¤冻鍑哄簱閲忓皬浜�5涓囦笖灏忎簬17鍗�
+ List<Dt_OutStockLockInfo> outStockLockInfos = _outboundRepository.OutStockLockInfoRepository.QueryData(x=>x.OrderType==OutOrderTypeEnum.OutSGPick.ObjToInt() && x.Status<=OutLockStockStatusEnum.鍏抽棴.ObjToInt());
+ decimal sumAssignQty = outStockLockInfos.Sum(x => x.AssignQuantity);
+ int outCount= outStockLockInfos.Select(x=>x.PalletCode).Distinct().Count();
+ if (sumAssignQty < AppSettings.Get("OutSGLength").ObjToInt() && outCount < AppSettings.Get("OutSGCount").ObjToInt())
{
- reseponse[i] = ints[i];
+ List<int> ints = _outboundRepository.OutSGOrderDetailRepository.QueryData(x => x.Id > outDetailId).Select(x => x.Id).ToList();
+ int[] reseponse = new int[ints.Count];
+ for (int i = 0; i < ints.Count; i++)
+ {
+ reseponse[i] = ints[i];
+ }
+ content.Message = CreateSGOutboundTasks(reseponse).Message;
}
- content.Message = CreateSGOutboundTasks(reseponse).Message;
+ else
+ {
+ return content.Error($"褰撳墠鍑哄簱閲忥細{sumAssignQty},褰撳墠鍑哄簱鍗锋暟锛歿outCount},涓嶆弧瓒冲皬浜�5涓囦笖灏忎簬17鍗峰嚭搴撴潯浠�");
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
index c95cf6f..a441c4b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
@@ -197,7 +197,7 @@
UpdateStock(stockInfoOld, weight, thickness, wide);
return content.OK($"涓存椂鍏ュ簱{stockInfoOld.RfidCode}");
}
- else if (stockInfoOld != null && stockInfoOld.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && stockInfoOld.StockStatus == StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt() && stockInfoOld.IsPick==WhetherEnum.False.ObjToInt() && stationCode.IsNotEmptyOrNull())
+ else if (stockInfoOld != null && stockInfoOld.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && stockInfoOld.StockStatus == StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt() && stationCode.IsNotEmptyOrNull())
{
decimal oldQty = stockInfoOld.StockLength;
//璋冪敤鏇存柊閫�鏂欏簱瀛樺強涓婃姤閲嶉噺
@@ -348,17 +348,17 @@
WebResponseContent content = new WebResponseContent();
try
{
+ if (thickness < 400)
+ {
+ throw new Exception($"RFID{stockInfoOld.RfidCode}鏉＄爜{stockInfoOld.PalletCode}鐩村緞灏忎簬400mm");
+ }
BSTResponse<BSTStockInfoDTO> bSTResponse = _invokeERPService.BSTStockAsync(stockInfoOld.PalletCode).DeserializeObject<BSTResponse<BSTStockInfoDTO>>();
if (bSTResponse.Code == 500)
{
throw new Exception($"鏈壘鍒版潯鐮亄stockInfoOld.PalletCode}涓�鏈烢RP搴撳瓨涓嶅瓨鍦�");
}
-
BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"涓�鏈烢RP鏈繑鍥瀧stockInfoOld.PalletCode}鐨勫簱瀛樹俊鎭�");
- if (stockInfoOld.StockStatus == StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt())
- {
- stockInfoOld.IsPick = WhetherEnum.False.ObjToInt();
- }
+ stockInfoOld.IsPick = WhetherEnum.False.ObjToInt();
decimal stockLength = bSTStockInfoDTO.StockMeter;
if (weight != bSTStockInfoDTO.Qty && weight < stockInfoOld.InitialWeight)
{
@@ -390,10 +390,6 @@
stockInfoOld.StockLength = stockLength;
stockInfoOld.StockOutLength = 0;
stockInfoOld.WarehouseId = WarehouseEnum.LLDYL.ObjToInt();
- if (thickness < 400)
- {
- throw new Exception($"RFID{stockInfoOld.RfidCode}鏉＄爜{stockInfoOld.PalletCode}鐩村緞灏忎簬400mm");
- }
content.OK("鎴愬姛",data:stockInfoOld);
}
catch (Exception ex)
@@ -926,22 +922,6 @@
bool RoadwayType = stockInfo.PalletType == LocationTypeEnum.MediumPallet.ObjToInt();
//鑾峰彇鍒嗛厤
List<LocationCount> locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo.Contains("YLDual") && (stockInfo.PalletType == LocationTypeEnum.MediumPallet.ObjToInt() ? x.LocationType == LocationTypeEnum.MediumPallet.ObjToInt() : x.LocationType == LocationTypeEnum.SmallPallet.ObjToInt())).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).OrderBy(x => x.RoadwayNo).ToList();
- if (RoadwayType)
- {
- foreach (var item in locationCounts)
- {
- if (item.RoadwayNo.Contains("YLDual"))
- {
- int count = Db.Queryable<Dt_LocationInfo>()
- .Where(x => x.WarehouseId == warehouse.WarehouseId
- && x.LocationStatus == (int)LocationStatusEnum.Free
- && x.EnableStatus == (int)EnableStatusEnum.Normal
- && x.LocationType == LocationTypeEnum.MediumPallet.ObjToInt()
- && x.RoadwayNo == item.RoadwayNo).Count();
- item.Count = count;
- }
- }
- }
roadwayNo = HandleRoadway(locationCounts, warehouse, ErrorRoadway ? roadways : null);
}
}
@@ -1842,7 +1822,7 @@
return content.Error("浼犲叆淇℃伅涓虹┖");
}
//鑾峰彇鎵�鏈夋垚鍝侊紝鍗婃垚鍝佷俊鎭�
- List<Dt_MESProInOrderInfo> proInOrderInfos = _inboundRepository.MESProInOrderInfoRepository.QueryData();
+ List<Dt_MESProInOrderInfo> proInOrderInfosOld = _inboundRepository.MESProInOrderInfoRepository.QueryData();
//鑾峰彇鎵�鏈夌墿鏂欎俊鎭�
List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
@@ -1855,12 +1835,12 @@
List<Dt_AGVStationInfo> aGVStationInfos = _basicRepository.AGVStationInfoRepository.QueryData(x => !string.IsNullOrEmpty(x.MESPointCode));
//鍒ゆ柇鏄惁瀛樺湪閲嶅
- MESProInDTO? proInDTO = proInDTOs.FirstOrDefault(x => x.IsMantissa == false && proInOrderInfos.Select(x => x.BarCode).Contains(x.BarCode));
+ MESProInDTO? proInDTO = proInDTOs.FirstOrDefault(x => x.IsMantissa == false && proInOrderInfosOld.Select(x => x.BarCode).Contains(x.BarCode));
if (proInDTO != null)
{
return content.Error($"{proInDTO.ProductOrderNo}鐢熶骇宸ュ崟{proInDTO.BarCode}鏉＄爜宸插瓨鍦�");
}
- Dt_MESProInOrderInfo? proInOrderInfo = proInOrderInfos.FirstOrDefault(x => x.MESProInStatus == InOrderStatusEnum.鍏抽棴.ObjToInt() && proInDTOs.Select(x => x.ProductOrderNo).Distinct().Contains(x.ProductOrderNo));
+ Dt_MESProInOrderInfo? proInOrderInfo = proInOrderInfosOld.FirstOrDefault(x => x.MESProInStatus == InOrderStatusEnum.鍏抽棴.ObjToInt() && proInDTOs.Select(x => x.ProductOrderNo).Distinct().Contains(x.ProductOrderNo));
if (proInOrderInfo != null)
{
return content.Error($"{proInOrderInfo.ProductOrderNo}鐢熶骇宸ュ崟宸插叧闂�");
@@ -1869,6 +1849,11 @@
foreach (var item in proInDTOs)
{
Dt_MaterielInfo materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialCode);
+ //鍒ゆ柇
+ if ((item.Thickness <= 0 || item.Wide <= 0) && materielInfo.WarehouseId == WarehouseEnum.LLDYL.ObjToInt())
+ {
+ return content.Error($"鐗╂枡{item.MaterialCode}鏉＄爜{item.BarCode}鐩村緞鎴栧箙瀹戒笉鑳藉皬浜�0");
+ }
if (materielInfo.MaterielSourceType != MaterielTypeEnum.鎴愬搧.ObjToInt())
{
Dt_AGVStationInfo? CheckPointCode = aGVStationInfos.FirstOrDefault(x => x.MESPointCode == item?.PointCode);
@@ -1884,6 +1869,11 @@
Dt_MESProInOrderInfo AddproInOrderInfo = _mapper.Map<Dt_MESProInOrderInfo>(item);
AddproInOrderInfo.WarehouseId = materielInfo.WarehouseId;
AddproInOrderInfo.MESProOrderType = materielInfo.MaterielSourceType;
+ //灏忎簬550骞呭鍒欎笉鑳芥惉杩�
+ if (item.Wide < 550 && materielInfo.WarehouseId == WarehouseEnum.LLDYL.ObjToInt())
+ {
+ AddproInOrderInfo.MESProInStatus=InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ }
AddMESProInOrders.Add(AddproInOrderInfo);
}
List<Dt_Task> tasks = new List<Dt_Task>();
@@ -1910,21 +1900,26 @@
PB_INV_PRODUCT_IN= pRODUCT_INItems
}) ?? throw new Exception("鍗婃垚鍝佸叆搴撴帴鍙ｈ姹傚け璐�");
//鐢熸垚鍗婃垚鍝佸叆搴�
- WebResponseContent webResponse = SemiProInbound(AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鍗婃垚鍝�.ObjToInt()).ToList());
- if (!webResponse.Status)
+ List<Dt_MESProInOrderInfo> semiProInOrderInfos = mESProInOrderInfos.Where(x => x.MESProInStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt()).ToList();
+ if (semiProInOrderInfos.Count>0)
{
- throw new Exception(webResponse.Message);
- }
- tasks = webResponse.Data as List<Dt_Task>;
- WebResponseContent taskResponse = PushTasksToWCS(tasks);
- if (!taskResponse.Status)
- {
- throw new Exception(taskResponse.Message);
+ WebResponseContent webResponse = SemiProInbound(AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鍗婃垚鍝�.ObjToInt()).ToList());
+ if (!webResponse.Status)
+ {
+ throw new Exception(webResponse.Message);
+ }
+ tasks = webResponse.Data as List<Dt_Task>;
+ WebResponseContent taskResponse = PushTasksToWCS(tasks);
+ if (!taskResponse.Status)
+ {
+ throw new Exception(taskResponse.Message);
+ }
}
}
- if (AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鎴愬搧.ObjToInt()).Count() > 0)
+ List<Dt_MESProInOrderInfo> proInOrderInfos = AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鎴愬搧.ObjToInt()).ToList();
+ if (proInOrderInfos.Count > 0)
{
- WebResponseContent webResponse = PushPackaxisTaskToWCS(AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鎴愬搧.ObjToInt()).ToList());
+ WebResponseContent webResponse = PushPackaxisTaskToWCS(proInOrderInfos);
if (!webResponse.Status)
{
throw new Exception(webResponse.Message);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
index eee9d01..4463a90 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
@@ -741,7 +741,7 @@
if (result.Item1 != null && result.Item1.Count > 0)
{
//鑾峰彇浠诲姟
- tasks = GetTasks(result.Item1, TaskTypeEnum.OldYLOutbound);
+ tasks = GetTasks(result.Item1.Where(x=> !x.LocationCode.IsNullOrEmpty()).ToList(), TaskTypeEnum.OldYLOutbound);
result.Item2.ForEach(x =>
{
if (result.Item3.FirstOrDefault(t=>t.OrderDetailId==x.Id)!=null)
@@ -751,7 +751,14 @@
});
result.Item3.ForEach(x =>
{
- x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
+ if (x.LocationCode== "鑰佸巶缂撳瓨鍖�")
+ {
+ x.Status = OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ }
+ else
+ {
+ x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
+ }
});
stockInfos = result.Item1;
@@ -829,42 +836,68 @@
WebResponseContent content = new WebResponseContent();
try
{
- //鏂板
- List<BSTPickInfoDTO> bSTPickInfosAdd = bSTPickInfoDTOs.Where(x => x.Way == 1).ToList();
- //鑾峰彇鏂板鏄庣粏棰嗘枡
- List<PaperMattakeDetailItem>? paperMattakeDetailItemsAdd = null;
- //淇敼
- List<BSTPickInfoDTO> bSTPickInfosUp = bSTPickInfoDTOs.Where(x => x.Way == 2).ToList();
- //鑾峰彇鏂板鏄庣粏棰嗘枡
- List<PaperMattakeDetailItem>? paperMattakeDetailItemsUp = null;
- if (bSTPickInfosAdd != null && bSTPickInfosAdd.Count > 0)
- {
- paperMattakeDetailItemsAdd = bSTPickInfosAdd.SelectMany(x => x.PaperMattakeDetails).ToList();
- }
- if (bSTPickInfosUp != null && bSTPickInfosUp.Count > 0)
- {
- paperMattakeDetailItemsUp = bSTPickInfosUp.SelectMany(x => x.PaperMattakeDetails).ToList();
- }
- //鑾峰彇鎵�鏈夊緟棰嗘枡鐨勫嚭搴撹鎯�
- List<Dt_OutStockLockInfo> outStockLockInfos = _outboundRepository.OutStockLockInfoRepository.QueryData(x => x.OrderType == OutOrderTypeEnum.OutSGPick.ObjToInt() && x.Status==OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt());
- #region 棰嗘枡閫昏緫
- if (paperMattakeDetailItemsAdd != null && paperMattakeDetailItemsAdd.Count > 0)
- {
- foreach (var item in paperMattakeDetailItemsAdd)
- {
- //鑾峰彇瀵瑰簲鐨�
- }
- }
- if (paperMattakeDetailItemsUp != null && paperMattakeDetailItemsUp.Count > 0)
+ //鑾峰彇棰嗘枡鏉＄爜鍙婂簱瀛�
+ List<string> lockCodes = bSTPickInfoDTOs.SelectMany(x => x.PaperMattakeDetails).Select(x=>x.Barcode).Distinct().ToList();
+ List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.QueryData(x=> lockCodes.Contains(x.PalletCode));
+ //鑾峰彇寰呴鏂欑殑鍑哄簱璇︽儏
+ List<Dt_OutStockLockInfo> outStockLockInfos = _outboundRepository.OutStockLockInfoRepository.QueryData(x => x.OrderType == OutOrderTypeEnum.OutSGPick.ObjToInt() && x.Status==OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && lockCodes.Distinct().ToList().Contains(x.PalletCode));
+ //鍑哄簱璇︽儏鐘舵�佹洿鏂�
+ if (outStockLockInfos.Count > 0)
{
- foreach (var item in paperMattakeDetailItemsUp)
+ outStockLockInfos.ForEach(x =>
{
-
+ x.Status = OutLockStockStatusEnum.鍏抽棴.ObjToInt();
+ });
+ }
+ List<int> BSTPickDetailsId = outStockLockInfos.Select(x => x.OrderDetailId).Distinct().ToList();
+ //鑾峰彇瀵瑰簲鎺掔▼
+ List<Dt_OutSGOrder> outSGOrders = BaseDal.Db.Queryable<Dt_OutSGOrder>().Where(x => x.OutSGOrderStatus < OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt()).Includes(x => x.Details)
+ .Where(x => x.Details
+ .Any(v =>
+ BSTPickDetailsId.Contains(v.Id))
+ ).OrderBy(x => x.CreateDate).ToList();
+ List<Dt_OutSGOrderDetail> orderDetails = new List<Dt_OutSGOrderDetail>();
+ //澶勭悊鎺掔▼
+ if (outSGOrders.Count>0)
+ {
+ orderDetails = outSGOrders.SelectMany(x=>x.Details).Where(x=> BSTPickDetailsId.Contains(x.Id)).ToList();
+ orderDetails.ForEach(x =>
+ {
+ x.OutSGOrderDetailStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ });
+ foreach (var item in outSGOrders)
+ {
+ int overCount = item.Details.Where(x=>x.OutSGOrderDetailStatus==OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt()).Count();
+ int thisCount = orderDetails.Where(x => x.OutSGOrderId == item.Id).Count();
+ if ((overCount + thisCount) == item.Details.Count)
+ {
+ item.OutSGOrderStatus = OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ }
}
-
+ }
+ //鑾峰彇鎵�鏈夊緟棰嗘枡鐨勫簱瀛�
+ #region 棰嗘枡閫昏緫
+ foreach (var item in stockInfos)
+ {
+ if (item.StockStatus==StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt())
+ {
+ item.StockLength = 0;
+ item.MaterielWeight = 0;
+ item.MaterielThickness = 0;
+ item.MaterielWide = 0;
+ item.StockOutLength = 0;
+ item.IsFull = WhetherEnum.True.ObjToInt();
+ item.IsPick = WhetherEnum.True.ObjToInt();
+ }
}
#endregion
+ _unitOfWorkManage.BeginTran();
+ _stockRepository.StockInfoRepository.UpdateData(stockInfos);
+ _outboundRepository.OutStockLockInfoRepository.UpdateData(outStockLockInfos);
+ _outboundRepository.OutSGOrderRepository.UpdateData(outSGOrders);
+ _outboundRepository.OutSGOrderDetailRepository.UpdateData(orderDetails);
+ _unitOfWorkManage.CommitTran();
}
catch (Exception ex)
{
@@ -970,90 +1003,90 @@
_unitOfWorkManage.BeginTran();
//鎿嶄綔鏁版嵁锛屽苟鍒嗛厤闇�姹傚簱瀛�
_outboundRepository.OutMESOrderRepository.AddData(AddoutMESOrders);
- List<Dt_OutMESOrder> mESOrders = _outboundRepository.OutMESOrderRepository.QueryData(x => AddoutMESOrders.Select(x => x.OutDetailId).Contains(x.OutDetailId));
- {
- List<Dt_Task> tasks = new List<Dt_Task>();
- List<Dt_ProStockInfo>? stockInfos = null;
- List<Dt_OutMESOrder>? Orders = null;
- List<Dt_OutStockLockInfo>? outStockLockInfos = null;
- List<Dt_LocationInfo>? locationInfos = null;
- {
- if (mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList().Count>0)
- {
- //鍒嗛厤搴撳瓨
- (List<Dt_ProStockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignProStockOutbound(mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList());
- if (result.Item1 != null && result.Item1.Count > 0)
- {
- //鍒涘缓浠诲姟
- tasks = GetTasks(result.Item1, result.Item3);
- result.Item3.ForEach(x =>
- {
- x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- });
- stockInfos = result.Item1;
- Orders = result.Item2;
- outStockLockInfos = result.Item3;
- locationInfos = result.Item4;
- }
- }
- }
- if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count>0)
- {
- BaseDal.AddData(tasks);
- stockInfos.ForEach(x =>
- {
- x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- });
- WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);
+ //List<Dt_OutMESOrder> mESOrders = _outboundRepository.OutMESOrderRepository.QueryData(x => AddoutMESOrders.Select(x => x.OutDetailId).Contains(x.OutDetailId));
+ //{
+ // List<Dt_Task> tasks = new List<Dt_Task>();
+ // List<Dt_ProStockInfo>? stockInfos = null;
+ // List<Dt_OutMESOrder>? Orders = null;
+ // List<Dt_OutStockLockInfo>? outStockLockInfos = null;
+ // List<Dt_LocationInfo>? locationInfos = null;
+ // {
+ // if (mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList().Count>0)
+ // {
+ // //鍒嗛厤搴撳瓨
+ // (List<Dt_ProStockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignProStockOutbound(mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()).ToList());
+ // if (result.Item1 != null && result.Item1.Count > 0)
+ // {
+ // //鍒涘缓浠诲姟
+ // tasks = GetTasks(result.Item1, result.Item3);
+ // result.Item3.ForEach(x =>
+ // {
+ // x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
+ // });
+ // stockInfos = result.Item1;
+ // Orders = result.Item2;
+ // outStockLockInfos = result.Item3;
+ // locationInfos = result.Item4;
+ // }
+ // }
+ // }
+ // if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count>0)
+ // {
+ // BaseDal.AddData(tasks);
+ // stockInfos.ForEach(x =>
+ // {
+ // x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ // });
+ // WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);
- if (!contentResponse.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error(contentResponse.Message);
- }
- }
- }
- {
- List<Dt_Task> tasks = new List<Dt_Task>();
- List<Dt_StockInfo>? stockInfos = null;
- List<Dt_OutMESOrder>? Orders = null;
- List<Dt_OutStockLockInfo>? outStockLockInfos = null;
- List<Dt_LocationInfo>? locationInfos = null;
- {
- if (mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt()).ToList().Count > 0)
- {
- //鍒嗛厤搴撳瓨
- (List<Dt_StockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignStockOutbound(mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt()).ToList());
- if (result.Item1 != null && result.Item1.Count > 0)
- {
- //鍒涘缓浠诲姟
- tasks = GetTasks(result.Item1, result.Item3);
- result.Item3.ForEach(x =>
- {
- x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- });
- stockInfos = result.Item1;
- Orders = result.Item2;
- outStockLockInfos = result.Item3;
- locationInfos = result.Item4;
- }
- }
- }
- if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count>0)
- {
- BaseDal.AddData(tasks);
- stockInfos.ForEach(x =>
- {
- x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- });
- WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);
- if (!contentResponse.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error(contentResponse.Message);
- }
- }
- }
+ // if (!contentResponse.Status)
+ // {
+ // _unitOfWorkManage.RollbackTran();
+ // return content.Error(contentResponse.Message);
+ // }
+ // }
+ //}
+ //{
+ // List<Dt_Task> tasks = new List<Dt_Task>();
+ // List<Dt_StockInfo>? stockInfos = null;
+ // List<Dt_OutMESOrder>? Orders = null;
+ // List<Dt_OutStockLockInfo>? outStockLockInfos = null;
+ // List<Dt_LocationInfo>? locationInfos = null;
+ // {
+ // if (mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt()).ToList().Count > 0)
+ // {
+ // //鍒嗛厤搴撳瓨
+ // (List<Dt_StockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignStockOutbound(mESOrders.Where(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt()).ToList());
+ // if (result.Item1 != null && result.Item1.Count > 0)
+ // {
+ // //鍒涘缓浠诲姟
+ // tasks = GetTasks(result.Item1, result.Item3);
+ // result.Item3.ForEach(x =>
+ // {
+ // x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
+ // });
+ // stockInfos = result.Item1;
+ // Orders = result.Item2;
+ // outStockLockInfos = result.Item3;
+ // locationInfos = result.Item4;
+ // }
+ // }
+ // }
+ // if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0 && tasks.Count>0)
+ // {
+ // BaseDal.AddData(tasks);
+ // stockInfos.ForEach(x =>
+ // {
+ // x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ // });
+ // WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);
+ // if (!contentResponse.Status)
+ // {
+ // _unitOfWorkManage.RollbackTran();
+ // return content.Error(contentResponse.Message);
+ // }
+ // }
+ //}
_unitOfWorkManage.CommitTran();
return content.OK("鎺ユ敹鎴愬姛");
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
index d191358..8acb76f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
@@ -91,7 +91,7 @@
/// 鎺ユ敹鍗氭�濋�氶鏂欎俊鎭�
/// </summary>
/// <returns></returns>
- [HttpPost, HttpGet, Route("ReceivePicking"), AllowAnonymous]
+ [HttpPost, HttpGet, Route("ReceivePicking")]
public WebResponseContent ReceivePicking([FromBody] List<BSTPickInfoDTO> bSTPickInfoDTOs)
{
return _taskService.ReceivePicking(bSTPickInfoDTOs);
@@ -101,7 +101,7 @@
/// 鎺ユ敹鍗氭�濋�氶��鏂欎俊鎭�
/// </summary>
/// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveReturnOrder"), AllowAnonymous]
+ [HttpPost, HttpGet, Route("ReceiveReturnOrder")]
public WebResponseContent ReceiveReturnOrder([FromBody] List<BSTReturnOrderDTO> bSTReturnOrderDTOs)
{
return _returnBSTOrderService.ReceiveReturnOrder(bSTReturnOrderDTOs);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json"
index 0c8bd96..abfe8ec 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json"
@@ -13,7 +13,7 @@
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
//"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_HUAIAN;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
-"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=192.168.35.3;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=Sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//鏃MS鏁版嵁搴撹繛鎺�
//"TeConnectionString": "Data Source=10.30.4.92;Initial Catalog=TeChuang;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
@@ -32,6 +32,8 @@
"ApiName": "WIDESEA",
"ExpMinutes": 360,
"QuartzJobAutoStart": true,
+ "OutSGLength": "50000",
+ "OutSGCount": "17",
"PDAVersion": "4",
"WebSocketPort": 9296
}
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\345\215\232\346\226\257\351\200\232\345\210\251\346\213\223\346\216\245\345\217\243.V2.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\345\215\232\346\226\257\351\200\232\345\210\251\346\213\223\346\216\245\345\217\243.V2.xlsx"
index e4cc948..7beb7b9 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\345\215\232\346\226\257\351\200\232\345\210\251\346\213\223\346\216\245\345\217\243.V2.xlsx"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\346\216\245\345\217\243\345\215\217\350\256\256/\345\215\232\346\226\257\351\200\232\345\210\251\346\213\223\346\216\245\345\217\243.V2.xlsx"
Binary files differ
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\345\216\237\346\226\231\345\272\223\350\276\223\351\200\201\347\272\277\346\225\205\351\232\234\350\257\273\345\217\226.xls" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\345\216\237\346\226\231\345\272\223\350\276\223\351\200\201\347\272\277\346\225\205\351\232\234\350\257\273\345\217\226.xls"
index 96703fb..1802951 100644
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\345\216\237\346\226\231\345\272\223\350\276\223\351\200\201\347\272\277\346\225\205\351\232\234\350\257\273\345\217\226.xls"
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/\345\216\237\346\226\231\345\272\223\350\276\223\351\200\201\347\272\277\346\225\205\351\232\234\350\257\273\345\217\226.xls"
Binary files differ
--
Gitblit v1.9.3