From 981a80940e47409300c09847684ca530f75b4a5f Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 10 一月 2025 23:56:33 +0800
Subject: [PATCH] 优化WCS辅料出库逻辑
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
index fd2344f..ce12b7c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
@@ -11,6 +11,7 @@
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
+using WIDESEA_DTO.Basic;
using WIDESEA_IBasicRepository;
using WIDESEA_IInboundRepository;
using WIDESEA_IInboundService;
@@ -24,12 +25,16 @@
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IPurchaseOrderDetailRepository _purchaseOrderDetailRepository;
private readonly IBasicRepository _basicRepository;
+ private readonly ISupplierInfoRepository _supplierInfoRepository;
+ private readonly IMaterielInfoRepository _materielInfoRepository;
- public PurchaseOrderService(IPurchaseOrderRepository BaseDal, IPurchaseOrderDetailRepository purchaseOrderDetailRepository, IUnitOfWorkManage unitOfWorkManage,IBasicRepository basicRepository) : base(BaseDal)
+ public PurchaseOrderService(IPurchaseOrderRepository BaseDal, IPurchaseOrderDetailRepository purchaseOrderDetailRepository, IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository, ISupplierInfoRepository supplierInfoRepository, IMaterielInfoRepository materielInfoRepository) : base(BaseDal)
{
_purchaseOrderDetailRepository = purchaseOrderDetailRepository;
_unitOfWorkManage = unitOfWorkManage;
_basicRepository = basicRepository;
+ _supplierInfoRepository = supplierInfoRepository;
+ _materielInfoRepository = materielInfoRepository;
}
public WebResponseContent ReceivePurchaseOrder(PurchaseOrderModel model)
@@ -59,19 +64,30 @@
{
return WebResponseContent.Instance.Error($"閲囪喘鍗曞彿閲嶅");
}
+ if (_supplierInfoRepository.QueryFirst(x => x.SupplierCode == model.SCode) == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒颁緵搴斿晢缂栫爜銆恵model.SCode}銆戠殑淇℃伅");
+ }
List<Dt_Warehouse> warehouses = _basicRepository.WarehouseRepository.QueryData();
- List<Dt_PurchaseOrderDetail> purchaseOrderDetails = new List<Dt_PurchaseOrderDetail>();
+ List<Dt_MaterielInfo> materielInfos = _materielInfoRepository.QueryData();
+ List<Dt_PurchaseOrderDetail> purchaseOrderDetails = new List<Dt_PurchaseOrderDetail>();
foreach (var item in model.MList)
{
Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseCode == item.WaId);
- if(warehouse == null)
+ if (warehouse == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
+ }
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MCode);
+ if (materielInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欑紪鐮併�恵item.MCode}銆戠殑淇℃伅");
}
Dt_PurchaseOrderDetail purchaseOrderDetail = new Dt_PurchaseOrderDetail()
{
MaterielCode = item.MCode,
PurchaseDetailQuantity = item.Qty,
+ PurchaseDetailReceiveQty=0,
PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt(),
Unit = item.Unit,
WarehouseId = warehouse.WarehouseId,
@@ -114,7 +130,12 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟鏄庣粏淇℃伅");
}
+ if (_supplierInfoRepository.QueryFirst(x => x.SupplierCode == model.SCode) == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒颁緵搴斿晢缂栫爜銆恵model.SCode}銆戠殑淇℃伅");
+ }
List<Dt_Warehouse> warehouses = _basicRepository.WarehouseRepository.QueryData();
+ List<Dt_MaterielInfo> materielInfos = _materielInfoRepository.QueryData();
List<Dt_PurchaseOrderDetail> purchaseOrderDetails = new List<Dt_PurchaseOrderDetail>();
List<Dt_PurchaseOrderDetail> updatePurchaseOrderDetails = new List<Dt_PurchaseOrderDetail>();
List<int> detailIds = new List<int>();
@@ -125,6 +146,11 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
}
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MCode);
+ if (materielInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欑紪鐮併�恵item.MCode}銆戠殑淇℃伅");
+ }
Dt_PurchaseOrderDetail? purchaseOrderDetail = purchaseOrder.Details.FirstOrDefault(x => x.RowNo == item.RowId);
if (purchaseOrderDetail == null)
{
@@ -132,6 +158,7 @@
{
MaterielCode = item.MCode,
PurchaseDetailQuantity = item.Qty,
+ PurchaseDetailReceiveQty = 0,
PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt(),
Unit = item.Unit,
WarehouseId = warehouse.WarehouseId,
--
Gitblit v1.9.3