1、上位机展示SAP订单号；

2、报工的时候，不给upload_time 赋值；
3、修改报工界面展示顺序

shangjian/AutoUpdate/bin/Debug/AutoUpdate.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>2xT7WSJ3JOGwOwaH5T5VSLO0545A2bhrSpA8Se3jmhE=</dsig:DigestValue>
+        <dsig:DigestValue>c0Rf+CYPtsvtvSUmXds9V3/rrktlKG3rzjN5DuQeWaE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest

@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>y6yzsU8Eugy+ObfgrPA463CS+Nq1+410yHtpvzJQ8xU=</dsig:DigestValue>
+        <dsig:DigestValue>JYnml/VunFI2cpX5vz9XEjoQbR4ehe5wE83P4SCElVc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>2xT7WSJ3JOGwOwaH5T5VSLO0545A2bhrSpA8Se3jmhE=</dsig:DigestValue>
+        <dsig:DigestValue>c0Rf+CYPtsvtvSUmXds9V3/rrktlKG3rzjN5DuQeWaE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f67dc885e7551d573c533635607a154a9fcfd039
+1f5ed4a1723419f2b246081115bd24bc58c59cead28db53d676e7670d15749c1

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.FileListAbsolute.txt

@@ -41,7 +41,6 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\AutoU
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.pdb
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\SevenZipSharp.dll
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.AssemblyReference.cache
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.SuggestedBindingRedirects.cache
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.Properties.Resources.resources
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.GenerateResource.cache
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CoreCompileInputs.cache

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest

@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>y6yzsU8Eugy+ObfgrPA463CS+Nq1+410yHtpvzJQ8xU=</dsig:DigestValue>
+        <dsig:DigestValue>JYnml/VunFI2cpX5vz9XEjoQbR4ehe5wE83P4SCElVc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-65ea42614d5210ce1f76f304a0b99eadc686e4a3
+3a8b54561118364882d34afa00a4d4a6d0f2189460f273b8a358f50296b9afd5

shangjian/CentralControl/obj/Debug/CentralControl.csproj.FileListAbsolute.txt

@@ -103,7 +103,6 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\bin\Debug\S
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\bin\Debug\System.Buffers.xml
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\obj\Debug\CentralControl.csproj.AssemblyReference.cache
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\obj\Debug\CentralControl.csproj.SuggestedBindingRedirects.cache
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\obj\Debug\CentralControl.csproj.CoreCompileInputs.cache
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\obj\Debug\CentralControl.csproj.CopyComplete
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CentralControl\obj\Debug\CentralControl.exe

shangjian/CommonFunc/CommonFunc.csproj

@@ -157,6 +157,9 @@
     <Compile Include="snap7.net.cs" />
     <Compile Include="SqlServerDbHelper.cs" />
     <Compile Include="Tools\CustomMessageBox.cs" />
+    <Compile Include="Tools\MachineRepairWin.xaml.cs">
+      <DependentUpon>MachineRepairWin.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Tools\PauseOrderWin.xaml.cs">
       <DependentUpon>PauseOrderWin.xaml</DependentUpon>
     </Compile>
@@ -187,6 +190,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Tools\MachineRepairWin.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Tools\PauseOrderWin.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

shangjian/CommonFunc/Tools/MachineRepairWin.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="CommonFunc.Tools.MachineRepairWin"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:CommonFunc.Tools"
+        mc:Ignorable="d"
+        Title="MachineRepairWin" Height="450" Width="800">
+    <Grid>
+        
+    </Grid>
+</Window>

shangjian/CommonFunc/Tools/MachineRepairWin.xaml.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace CommonFunc.Tools
+{
+    /// <summary>
+    /// MachineRepairWin.xaml 的交互逻辑
+    /// </summary>
+    public partial class MachineRepairWin : Window
+    {
+        public MachineRepairWin()
+        {
+            InitializeComponent();
+        }
+    }
+}

shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-480f634d4a501bb2823c222d358be062c929427a
+eafdca6ee748aec506bd217d6273757fffaf4aa4e66b7b29256414d0c9c09633

shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt

@@ -86,3 +86,5 @@ E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.C
 E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.CopyComplete
 E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll
 E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb
+D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\Tools\MachineRepairWin.g.cs
+D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\Tools\MachineRepairWin.baml

shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 
-3601143984
+489050341
 2-1355062061
-261069671320
+27790667083
 44-239516262
-HMessageBox.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml;
+HMessageBox.xaml;Tools\MachineRepairWin.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml;
 
 False
 

shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 
-3601143984
+489050341
 2-1355062061
-27-342350437
+28-621354674
 44-239516262
-HMessageBox.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml;
+HMessageBox.xaml;Tools\MachineRepairWin.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml;
 
 True
 

shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref

@@ -1,4 +1,5 @@
 
 
 FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\HMessageBox.xaml;;
+FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\Tools\MachineRepairWin.xaml;;
 

shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-51790d22c3b0468f4e446c933001b592c3e5c2c3
+0589fc8b80df15b5ed1fb9c321c7c48cc898e947eb7c61bb98cfa82107a585a4

shangjian/LanJu/obj/Debug/LanJu.csproj.FileListAbsolute.txt

@@ -66,7 +66,6 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\bin\Debug\LanJu.exe.
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\bin\Debug\LanJu.exe
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\bin\Debug\LanJu.pdb
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\LanJu.csproj.AssemblyReference.cache
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\LanJu.csproj.SuggestedBindingRedirects.cache
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\MainWindow.g.cs
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\Views\LanJu_Complete.g.cs
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\Views\LanJu_DeviceItems.g.cs

shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-2f1b5aa9ca9324e732c8dc8ad98b9a6b4836d80a
+25f359d3fd7d560a1dec87ab383b84f91627954af157e6d29c6e8f4a1e97b265

shangjian/LanJuControl/obj/Debug/LanJuControl.csproj.FileListAbsolute.txt

@@ -18,7 +18,6 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\bin\Debug\Lan
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\bin\Debug\LanJuControl.exe
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\bin\Debug\LanJuControl.pdb
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\obj\Debug\LanJuControl.csproj.AssemblyReference.cache
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\obj\Debug\LanJuControl.csproj.SuggestedBindingRedirects.cache
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\obj\Debug\LanJuControl.csproj.CoreCompileInputs.cache
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\obj\Debug\LanJuControl.exe
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJuControl\obj\Debug\LanJuControl.pdb

shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-75b64367c22655afbbe469bfdef148da7e480363
+ab6200e7439de6fae56f8e5e273baab411e88f2aca14c5503b8c523b97872741

shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-57f46a9d84fe0cf9b52d094f86f1528843920246
+69f46fa79bc0e95799efe49dbdaf9ca40810cf68925408e6bb5441d8be91b8fd

shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.FileListAbsolute.txt

@@ -5,7 +5,6 @@ D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\HtmlAg
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.pdb
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.xml
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.AssemblyReference.cache
-D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.SuggestedBindingRedirects.cache
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CoreCompileInputs.cache
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CopyComplete
 D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.exe

shangjian/XGL.Data/DBService/FormingMachineService.cs

@@ -466,7 +466,7 @@ VALUES
                                 [user_name], [nick_name], [feedback_channel], [feedback_time], [record_user], [status], 
                                 [remark], [work_time], [machine_code], [machine_name], [team_code], [shift_code], 
                                 [attr1], [attr2], [attr3], [attr4], [create_by], [create_time], 
-                                [update_time], [update_by], [upload_time], [upload_status], [upload_msg], [prod_type], 
+                                [update_time], [update_by], [upload_status], [upload_msg], [prod_type], 
                                 [use_man], [work_center],[del_flag],[batch],[end_report],[parent_order],[IP],[version]) 
                                 VALUES 
                                 ('{Common.GetUUID()}', 'SELF', '{reportCode}', '{selectRow["workorder_code"]}', '{selectRow["product_code"]}', '{selectRow["product_name"]}', 
@@ -474,7 +474,7 @@ VALUES
                                 '{LoginUser.UserCode}', '{LoginUser.UserName}', 'PC', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', 'PREPARE',
                                 '无', '{workTime}', '{deviceCode}', '{lineName}', N'{LoginUser.TeamCode}', '{selectRow["shift_id"]}', 
                                 NULL, NULL, NULL, NULL, '{LoginUser.UserName}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', 
-                                '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}',GetDate(), '0',  NULL, 'prod',
+                                '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}' '0',  NULL, 'prod',
                                  {userCount}, '{costCenter}','0','{batchCode}','{isEndReport}','{0}','{LoginUser.CurrDeviceIP}','{LoginUser.Version}');";
 
                 string subOrderSql = $@"INSERT INTO [dbo].[mes_report_work] 
@@ -483,7 +483,7 @@ VALUES
                                 [user_name], [nick_name], [feedback_channel], [feedback_time], [record_user], [status], 
                                 [remark], [work_time], [machine_code], [machine_name], [team_code], [shift_code], 
                                 [attr1], [attr2], [attr3], [attr4], [create_by], [create_time], 
-                                [update_time], [update_by], [upload_time], [upload_status], [upload_msg], [prod_type], 
+                                [update_time], [update_by], [upload_status], [upload_msg], [prod_type], 
                                 [use_man], [work_center],[del_flag],[batch],[end_report],[parent_order],[IP],[version]) 
                                 VALUES 
                                 ('{Common.GetUUID()}', 'SELF', '{reportCode}', '{subOrder}', '{subProductCode}', '{subProductName}', 
@@ -491,7 +491,7 @@ VALUES
                                 '{LoginUser.UserCode}', '{LoginUser.UserName}', 'PC', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', 'PREPARE',
                                 '无', '{workTime}', '{deviceCode}', '{lineName}', N'{LoginUser.TeamCode}', '{selectRow["shift_id"]}', 
                                 NULL, NULL, NULL, NULL, '{LoginUser.UserName}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', 
-                                '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}',GetDate(), '0',  NULL, 'prod',
+                                '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', '0',  NULL, 'prod',
                                  {userCount}, '{costCenter}','0','{batchCode}','{isEndReport}','{selectRow["workorder_code"]}','{LoginUser.CurrDeviceIP}','{LoginUser.Version}');";
                 sqlList.Add(mainOrderSql);
                 sqlList.Add(subOrderSql);
