From 092f6e9efb6e4c2bc401ec134391ab0a25773b47 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 21 二月 2025 16:41:38 +0800
Subject: [PATCH] PP仓提升机侧输送线流程

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
index 7c60c3d..72ba693 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
@@ -42,7 +42,16 @@
             _basicRepository = basicRepository;
             _invokeERPService = invokeERPService;
         }
-
+        public override PageGridData<Dt_ReceiveOrder> GetPageData(PageDataOptions options)
+        {
+            PageGridData<Dt_ReceiveOrder> pageGridData = base.GetPageData(options);
+            //foreach (var item in pageGridData.Rows)
+            //{
+            //    //鑾峰彇鏀惰揣鏄庣粏
+            //    item.PurchaseOrderNo
+            //}
+            return pageGridData;
+        }
         public override WebResponseContent AddData(SaveModel saveModel)
         {
             if (saveModel.MainData.ContainsKey(nameof(Dt_ReceiveOrder.ReceiveOrderStatus).FirstLetterToLower()))
@@ -146,7 +155,7 @@
                     Way = 1,
                     Details = recevieOrderDetails
                 };
-                
+
                 //鏇存柊鏀惰揣鍗曚俊鎭�
                 receiveOrder.ReceiveOrderStatus = ReceiveOrderStatusEnum.Completed.ObjToInt();
                 receiveOrder.UploadStatus = WhetherEnum.True.ObjToInt();
@@ -235,7 +244,7 @@
                     SupplierId = receiveOrder.SuppliersId,
                     Details = new List<Dt_InboundOrderDetail>()
                 };
-
+                List<Dt_MaterielInfo> materielCodeInfos = _basicRepository.MaterielInfoRepository.QueryData(x => receiveOrder.Details.Select(x => x.MaterielCode).ToList().Contains(x.MaterielCode));
                 foreach (var item in receiveOrder.Details)
                 {
                     float quantity = item.ReceivedQuantity;
@@ -253,6 +262,8 @@
                     Dt_InboundOrderDetail detail = new Dt_InboundOrderDetail()
                     {
                         MaterielCode = item.MaterielCode,
+                        MaterielName = materielCodeInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "",
+                        MaterielSpec= materielCodeInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielSpec ?? "",
                         OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                         OrderQuantity = quantity,
                         OverInQuantity = 0,

--
Gitblit v1.9.3