From 733e63cb362f17aea4a1020654fa348a0d0c1f06 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 24 二月 2025 00:08:59 +0800
Subject: [PATCH] 优化入库逻辑，优化直接出库逻辑，优化移库任务逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs | 112 +++++++++++++++++++-------------------------------------
1 files changed, 38 insertions(+), 74 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
index f13f851..166af4f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
@@ -43,21 +43,18 @@
try
{
var materielCode = productionlineDTO.traytype.ToString();
- if (inboundOrder != null)
- {
- var inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == productionlineDTO.batchNo);
- materielCode = inboundOrderDetail.MaterielCode;
- inboundOrderDetail.ReceiptQuantity++;
- inboundOrderDetail.OrderDetailStatus = inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity ? OrderDetailStatusEnum.Over.ObjToInt() : OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
+ var inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == productionlineDTO.batchNo);
+ materielCode = inboundOrderDetail.MaterielCode;
+ inboundOrderDetail.ReceiptQuantity++;
+ inboundOrderDetail.OrderDetailStatus = inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity ? OrderDetailStatusEnum.Over.ObjToInt() : OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
- if (inboundOrder.Details.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null)
- {
- inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
- }
- else if (inboundOrder.OrderStatus == InboundStatusEnum.鏈紑濮�.ObjToInt())
- {
- inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
- }
+ if (inboundOrder.Details.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null)
+ {
+ inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ else if (inboundOrder.OrderStatus == InboundStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
}
var materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materielCode);
if (materielInfo == null) throw new Exception($"鏈壘鍒扮墿鏂欎俊鎭�,鐗╂枡缂栫爜銆恵materielCode}銆�");
@@ -68,7 +65,7 @@
StockId = stockInfo.Id != 0 ? stockInfo.Id : 0,
MaterielName = materielInfo.MaterielName,
MaterielCode = materielInfo.MaterielCode,
- BatchNo = inboundOrder.Details.FirstOrDefault().BatchNo,
+ BatchNo = inboundOrderDetail.BatchNo,
StockQuantity = 1,// productionlineDTO.QtySum,
SerialNumber = "",
//SerialNumber = $"{inboundOrder.OrderNo} | {materielInfo.MaterielCode} | {pdaMaterielGroupDTO.BatchNo} | {pdaMaterielGroupDTO.ReceiptQuantity}",
@@ -165,67 +162,34 @@
/// <returns></returns>
public List<StockSelectViewDTO> GetStockSelectViews(string materielCode)
{
- List<string> roadways = _basicRepository.RoadwayInfoRepository.CanOutRoadwayNos;
-
- List<int> warehouseIds = _basicRepository.WarehouseRepository.EnableWarehouseIds;
-
- List<int> areaIds = _basicRepository.AreaInfoRepository.GetEnableAreaIds(warehouseIds);
-
- List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(roadways, areaIds);
-
- #region 鎸夌墿鏂欐暟閲忔煡璇�
- //var StockSelectViewDTOs = BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO
- //{
- // LocationCode = a.LocationCode,
- // MaterielCode = b.MaterielCode,
- // MaterielName = b.MaterielName,
- // PalletCode = a.PalletCode,
- // UseableQuantity = b.StockQuantity - b.OutboundQuantity
- //}, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.Status == StockStatusEmun.宸插叆搴�.ObjToInt() && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO
- //{
- // LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
- // MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
- // MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
- // PalletCode = x.Key,
- // UseableQuantity = x.Sum(x => x.UseableQuantity)
- //}).ToList();
- #endregion
-
- #region 鎸夋壒鍙峰拰鎵樼洏鏁伴噺鏌ヨ
- //StockSelectViewDTOs = BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO
- //{
- // LocationCode = a.LocationCode,
- // MaterielCode = b.MaterielCode,
- // MaterielName = b.MaterielName,
- // PalletCode = a.PalletCode,
- // BatchNo = b.BatchNo,
- // UseableQuantity = 1
- //}, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.Status == StockStatusEmun.宸插叆搴�.ObjToInt() && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO
- //{
- // LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
- // MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
- // MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
- // BatchNo = x.FirstOrDefault()?.BatchNo ?? "",
- // PalletCode = x.Key,
- // UseableQuantity = x.Sum(x => x.UseableQuantity)
- //}).ToList();
- #endregion
-
- #region 鏌ヨ鐗╂枡搴撳瓨鎸夋壒鍙峰垎缁�
- var StockSelectViewDTOs = BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO
+ try
{
- MaterielCode = b.MaterielCode,
- MaterielName = b.MaterielName,
- BatchNo = b.BatchNo,
- }, a => locationCodes.Contains(a.LocationCode), b => b.StockQuantity > b.OutboundQuantity && b.Status == StockStatusEmun.宸插叆搴�.ObjToInt() && b.MaterielCode == materielCode, x => true).GroupBy(x => x.BatchNo).Select(x => new StockSelectViewDTO
+ //Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materielCode);
+ //if (materielInfo == null) throw new Exception($"鏈壘鍒扮墿鏂欎俊鎭�");
+ return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId, (a, b) => new StockSelectViewDTO
+ {
+ LocationCode = a.LocationCode,
+ MaterielCode = b.MaterielCode,
+ MaterielName = b.MaterielName,
+ PalletCode = a.PalletCode,
+ //UseableQuantity = b.StockQuantity - b.OutboundQuantity
+ UseableQuantity = b.StockQuantity,
+ BatchNo = b.BatchNo,
+ }, a => a.StockStatus == StockStatusEmun.宸插叆搴�.ObjToInt(), b => b.Status == StockStatusEmun.宸插叆搴�.ObjToInt() && b.MaterielCode == materielCode, x => true).GroupBy(x => x.LocationCode).Select(x => new StockSelectViewDTO
+ {
+ LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
+ MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
+ MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
+ PalletCode = string.Join(",", x.Select(x => x.PalletCode).ToList()),
+ //UseableQuantity = x.Sum(x => x.UseableQuantity)
+ UseableQuantity = x.Sum(x => x.UseableQuantity),
+ BatchNo = x.FirstOrDefault()?.BatchNo ?? ""
+ }).ToList();
+ }
+ catch (Exception ex)
{
- MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
- MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
- BatchNo = x.Key,
- UseableQuantity = x.Count()
- }).ToList();
- #endregion
- return StockSelectViewDTOs;
+ return null;
+ }
}
/// <summary>
/// 璁＄畻搴撳瓨
--
Gitblit v1.9.3