From aa4aa67abfdf69e30d5076451716e5aba11d5ec0 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期二, 14 四月 2026 16:12:40 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
index 1aaac7e..bd7bea0 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
@@ -162,9 +162,6 @@
}
List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serialNumbers);
- models.FirstOrDefault().DeliveryNote = models.FirstOrDefault()?.DeliveryNote.Replace("BS:", "");
- models.FirstOrDefault().LotNo = models.FirstOrDefault()?.LotNo.Replace("DN:", "");
-
//楠岃瘉鍒ゆ柇鏃堕棿鏍煎紡
WebResponseContent IsValidContent = IsValidMCDates(models);
if (!IsValidContent.Status)
@@ -182,7 +179,7 @@
///鎵炬暟閲忓尮閰嶇殑
if (warehouse.WarehouseCode.Contains("BC"))
{
- inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.DeliveryNote ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
+ inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.LotNo ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
}
@@ -264,7 +261,7 @@
///鎵炬暟閲忓尮閰嶇殑
if (warehouse.WarehouseCode.Contains("BC"))
{
- notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.DeliveryNote && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
+ notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
}
if (notGroupDetail == null)
@@ -1766,7 +1763,7 @@
{
int pageNo = saveModel.MainData["pageNo"].ObjToInt();
string? orderNo = saveModel.MainData["orderNo"].ToString();
- int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
+ int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
List<Dt_InboundOrder> dt_ReceiveOrders = new List<Dt_InboundOrder>();
if (string.IsNullOrEmpty(orderNo))
{
@@ -1776,7 +1773,16 @@
{
dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 50);
}
-
+ if(dt_ReceiveOrders == null || dt_ReceiveOrders.Count == 0)
+ {
+ List<int> orderNos = _inboundOrderDetailService.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.MaterielCode.Contains(orderNo)).Select(x => x.OrderId).Distinct().ToList();
+ foreach (var item in orderNos)
+ {
+ Dt_InboundOrder inboundOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.Id == item) && x.OrderStatus < InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).First();
+ dt_ReceiveOrders.Add(inboundOrders);
+ }
+ }
+
content.OK(data: dt_ReceiveOrders);
}
catch (Exception ex)
--
Gitblit v1.9.3