From f9c82fce1ddc046e0b0bb3b16367d1c530cfa815 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Fri, 12 Jan 2024 11:20:55 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=80=81=E5=8F=91=E6=B3=A1?=
 =?UTF-8?q?=E7=BA=BF=E6=89=A7=E8=A1=8C=E8=AE=A1=E5=88=92=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?MES=E5=B7=A5=E5=8D=95=E7=BC=96=E5=8F=B7,=E6=A0=B9=E6=8D=AEMES?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=BC=96=E5=8F=B7=E6=9B=B4=E6=96=B0=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=AE=8C=E5=B7=A5=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.Core.Api/Admin.Core.Model.xml           |  5 +++
 Admin.Core.Model/Model_New/BoxFoamplan.cs     |  7 ++++
 .../RecordBoxFoamFixtureComplateServices.cs   | 35 ++++++++++++++++++-
 .../ViewModels/QuantityIssuedViewModel.cs     |  1 +
 .../Views/RoadKindPageView.xaml               |  3 +-
 5 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml
index 1263bf24..441f7753 100644
--- a/Admin.Core.Api/Admin.Core.Model.xml
+++ b/Admin.Core.Api/Admin.Core.Model.xml
@@ -1631,6 +1631,11 @@
             SAP订单编码
             </summary>
         </member>
+        <member name="P:Admin.Core.Model.BoxFoamPlan.PlanCode">
+            <summary>
+            MES计划编号
+            </summary>
+        </member>
         <member name="P:Admin.Core.Model.BoxFoamPlan.PlanAmount">
             <summary>
             计划数量
diff --git a/Admin.Core.Model/Model_New/BoxFoamplan.cs b/Admin.Core.Model/Model_New/BoxFoamplan.cs
index 979d7d81..036b6484 100644
--- a/Admin.Core.Model/Model_New/BoxFoamplan.cs
+++ b/Admin.Core.Model/Model_New/BoxFoamplan.cs
@@ -30,6 +30,13 @@ namespace Admin.Core.Model
         /// </summary>
         [SugarColumn(ColumnName = "ORDER_CODE")]
         public string OrderCode { get; set; }
+
+        /// <summary>
+        /// MES计划编号
+        /// </summary>
+        [SugarColumn(ColumnName = "PLAN_CODE")]
+        public string PlanCode { get; set; }
+
         /// <summary>
         /// 计划数量
         /// </summary>
diff --git a/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs b/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs
index 77f3c8d9..0123f412 100644
--- a/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs
+++ b/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs
@@ -28,7 +28,10 @@ namespace Admin.Core.Service.Service_New
         private readonly ISysUserInfoServices _sysUserInfoServices;
 
         private readonly IBaseSpaceInfoServices _baseSpaceInfoServices;
-        public RecordBoxFoamFixtureComplateServices(IBaseRepository<RecordBoxFoamFixtureComplate> dal, IOldBoxFoamTypeServices boxFoamTypeServices, IBoxFoamPlanServices boxFoamPlanServices, IBoxFoamDataServices oldBoxFoamDataServices, ISysUserInfoServices sysUserInfoServices, IBaseSpaceInfoServices baseSpaceInfoServices)
+
+        private readonly IProductPlanInfoServices _productPlanInfoServices;
+
+        public RecordBoxFoamFixtureComplateServices(IBaseRepository<RecordBoxFoamFixtureComplate> dal, IOldBoxFoamTypeServices boxFoamTypeServices, IBoxFoamPlanServices boxFoamPlanServices, IBoxFoamDataServices oldBoxFoamDataServices, ISysUserInfoServices sysUserInfoServices, IBaseSpaceInfoServices baseSpaceInfoServices, IProductPlanInfoServices productPlanInfoServices)
         {
             this._dal = dal;
             base.BaseDal = dal;
@@ -37,6 +40,7 @@ namespace Admin.Core.Service.Service_New
             _oldBoxFoamDataServices = oldBoxFoamDataServices;
             _sysUserInfoServices = sysUserInfoServices;
             _baseSpaceInfoServices = baseSpaceInfoServices;
+            _productPlanInfoServices = productPlanInfoServices;
         }
 
         /// <summary>
