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/TakeStockOrderCPService.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/TakeStockOrderCPService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/TakeStockOrderCPService.cs
index 4955f16..9455b8c 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/TakeStockOrderCPService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/TakeStockOrderCPService.cs
@@ -63,6 +63,7 @@
BatchNo = item.BatchNo,
MaterielSpec = item.MaterieSpec,
SysQty = item.OrderQuantity,
+ TakePalletCode = item.LPNNo,
TakeDetalStatus = TakeStockDetailStatusEnum.鏈洏鐐�.ObjToInt(),
};
takeStockOrderCP.Details.Add(takeStockOrderDetail);
@@ -78,11 +79,17 @@
OrderNo = houseInventoryOut.No,
WarehouseId = warehouse.WarehouseId,
TakeStockStatus = TakeStockDetailStatusEnum.鏈洏鐐�.ObjToInt(),
+ Creater = "SMOM",
+ CreateDate = DateTime.Now,
Details = new List<Dt_TakeStockOrderDetailCP>()
};
foreach (var item in orderAddDTO1.Details)
{
+ if (item.LPNNo == null)
+ {
+ return WebResponseContent.Instance.Error("鐩樼偣鎵樼洏鍙蜂笉鑳戒负绌�");
+ }
Dt_TakeStockOrderDetailCP takeStockOrderDetail = new Dt_TakeStockOrderDetailCP()
{
TakeStockId = takeStockOrderCP.Id,
@@ -91,6 +98,9 @@
BatchNo = item.BatchNo,
MaterielSpec = item.MaterieSpec,
SysQty = item.OrderQuantity,
+ TakePalletCode = item.LPNNo,
+ Creater = "SMOM",
+ CreateDate = DateTime.Now,
TakeDetalStatus = TakeStockDetailStatusEnum.鏈洏鐐�.ObjToInt(),
};
takeStockOrderCP.Details.Add(takeStockOrderDetail);
@@ -112,5 +122,55 @@
}
return content;
}
+
+
+ /// <summary>
+ /// 鑾峰彇瀵瑰簲浠撳簱鐩樼偣鍗�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent GetTakeStockOrders(SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ int pageNo = saveModel.MainData["pageNo"].ObjToInt();
+ string? orderNo = saveModel.MainData["orderNo"].ToString();
+ int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
+ List<Dt_TakeStockOrderCP> takeStockOrders = new List<Dt_TakeStockOrderCP>();
+ if (string.IsNullOrEmpty(orderNo))
+ {
+ takeStockOrders = Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.TakeStockStatus < TakeStockStatusEnum.鐩樼偣瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId).Includes(x => x.Details).ToPageList(pageNo, 5);
+ }
+ else
+ {
+ takeStockOrders = Db.Queryable<Dt_TakeStockOrderCP>().Where(x => (x.OrderNo.Contains(orderNo) && x.TakeStockStatus < TakeStockStatusEnum.鐩樼偣瀹屾垚.ObjToInt() && x.WarehouseId == warehouseId)).Includes(x => x.Details).ToPageList(pageNo, 5);
+ }
+ content.OK(data: takeStockOrders);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ /// <summary>
+ /// 鎴愬搧鐩樼偣
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent TakeStockOrderCP(SaveModel saveModel)
+ {
+ WebResponseContent responseContent = new WebResponseContent();
+ try
+ {
+
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+ return WebResponseContent.Instance.OK();
+ }
}
}
--
Gitblit v1.9.3