From b07472f884708a6bfdf63d999004bbf0bb5f00a8 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 17 十一月 2025 17:12:57 +0800
Subject: [PATCH] 新增分单功能、二维码打印及物料供应商管理页面
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs"
index c1ab047..dbd4d68 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs"
@@ -172,7 +172,7 @@
MaterielCode = outboundOrderdetail.MaterielCode,
Position = item.LocationCode,
PalletCode = item.PalletCode,
- AreaId = Convert.ToInt32(requestOut.AreaId),
+ AreaId = Convert.ToInt32(2),
};
taskDtos.Add(task);
item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.鍑哄簱閿佸畾;
@@ -210,19 +210,17 @@
{
taskDTOs.Add(CreateTaskDTO(item));
var result1 = _taskService.UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- var result2 = _taskService.UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
locationStatusChangeRecords.AddRange(result1.Item1);
- locationStatusChangeRecords.AddRange(result2.Item1);
locations.AddRange(result1.Item2);
- locations.AddRange(result2.Item2);
}
-
+ outboundOrder.OrderStatus = (int)OrderStateEmun.寮�濮�;
await _unitOfWorkManage.UseTranAsync(async () =>
{
_taskRepository.AddData(taskNews);
_stockInfoRepository.UpdateDataNav(result.Item1);
await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
await _locationRepository.UpdateDataAsync(locations);
+ BaseDal.UpdateData(outboundOrder);
_productionoutboundOrderDetailRepository.UpdateData(result.Item2);
_outDetailsRepository.AddData(outDetails);
});
@@ -251,7 +249,8 @@
Id = 0,
TaskType = task.TaskType,
AGVTaskNum = task.AGVTaskNum,
- Remark = task.Remark
+ Remark = task.Remark,
+ Floor =task.Floor,
};
}
public (List<DtStockInfo>, Dt_ProductionOutboundOrderDetail) AssignStockOutbound(Dt_ProductionOutboundOrderDetail outboundOrderdetail, List<StockSelectViewDTO> stockSelectViews)
@@ -307,11 +306,16 @@
}
outboundOrderdetail.OverOutQuantity = outboundOrderdetail.OrderQuantity - needQuantity;
+ outboundOrderdetail.NotOutQuantity = outboundOrderdetail.OrderQuantity - outboundOrderdetail.OverOutQuantity;
if (outboundOrderdetail.OverOutQuantity != 0)
{
outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.寮�濮�;
}
+ if (outboundOrderdetail.OverOutQuantity == outboundOrderdetail.OrderQuantity)
+ {
+ outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.宸插畬鎴�;
+ }
return (outStockNews, outboundOrderdetail);
}
--
Gitblit v1.9.3