@@ -133,6 +137,9 @@ namespace Admin.Core.Service.Service_New
                                         if (planResult)
                                         {
                                             Console.WriteLine($"生产计划更新成功:{boxPlan.CompleteAmount}");
+
+                                            //更新MES计划
+                                            UpdateMesPlanInfo(boxPlan.PlanCode, item.RealOutPut);
                                         }
                                         else
                                         {
@@ -308,5 +315,31 @@ namespace Admin.Core.Service.Service_New
 
             return result;
         }
+
+        /// <summary>
+        /// 更新MES计划信息
+        /// </summary>
+        private void UpdateMesPlanInfo(string planCode,int complateAmount)
+        {
+            if (string.IsNullOrEmpty(planCode))
+            {
+                return;
+            }
+            var planInfo = _productPlanInfoServices.GetProductPlanByPlanCode(planCode).Result;
+            if(planInfo != null)
+            {
+                if(planInfo.PlanAmount > planInfo.CompleteAmount)
+                {
+                    planInfo.CompleteAmount = planInfo.CompleteAmount + complateAmount;
+                    if(planInfo.PlanAmount >= planInfo.CompleteAmount)
+                    {
+                        planInfo.EndTime = DateTime.Now;
+                    }
+
+                    _productPlanInfoServices.UpdateProductPlanInfo(planInfo);
+                }
+            }
+            
+        }
     }
 }
diff --git a/Aucma.Core.OldBoxFoam/ViewModels/QuantityIssuedViewModel.cs b/Aucma.Core.OldBoxFoam/ViewModels/QuantityIssuedViewModel.cs
index d494bb7c..b9fed985 100644
--- a/Aucma.Core.OldBoxFoam/ViewModels/QuantityIssuedViewModel.cs
+++ b/Aucma.Core.OldBoxFoam/ViewModels/QuantityIssuedViewModel.cs
@@ -111,6 +111,7 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
                 plan.UpdateTime =   DateTime.Now;
                 plan.CreateTime = DateTime.Now;
                 plan.OrderCode =  _planInfo.OrderCode;
+                plan.PlanCode = _planInfo.PlanCode;
                 plan.ShiftType = 1;
                 var result =  _boxFoamPlanServices.AddAsync(plan).Result;
                 if (result>=0)
diff --git a/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml b/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml
index 95753424..8e1f07d9 100644
--- a/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml
+++ b/Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml
@@ -189,6 +189,7 @@
                                                                 <Border Grid.Column="0"  BorderBrush="White" BorderThickness="1" >
                                                                     <TextBlock x:Name="spaceCodeText" Text="{Binding Local}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                                                                 </Border>
+                                                                <TextBlock x:Name="ObjId" Text="{Binding ObjId}" FontSize="18" Foreground="Transparent" />
                                                                 <Grid Grid.Column="1" >
                                                                     <Grid.ColumnDefinitions>
                                                                         <ColumnDefinition Width="3*"/>
@@ -205,7 +206,7 @@
                                                                     </Border>
                                                                    
                                                                     <Border Grid.Column="1" Grid.Row="0" BorderBrush="White" BorderThickness="1" >
-                                                                        <Button Command="{Binding DataContext.SubmitCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding Text, ElementName=spaceCodeText}" Background="Transparent">
+                                                                        <Button Command="{Binding DataContext.SubmitCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding Text, ElementName=ObjId}" Background="Transparent">
                                                                             <TextBlock Text="{Binding MaterialName}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Left" />
                                                                         </Button>
                                                                         <!--<TextBlock x:Name="spaceCodeText2" Text="{Binding MaterialName}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>-->