@@ -505,7 +505,7 @@ VALUES
                                 [user_name], [nick_name], [feedback_channel], [feedback_time], [record_user], [status], 
                                 [remark], [work_time], [machine_code], [machine_name], [team_code], [shift_code], 
                                 [attr1], [attr2], [attr3], [attr4], [create_by], [create_time], 
-                                [update_time], [update_by], [upload_time], [upload_status], [upload_msg], [prod_type], 
+                                [update_time], [update_by], [upload_status], [upload_msg], [prod_type], 
                                 [use_man], [work_center],[del_flag],[batch],[end_report],[parent_order],[IP],[version]) 
                                 VALUES 
                                 ('{Common.GetUUID()}', 'SELF', '{reportCode}', '{selectRow["workorder_code"]}', '{selectRow["product_code"]}', '{selectRow["product_name"]}', 
@@ -513,7 +513,7 @@ VALUES
                                 '{LoginUser.UserCode}', '{LoginUser.UserName}', 'PC', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', 'PREPARE',
                                 '无', '{workTime}', '{deviceCode}', '{lineName}', N'{LoginUser.TeamCode}', '{selectRow["shift_id"]}', 
                                 NULL, NULL, NULL, NULL, '{LoginUser.UserName}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', 
-                                '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}',GetDate(), '0',  NULL, 'prod',
+                                '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', '{LoginUser.UserName}', '0',  NULL, 'prod',
                                  {userCount}, '{costCenter}','0','{batchCode}','{isEndReport}','{selectRow["parent_order"]}','{LoginUser.CurrDeviceIP}','{LoginUser.Version}');";
                 sqlList.Add(mainOrderSql);
             }

shangjian/XGL.Data/DBServiceFinishProd/FinishProdDBService.cs

@@ -515,7 +515,7 @@ select  a.TrayCode,a.ProductBarNo,a.carcode,a.createtime,a.lineno,b.HadNumber
         public DataTable GetWetPlanInfo(string deviceCode, string date)
         {
             string sql = $@"select workorder.factory_code,workorder.product_date as plan_time, workorder.workorder_id,workorder.workorder_code, product_code,product_name,
-product_spc,shifts.shift_desc,prod_line_code,workorder.status,route_code,quantity_split,unit,workorder.shift_id ,batch.batch_code,batch.batch_quantity,sort_no, workorder.parent_order,batch.qc_status,batch.status as batchStatus
+product_spc,shifts.shift_desc,prod_line_code,workorder.status,route_code,quantity_split,unit,workorder.shift_id ,batch.batch_code,batch.batch_quantity,sort_no, workorder.parent_order,batch.qc_status,batch.status as batchStatus,workorder_code_sap
 from  pro_order_workorder workorder WITH (NOLOCK)
 left JOIN base_shifts_t shifts WITH (NOLOCK) on workorder.shift_id = shifts.shift_id
 left JOIN pro_order_workorder_batch batch WITH (NOLOCK) on workorder.workorder_id = batch.workorder_id  

shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-71f6ce92ed5dcb89571c00831dde3abe158ec5db
+9632f572e4e99b96159e5a32041c3dab14c406f4801ba34f3987b9c789ca7320

shangjian/XGL.Model/Model/MachineRepairModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XGL.Models.Model
+{
+    /// <summary>
+    /// 设备报修 equipmentCode（设备编码）、factory（工厂源）、userName（用户账号）、phoneNumber（联系方式）、userNickName（用户昵称）
+    /// </summary>
+    public class MachineRepairModel
+    {
+        public string equipmentCode { get; set; }
+        public string factory { get; set; }
+        public string userName { get; set; }
+        public string phoneNumber { get; set; }
+        public string userNickName { get; set; }
+    }
+}

shangjian/XGL.Model/XGL.Models.csproj

@@ -102,6 +102,7 @@
     <Compile Include="Model\FoamingMac\FoamingMacModel.cs" />
     <Compile Include="Model\LineCatchArea.cs" />
     <Compile Include="Model\LinePreInfo.cs" />
+    <Compile Include="Model\MachineRepairModel.cs" />
     <Compile Include="Model\MaterialBom.cs" />
     <Compile Include="Model\MaterialInfo.cs" />
     <Compile Include="Model\MesViewData.cs" />

shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-0cc4d60a314f2e3943ed817c62d6179b8b14a6f2
+5f00ecb14f7afd118f8e6223592f4c0db809a44632bf5fbb9a572b0694f950ff