From e5316b19ae5f33d29d6e9410e894caed30eebf29 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 18 二月 2025 09:11:51 +0800
Subject: [PATCH] PP仓输送线,堆垛机交互
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 87 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 36 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 1edf744..3cf8d6e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -199,7 +199,7 @@
stockInfo.LocationCode = locationInfo.LocationCode;
#region 绌虹鍏ュ簱/鎷ｉ�夊洖搴�/鐢熶骇閫�鏂�
- if (task.TaskType == TaskTypeEnum.InEmpty.ObjToInt() || task.TaskType == TaskTypeEnum.InPick.ObjToInt() || task.TaskType==TaskTypeEnum.ProductionReturn.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.InEmpty.ObjToInt() || task.TaskType == TaskTypeEnum.InPick.ObjToInt() || (task.TaskType==TaskTypeEnum.ProductionReturn.ObjToInt() && warehouse.WarehouseCode==WarehouseEnum.HA64.ToString()))
{
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
@@ -220,49 +220,50 @@
Dt_InboundOrder? inboundOrder = _inboundRepository.InboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == stockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
Dt_InboundOrderDetail? inboundOrderDetail = null;
+ Dt_ReturnOrder? returnOrder = null;
//鏍囧噯鍏ュ簱娴佺▼鏌ユ壘鍏ュ簱鍗曟嵁
if (inboundOrder != null && stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
{
//鏌ヨ鍘熷畬鎴愮殑鍏ュ簱鏄庣粏鏁伴噺
int overCount = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;
- if (stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
+ inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.RowNo == stockInfo.Details.FirstOrDefault()?.InboundOrderRowNo);
+ foreach (var item in stockInfo.Details)
{
- inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.RowNo == stockInfo.Details.FirstOrDefault()?.InboundOrderRowNo);
- foreach (var item in stockInfo.Details)
+ if (inboundOrderDetail == null)
{
- if (inboundOrderDetail == null)
- {
- continue;
- }
- ERPInboundDetailModel detailModel = new ERPInboundDetailModel()
- {
- ExpiryDate = item.EffectiveDate ?? "",
- LocationCode = warehouse.WarehouseCode,
- MaterialsCode = item.MaterielCode,
- MfgDate = item.ProductionDate ?? "",
- QtyCustoms = "0",
- Quantity = item.StockQuantity.ToString(),
- Rack = stockInfo.LocationCode,
- ReceiptCode = inboundOrder.UpperOrderNo,
- ReceiptSerNo = item.InboundOrderRowNo.ToString()
- };
- inboundOrderDetail.OverInQuantity += item.StockQuantity;
- if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
- {
- inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- overCount += 1;
- }
- else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
- {
- inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
- }
+ continue;
+ }
+ inboundOrderDetail.OverInQuantity += item.StockQuantity;
+ if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
+ {
+ inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ overCount += 1;
+ }
+ else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
+ {
+ inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
}
}
if (inboundOrder.Details.Count == overCount)
{
inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ //鍒ゆ柇鏄惁涓洪��鏂欏叆搴撳崟
+ if (inboundOrder.OrderType == InOrderTypeEnum.Return.ObjToInt())
+ {
+ returnOrder = _inboundRepository.ReturnOrderRepository.Db.Queryable<Dt_ReturnOrder>().Where(x => x.OrderNo == inboundOrder.UpperOrderNo).Includes(x => x.Details).First();
+ returnOrder.ReturnOrderStatus=ReturnOrderStatusEnum.Returned.ObjToInt();
+ foreach (var item in inboundOrder.Details)
+ {
+ Dt_ReturnOrderDetail returnOrderDetail = returnOrder.Details?.FirstOrDefault(x=>x.MCode==item.MaterielCode);
+ if (returnOrderDetail != null)
+ {
+ returnOrderDetail.OverReturnQty = item.OverInQuantity;
+ returnOrderDetail.OrderDetailStatus = ReturnOrderStatusEnum.Returned.ObjToInt();
+ }
+ }
+ }
}
- if (inboundOrder.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt())
+ else if (inboundOrder.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt())
{
inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
}
@@ -301,10 +302,24 @@
_inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
_inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetail);
}
+ if (returnOrder!=null)
+ {
+ _inboundRepository.ReturnOrderRepository.UpdateData(returnOrder);
+ _inboundRepository.ReturnOrderDetailRepository.UpdateData(returnOrder.Details);
+ }
_unitOfWorkManage.CommitTran();
//瀛樺湪鍏ュ簱鍗曞苟鐘舵�佷负瀹屾垚鐘舵�佹帹閫佽嚦ERP
- if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
- _inboundOrderService.FeedbackInboundOrder(inboundOrder);
+ if (inboundOrder != null && inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType != InOrderTypeEnum.Allocat.ObjToInt())
+ {
+ if (inboundOrder.OrderType == InOrderTypeEnum.Return.ObjToInt())
+ {
+ _inboundOrderService.FeedbackReturnOrder(inboundOrder, returnOrder);
+ }
+ else
+ {
+ _inboundOrderService.FeedbackInboundOrder(inboundOrder);
+ }
+ }
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -345,7 +360,7 @@
List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
List<Dt_MesOutboundOrder> mesOutboundOrders = new List<Dt_MesOutboundOrder>();
- if ((outStockLockInfos == null || outStockLockInfos.Count == 0) && warehouse.WarehouseCode != WarehouseEnum.HA64.ToString() && task.TaskType != TaskTypeEnum.OutEmpty.ObjToInt())
+ if ((outStockLockInfos == null || outStockLockInfos.Count == 0) && warehouse.WarehouseCode != WarehouseEnum.HA64.ToString() && (task.TaskType != TaskTypeEnum.OutEmpty.ObjToInt()))
{
return WebResponseContent.Instance.Error($"鏈壘鍒板嚭搴撹鎯呬俊鎭�");
}
@@ -386,13 +401,13 @@
task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
_unitOfWorkManage.BeginTran();
- if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.MesHandPickOutbound.ObjToInt() || task.TaskType == TaskTypeEnum.MesHandOutbound.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt()|| task.TaskType == TaskTypeEnum.OutAllocate.ObjToInt() || task.TaskType == TaskTypeEnum.MesHandPickOutbound.ObjToInt() || task.TaskType == TaskTypeEnum.MesHandOutbound.ObjToInt())
{
+ //澶勭悊鍑哄簱璇︽儏
if (outboundOrderDetails.Count > 0)
{
_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
}
-
stockInfo.LocationCode = "";
stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
--
Gitblit v1.9.3