From 3d25ef8353e593533ade370481a49209dc603785 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 16 十二月 2024 13:45:38 +0800
Subject: [PATCH] 修改ERP参数对象结果

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs                  |   20 ++++++
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs     |   28 +++++++--
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/PurchaseOrderModel.cs              |   21 ++++++
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/MaterielInfoDTO.cs               |   19 ++++++
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs   |    2 
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs |   16 ++--
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs                   |   19 ++++++
 7 files changed, 108 insertions(+), 17 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/MaterielInfoDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/MaterielInfoDTO.cs"
index 4d12609..3516010 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/MaterielInfoDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/MaterielInfoDTO.cs"
@@ -3,9 +3,28 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WIDESEA_Core.Attributes;
 
 namespace WIDESEA_DTO.Basic
 {
+    [ModelValidate]
+    public class MaterielInfo
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string From { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string DateTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [PropertyValidate("鐗╂枡鍒楄〃", NotNullAndEmpty = true)]
+        public MaterielInfoDTO Content { get; set; }
+    }
+    [ModelValidate]
     public class MaterielInfoDTO
     {
         public string Code { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs"
index 4ea44a1..6f11d3a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs"
@@ -3,9 +3,28 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WIDESEA_Core.Attributes;
 
 namespace WIDESEA_DTO.Basic
 {
+    [ModelValidate]
+    public class Supplier
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string From { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string DateTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [PropertyValidate("鐗╂枡鍒楄〃", NotNullAndEmpty = true)]
+        public SupplierDTO Content { get; set; }
+    }
+    [ModelValidate]
     public class SupplierDTO
     {
         public string Code { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs"
index 92e5702..cdcad93 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/ErpOutOrderDTO.cs"
@@ -3,9 +3,29 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WIDESEA_Core.Attributes;
+using WIDESEA_DTO.Basic;
 
 namespace WIDESEA_DTO.ERP
 {
+    [ModelValidate]
+    public class ErpOutOrder
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string From { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string DateTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [PropertyValidate("鐗╂枡鍒楄〃", NotNullAndEmpty = true)]
+        public ErpOutOrderDTO Content { get; set; }
+    }
+    [ModelValidate]
     public class ErpOutOrderDTO
     {
         public int Way { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/PurchaseOrderModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/PurchaseOrderModel.cs"
index f00d56f..f7789c8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/PurchaseOrderModel.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/PurchaseOrderModel.cs"
@@ -1,6 +1,7 @@
 锘縰sing System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection.Metadata;
 using System.Text;
 using System.Threading.Tasks;
 using WIDESEA_Core.Attributes;
@@ -10,6 +11,23 @@
 
 namespace WIDESEA_DTO
 {
+    [ModelValidate]
+    public class Root
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string From { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string DateTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [PropertyValidate("鐗╂枡鍒楄〃", NotNullAndEmpty = true)]
+        public PurchaseOrderModel Content { get; set; }
+    }
     /// <summary>
     /// 閲囪喘鍗曟ā鍨�
     /// </summary>
@@ -67,6 +85,7 @@
     /// <summary>
     /// 閲囪喘鍗曟槑缁嗘ā鍨�
     /// </summary>
+    [ModelValidate]
     public class PurchaseOrderDetailModel
     {
         /// <summary>
@@ -81,7 +100,7 @@
         /// 浠撳簱缂栧彿
         /// </summary>
         [PropertyValidate("浠撳簱缂栧彿", NotNullAndEmpty = true)]
-        public int WaId { get; set; }
+        public string WaId { get; set; }
 
         /// <summary>
         /// 鏁伴噺
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 bdf2fad..fd2344f 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"
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WIDESEA_BasicRepository;
 using WIDESEA_Common.OrderEnum;
 using WIDESEA_Core;
 using WIDESEA_Core.BaseRepository;
@@ -10,6 +11,7 @@
 using WIDESEA_Core.Enums;
 using WIDESEA_Core.Helper;
 using WIDESEA_DTO;
+using WIDESEA_IBasicRepository;
 using WIDESEA_IInboundRepository;
 using WIDESEA_IInboundService;
 using WIDESEA_InboundRepository;
@@ -21,11 +23,13 @@
     {
         private readonly IUnitOfWorkManage _unitOfWorkManage;
         private readonly IPurchaseOrderDetailRepository _purchaseOrderDetailRepository;
+        private readonly IBasicRepository _basicRepository;
 
-        public PurchaseOrderService(IPurchaseOrderRepository BaseDal, IPurchaseOrderDetailRepository purchaseOrderDetailRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+        public PurchaseOrderService(IPurchaseOrderRepository BaseDal, IPurchaseOrderDetailRepository purchaseOrderDetailRepository, IUnitOfWorkManage unitOfWorkManage,IBasicRepository basicRepository) : base(BaseDal)
         {
             _purchaseOrderDetailRepository = purchaseOrderDetailRepository;
             _unitOfWorkManage = unitOfWorkManage;
+            _basicRepository = basicRepository;
         }
 
         public WebResponseContent ReceivePurchaseOrder(PurchaseOrderModel model)
@@ -55,17 +59,22 @@
                 {
                     return WebResponseContent.Instance.Error($"閲囪喘鍗曞彿閲嶅");
                 }
-
-                List<Dt_PurchaseOrderDetail> purchaseOrderDetails = new List<Dt_PurchaseOrderDetail>();
+                List<Dt_Warehouse> warehouses = _basicRepository.WarehouseRepository.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)
+                    {
+                        return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
+                    }
                     Dt_PurchaseOrderDetail purchaseOrderDetail = new Dt_PurchaseOrderDetail()
                     {
                         MaterielCode = item.MCode,
                         PurchaseDetailQuantity = item.Qty,
                         PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt(),
                         Unit = item.Unit,
-                        WarehouseId = item.WaId,
+                        WarehouseId = warehouse.WarehouseId,
                         RowNo = item.RowId,
                     };
                     purchaseOrderDetails.Add(purchaseOrderDetail);
@@ -105,12 +114,17 @@
                 {
                     return WebResponseContent.Instance.Error($"鏈壘鍒伴噰璐崟鏄庣粏淇℃伅");
                 }
-
+                List<Dt_Warehouse> warehouses = _basicRepository.WarehouseRepository.QueryData();
                 List<Dt_PurchaseOrderDetail> purchaseOrderDetails = new List<Dt_PurchaseOrderDetail>();
                 List<Dt_PurchaseOrderDetail> updatePurchaseOrderDetails = new List<Dt_PurchaseOrderDetail>();
                 List<int> detailIds = new List<int>();
                 foreach (var item in model.MList)
                 {
+                    Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseCode == item.WaId);
+                    if (warehouse == null)
+                    {
+                        return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
+                    }
                     Dt_PurchaseOrderDetail? purchaseOrderDetail = purchaseOrder.Details.FirstOrDefault(x => x.RowNo == item.RowId);
                     if (purchaseOrderDetail == null)
                     {
@@ -120,7 +134,7 @@
                             PurchaseDetailQuantity = item.Qty,
                             PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt(),
                             Unit = item.Unit,
-                            WarehouseId = item.WaId,
+                            WarehouseId = warehouse.WarehouseId,
                             RowNo = item.RowId,
                         };
                         purchaseOrderDetails.Add(purchaseOrderDetail);
@@ -131,7 +145,7 @@
                         purchaseOrderDetail.PurchaseDetailQuantity = item.Qty;
                         purchaseOrderDetail.PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt();
                         purchaseOrderDetail.Unit = item.Unit;
-                        purchaseOrderDetail.WarehouseId = item.WaId;
+                        purchaseOrderDetail.WarehouseId = warehouse.WarehouseId;
                         purchaseOrderDetail.RowNo = item.RowId;
                         updatePurchaseOrderDetails.Add(purchaseOrderDetail);
                         detailIds.Add(purchaseOrderDetail.Id);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs"
index b8acae7..516598b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs"
@@ -59,7 +59,7 @@
         /// <summary>
         /// 澶囨敞
         /// </summary>
-        [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "")]
+        [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "")]
         public string Remark { get; set; }
 
         /// <summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
index 3271fbf..19dafe1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
@@ -46,9 +46,9 @@
         /// <param name="model"></param>
         /// <returns></returns>
         [HttpPost, Route("ReceivePurchaseOrderSingle"), AllowAnonymous, MethodParamsValidate]
-        public WebResponseContent ReceivePurchaseOrder([FromBody] PurchaseOrderModel model)
+        public WebResponseContent ReceivePurchaseOrder([FromBody] Root model)
         {
-            return _purchaseOrderService.ReceivePurchaseOrder(model);
+            return _purchaseOrderService.ReceivePurchaseOrder(model.Content);
         }
 
         /// <summary>
@@ -57,9 +57,9 @@
         /// <param name="model"></param>
         /// <returns></returns>
         [HttpPost, Route("ReceiveSupplier"), AllowAnonymous, MethodParamsValidate]
-        public WebResponseContent ReceiveSupplier([FromBody] SupplierDTO model)
+        public WebResponseContent ReceiveSupplier([FromBody] Supplier model)
         {
-            return _supplierInfoService.ReceiveSupplier(model);
+            return _supplierInfoService.ReceiveSupplier(model.Content);
         }
 
         /// <summary>
@@ -68,9 +68,9 @@
         /// <param name="model"></param>
         /// <returns></returns>
         [HttpPost, Route("ReceiveMaterial"), AllowAnonymous, MethodParamsValidate]
-        public WebResponseContent ReceiveMaterial([FromBody] MaterielInfoDTO model)
+        public WebResponseContent ReceiveMaterial([FromBody] MaterielInfo model)
         {
-            return _materielInfoService.ReceiveMaterial(model);
+            return _materielInfoService.ReceiveMaterial(model.Content);
         }
 
         /// <summary>
@@ -79,9 +79,9 @@
         /// <param name="erpOutOrder"></param>
         /// <returns></returns>
         [HttpPost, Route("ReceiveOutOrder"), AllowAnonymous, MethodParamsValidate]
-        public WebResponseContent ReceiveOutOrder([FromBody] ErpOutOrderDTO erpOutOrder)
+        public WebResponseContent ReceiveOutOrder([FromBody] ErpOutOrder erpOutOrder)
         {
-            return _outboundOrderService.ReceiveOutOrder(erpOutOrder);
+            return _outboundOrderService.ReceiveOutOrder(erpOutOrder.Content);
         }
     }
 }

--
Gitblit v1.9.3