From 1f5df924519e5ec9605727efe1b0cca8a4efb463 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Mon, 4 Nov 2024 18:42:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/mm/MmRequirePlanController.cs         |  3 ++
 DOAN.Service/MES/mm/MmRequirePlanService.cs   | 36 ++++++++++++++-----
 .../Converter/DOANConvertDateTime.cs          |  4 +--
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/mm/MmRequirePlanController.cs b/DOAN.Admin.WebApi/Controllers/MES/mm/MmRequirePlanController.cs
index d9e0ff3..67b7ec9 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/mm/MmRequirePlanController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/mm/MmRequirePlanController.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using DOAN.Service.group.IService;
 using Aliyun.OSS;
 using JinianNet.JNTemplate;
+using Infrastructure.Converter;
 //创建时间：2024-08-30
 namespace DOAN.Admin.WebApi.Controllers
 {
@@ -165,10 +166,12 @@ namespace DOAN.Admin.WebApi.Controllers
         [HttpPost("get_material_require_plan_byline")]
         public IActionResult GetMaterialRequirePlanByline([FromBody] MmRequirePlanQueryDto2 parm)
         {
+            parm.RequireDate=DOANConvertDateTime.ConvertLocalDate(parm.RequireDate);
             if (parm == null || parm.RequireDate == DateTime.MinValue || string.IsNullOrEmpty(parm.line_code))
             {
                 return SUCCESS(null);
             }
+
             var response = _MmRequirePlanService.GetMaterialRequirePlanByline(parm);
             return SUCCESS(response);
 
diff --git a/DOAN.Service/MES/mm/MmRequirePlanService.cs b/DOAN.Service/MES/mm/MmRequirePlanService.cs
index 9313e04..8210ac8 100644
--- a/DOAN.Service/MES/mm/MmRequirePlanService.cs
+++ b/DOAN.Service/MES/mm/MmRequirePlanService.cs
@@ -27,6 +27,8 @@ namespace DOAN.Service.group
     [AppService(ServiceType = typeof(IMmRequirePlanService), ServiceLifetime = LifeTime.Transient)]
     public class MmRequirePlanService : BaseService<MmRequirePlan>, IMmRequirePlanService
     {
+
+        private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
         /// <summary>
         /// 生成物料需求计划
         /// </summary>
@@ -318,6 +320,7 @@ namespace DOAN.Service.group
                         List<BaseMaterialBom> boms = Context.Queryable<BaseMaterialBom>().Where(it => it.InvCode == workorder_item.ProductionCode).ToList();
                         if (boms != null && boms.Count > 0)
                         {
+                          
 
                             //遍历所有子件
                             foreach (var item in boms)
@@ -327,22 +330,32 @@ namespace DOAN.Service.group
                                 {
                                     float pre_num = need_Materials[item.SubInvCode];
                                     need_Materials[item.SubInvCode] = pre_num + need_num;
+                               
+                                    if (item.SubInvCode== "20121240")
+                                    {
+                                       
+                                        
+                                        logger.Error("====20121240   累加数量: "+ need_Materials[item.SubInvCode]+"    工单:"+ workorder_item.Workorder);
+                                   
+                                    
+                                                 
+                                    }
                                 }
                                 else
                                 {
                                     need_Materials.Add(item.SubInvCode, need_num);
                                 }
 
+                                // 确定包含子件的工单
+                                //if (need_Materials_workOrder.ContainsKey(item.SubInvCode))
+                                //{
 
-                                if (need_Materials_workOrder.ContainsKey(item.SubInvCode))
-                                {
-
-                                    need_Materials_workOrder[item.SubInvCode].Add(workorder_item.Workorder);
-                                }
-                                else
-                                {
-                                    need_Materials_workOrder.Add(item.SubInvCode, new HashSet<string>() { workorder_item.Workorder });
-                                }
+                                //    need_Materials_workOrder[item.SubInvCode].Add(workorder_item.Workorder);
+                                //}
+                                //else
+                                //{
+                                //    need_Materials_workOrder.Add(item.SubInvCode, new HashSet<string>() { workorder_item.Workorder });
+                                //}
 
                             }
                         }
@@ -368,8 +381,13 @@ namespace DOAN.Service.group
                         mmRequirePlan.Id = XueHua;
                         mmRequirePlan.MaterialCode = item.Code;
                         mmRequirePlan.MaterialName = item.Name;
+       
                         mmRequirePlan.RequireNum = (decimal)(need_Materials.TryGetValue(item.Code, out float value) ? value : default(float));
+                        if (mmRequirePlan.MaterialCode == "20121240")
+                        {
+                            logger.Error("====20121240   累加数量: " + mmRequirePlan.RequireNum);
 
+                        }
                         mmRequirePlan.RequireDate = parm.RequireDate;
                         mmRequirePlan.LineCode = parm.line_code;
 
diff --git a/Infrastructure/Converter/DOANConvertDateTime.cs b/Infrastructure/Converter/DOANConvertDateTime.cs
index 55f3694..08f7737 100644
--- a/Infrastructure/Converter/DOANConvertDateTime.cs
+++ b/Infrastructure/Converter/DOANConvertDateTime.cs
@@ -9,7 +9,7 @@ public class DOANConvertDateTime
     /// </summary>
     /// <param name="handleDate"></param>
     /// <returns></returns>
-    public static DateTime ConvertLocalDateTime(DateTime handleDate)
+    public static DateTime ConvertLocalDate(DateTime handleDate)
     {
         if (handleDate.Kind == DateTimeKind.Utc)
         {
@@ -25,7 +25,7 @@ public class DOANConvertDateTime
     /// </summary>
     /// <param name="handleDate"></param>
     /// <returns></returns>
-    public static DateTime ConvertLocalDate(DateTime handleDate)
+    public static DateTime ConvertLocalDateTime(DateTime handleDate)
     {
         if (handleDate.Kind == DateTimeKind.Utc)
         {