3

DeviceRepair.Api/Controllers/MaintenanceController.cs

@@ -426,5 +426,26 @@ namespace DeviceRepair.Api.Controllers
             }
             return apiResponseData;
         }
+
+        /// <summary>
+        /// 判断维修单是否提交
+        /// </summary>
+        /// <param name="AutoID"></param>
+        /// <returns></returns>
+        [HttpGet, HttpAuthorize, Route("MaintionDataIsSubmit")]
+        public APIResponseData MaintionDataIsSubmit(int AutoID)
+        {
+            APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "查询失败！" };
+            try
+            {
+                return MaintenanceAccess.Instance.MaintionDataIsSubmit(AutoID);
+            }
+            catch (Exception ex)
+            {
+                apiResponseData.Code = -1;
+                apiResponseData.Message = ex.Message;
+            }
+            return apiResponseData;
+        }
     }
 }

DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -78,37 +78,37 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>05/28/2024 22:39:54</publishTime>
     </File>
     <File Include="bin/DeviceRepair.Api.dll">
-      <publishTime>05/29/2024 13:43:16</publishTime>
+      <publishTime>05/30/2024 09:50:08</publishTime>
     </File>
     <File Include="bin/DeviceRepair.Api.pdb">
-      <publishTime>05/29/2024 13:43:16</publishTime>
+      <publishTime>05/30/2024 09:50:08</publishTime>
     </File>
     <File Include="bin/DeviceRepair.DataAccess.dll">
-      <publishTime>05/29/2024 13:43:15</publishTime>
+      <publishTime>05/30/2024 09:50:07</publishTime>
     </File>
     <File Include="bin/DeviceRepair.DataAccess.dll.config">
       <publishTime>05/21/2024 00:58:04</publishTime>
     </File>
     <File Include="bin/DeviceRepair.DataAccess.pdb">
-      <publishTime>05/29/2024 13:43:15</publishTime>
+      <publishTime>05/30/2024 09:50:07</publishTime>
     </File>
     <File Include="bin/DeviceRepair.Models.dll">
-      <publishTime>05/29/2024 10:07:57</publishTime>
+      <publishTime>05/30/2024 09:50:07</publishTime>
     </File>
     <File Include="bin/DeviceRepair.Models.dll.config">
       <publishTime>04/16/2024 11:52:33</publishTime>
     </File>
     <File Include="bin/DeviceRepair.Models.pdb">
-      <publishTime>05/29/2024 10:07:57</publishTime>
+      <publishTime>05/30/2024 09:50:07</publishTime>
     </File>
     <File Include="bin/DeviceRepair.Utils.dll">
-      <publishTime>05/29/2024 13:43:15</publishTime>
+      <publishTime>05/30/2024 09:50:07</publishTime>
     </File>
     <File Include="bin/DeviceRepair.Utils.dll.config">
       <publishTime>05/21/2024 00:58:03</publishTime>
     </File>
     <File Include="bin/DeviceRepair.Utils.pdb">
-      <publishTime>05/29/2024 13:43:15</publishTime>
+      <publishTime>05/30/2024 09:50:07</publishTime>
     </File>
     <File Include="bin/EntityFramework.dll">
       <publishTime>05/28/2024 22:39:54</publishTime>

DeviceRepair.DataAccess/DeviceAccess.cs

@@ -325,15 +325,21 @@ namespace DeviceRepair.DataAccess
                         }).Where(exp)
                         .ToList();
 
+                if ((Datas?.Count ?? 0) == 0)
+                {
+                    apiResponseData.Code = 1;
+                    apiResponseData.Data = new List<DeviceInformationInfoTree>();
+                    apiResponseData.Message = "";
+                    return apiResponseData;
+                }
+
                 foreach (DeviceInformationInfoTree item in Datas)
                 {
                     item.ParentRouteId = RouteIds.Contains(item.Route) ? Root[item.Route].GUID : Guid.Empty;
                 }
 
-
-
                 List<Guid> HasValues = new List<Guid>();
-                Guid[] gids = Datas.Select(x => x.ParentRouteId).Distinct().ToArray(); ;
+                Guid[] gids = Datas.Select(x => x.ParentRouteId).Distinct().ToArray();
 
                 do
                 {

DeviceRepair.DataAccess/MaintenanceAccess.cs

@@ -120,10 +120,6 @@ namespace DeviceRepair.DataAccess
                 }
 
                 DateTime CurrentTime = DateTime.Now;
-
-                db.ChangeDatabase("main");
-                db.BeginTran();
-
                 if (Entity.AutoID > 0)
                 {
                     /// 修改
@@ -145,33 +141,48 @@ namespace DeviceRepair.DataAccess
                     Entity.SubmitOn = CurrentTime;
                 }
 
-                DeviceWarrantyRequestMaintaionInfo MaintaionInfo = db.Saveable(Entity).ExecuteReturnEntity();
+                try
-                if (MaintaionInfo != null)
                 {
-                    bool IsSuccess = true;
+                    db.ChangeDatabase("main");
-                    if (AccessoriesItems != null)
+                    db.BeginTran();
+
+                    if (db.Queryable<DeviceWarrantyRequestMaintaionInfo>().Any(x => x.FormID == Entity.AutoID && x.SubmitBy > 0))
+                        throw new Exception($"当前数据已被处理，请刷新后再试!");
+
+                    DeviceWarrantyRequestMaintaionInfo MaintaionInfo = db.Saveable(Entity).ExecuteReturnEntity();
+                    if (MaintaionInfo != null)
                     {
-                        foreach (var item in AccessoriesItems)
+                        bool IsSuccess = true;
+                        if (AccessoriesItems != null)
                         {
-                            item.Guid = Guid.NewGuid();
+                            foreach (var item in AccessoriesItems)
-                            item.MaintaionID = MaintaionInfo.AutoID;
+                            {
-                            item.CreatBy = Operation.Operator;
+                                item.Guid = Guid.NewGuid();
-                            item.CreatOn = CurrentTime;
+                                item.MaintaionID = MaintaionInfo.AutoID;
+                                item.CreatBy = Operation.Operator;
+                                item.CreatOn = CurrentTime;
+                            }
+
+                            IsSuccess = db.Saveable(AccessoriesItems).ExecuteCommand() == AccessoriesItems.Count;
                         }
 
-                        IsSuccess = db.Saveable(AccessoriesItems).ExecuteCommand() == AccessoriesItems.Count;
+                        if (IsSuccess)
+                        {
+                            db.CommitTran();
+                            apiResponseData.Code = 1;
+                            apiResponseData.Message = string.Empty;
+                        }
                     }
-
+                    else
-                    if (IsSuccess)
                     {
-                        db.CommitTran();
+                        db.RollbackTran();
-                        apiResponseData.Code = 1;
-                        apiResponseData.Message = string.Empty;
                     }
                 }
-                else
+                catch (Exception)
                 {
+
                     db.RollbackTran();
+                    throw;
                 }
 
             }
@@ -234,17 +245,25 @@ namespace DeviceRepair.DataAccess
                 Form.CreatorName = Operation.OperatorName;
                 Form.CreatOn = CurrentTime;
 
-                int AutoID = db.Saveable(Form).ExecuteReturnEntity()?.AutoID ?? 0;
+                try
-                if (AutoID > 0)
                 {
-                    db.CommitTran();
+                    int AutoID = db.Saveable(Form).ExecuteReturnEntity()?.AutoID ?? 0;
-                    apiResponseData.Code = 1;
+                    if (AutoID > 0)
-                    apiResponseData.Message = string.Empty;
+                    {
-                    apiResponseData.Data = AutoID;
+                        db.CommitTran();
+                        apiResponseData.Code = 1;
+                        apiResponseData.Message = string.Empty;
+                        apiResponseData.Data = AutoID;
+                    }
+                    else
+                    {
+                        db.RollbackTran();
+                    }
                 }
-                else
+                catch (Exception)
                 {
                     db.RollbackTran();
+                    throw;
                 }
             }
             catch (SqlSugarException e)
@@ -509,5 +528,37 @@ namespace DeviceRepair.DataAccess
             }
             return apiResponseData;
         }
+
+        /// <summary>
+        /// 判断维修单是否提交
+        /// </summary>
+        /// <param name="FormAutoId"></param>
+        /// <returns></returns>
+        public APIResponseData MaintionDataIsSubmit(int FormAutoId)
+        {
+            APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = $"数据插入失败！" };
+            try
+            {
+                if (FormAutoId == 0)
+                    throw new Exception("待查询的维修单编号不能为空！");
+
+                db.ChangeDatabase("main");
+
+                int Count = db.Queryable<DeviceWarrantyRequestMaintaionInfo>().With(SqlWith.NoLock).Count(x => x.FormID == FormAutoId && x.SubmitBy > 0);
+                apiResponseData.Code = 1;
+                apiResponseData.Data = Count;
+            }
+            catch (SqlSugarException e)
+            {
+                apiResponseData.Code = -1;
+                apiResponseData.Message = e.Message;
+            }
+            catch (Exception ex)
+            {
+                apiResponseData.Code = -1;
+                apiResponseData.Message = ex.Message;
+            }
+            return apiResponseData;
+        }
     }
 }

DeviceRepair.Models/APIResponseData.cs

@@ -49,7 +49,6 @@ namespace DeviceRepair.Models
             }
             catch (Exception)
             {
-
                 throw;
             }
         }

DeviceRepairAndOptimization/App.config

@@ -72,14 +72,14 @@
     <!--<add key="Conn" value="Server=192.168.10.5;Database=DriveMaintenance;User=sa;Password=niaokang123;"/>-->
     <!--<add key="ServiceName" value="DeviceRepairAPI" />-->
 
-    <add key="ServiceIP" value="localhost" />
+    <!--<add key="ServiceIP" value="localhost" />
-    <add key="ServiceName" value="DeviceRepairAPI" />
+    <add key="ServiceName" value="DeviceRepairAPI" />-->
 
     <!--<add key="ServiceIP" value="www.clovejunti.cn:8181" />
     <add key="ServiceName" value="DeviceRepairAPI2"/>-->
 
-    <!--<add key="ServiceIP" value="193.112.23.48:8081" />
+    <add key="ServiceIP" value="193.112.23.48:8081" />
-    <add key="ServiceName" value="DeviceRepairApi2" />-->
+    <add key="ServiceName" value="DeviceRepairApi2" />
 
     <add key="SecureKey" value="A4E3uxwPTQ8Jpi7Sp4" />
     <add key="ConnType" value="api" />

DeviceRepairAndOptimization/Biz/MaintenanceManager.cs

@@ -179,5 +179,39 @@ namespace DeviceRepairAndOptimization.Biz
             }
             return apiResponseData;
         }
+
+        /// <summary>
+        /// 判断维修单是否提交
+        /// </summary>
+        /// <param name="AutoID"></param>
+        /// <returns></returns>
+        public APIResponseData MaintionDataIsSubmit(int AutoID)
+        {
+            APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "查询失败！" };
+            try
+            {
+                switch (DeviceRepair.Utils.Config.Configurations.Properties.ConnType?.ToLower())
+                {
+                    case "api":
+                        apiResponseData = ApiHelper.Instance.SendMessage(new HttpItem
+                        {
+                            URL = $"{ServiceRouteConstValue.MaintionDataIsSubmit}?AutoID={AutoID}",
+                            Method = "Get",
+                            ContentType = "application/json; charset=utf-8",
+                        });
+                        break;
+
+                    default:
+                        apiResponseData = MaintenanceAccess.Instance.MaintionDataIsSubmit(AutoID);
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                apiResponseData.Code = -1;
+                apiResponseData.Message = ex.Message;
+            }
+            return apiResponseData;
+        }
     }
 }

DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.Designer.cs

@@ -175,13 +175,13 @@
             // gridControl1
             // 
             this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2);
-            this.gridControl1.Location = new System.Drawing.Point(12, 12);
+            this.gridControl1.Location = new System.Drawing.Point(12, 13);
             this.gridControl1.MainView = this.gridView1;
             this.gridControl1.Margin = new System.Windows.Forms.Padding(2);
             this.gridControl1.Name = "gridControl1";
             this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.reposBtnStatus});
-            this.gridControl1.Size = new System.Drawing.Size(1011, 531);
+            this.gridControl1.Size = new System.Drawing.Size(1011, 529);
             this.gridControl1.TabIndex = 4;
             this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -337,7 +337,7 @@
             this.layoutControlItem1.Control = this.gridControl1;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(1015, 535);
+            this.layoutControlItem1.Size = new System.Drawing.Size(1015, 533);
             this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem1.TextVisible = false;
             // 

DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="toolbarFormManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>205, 17</value>
+    <value>17, 55</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -142,7 +142,7 @@
 </value>
   </data>
   <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>391, 17</value>
+    <value>17, 93</value>
   </metadata>
   <data name="barButtonItem3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>205, 17</value>
+    <value>17, 55</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btn_AddItem.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -302,7 +302,7 @@
 </value>
   </data>
   <metadata name="toolbarFormManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>336, 17</value>
+    <value>17, 93</value>
   </metadata>
   <data name="btn_SaveAccessories.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

DeviceRepairAndOptimization/Pages/Maintain/pageMaintainEdit.cs

@@ -298,6 +298,10 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
 
             try
             {
+                APIResponseData apiResponseData = MaintenanceManager.Instance.MaintionDataIsSubmit(CurrentRequestForm.AutoID);
+                if (!apiResponseData.IsSuccess || apiResponseData.ToInt() > 0)
+                    return;
+
                 DeviceWarrantyRequestMaintaionView Entity = new DeviceWarrantyRequestMaintaionView
                 {
                     AccessoriesItems = Accessories,
@@ -319,13 +323,12 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
                     Entity.AutoID = CurrentRequestForm.MaintaionItems.AutoID;
                 }
 
-                APIResponseData apiResponseData = MaintenanceManager.Instance.DeviceMaintion(Entity);
+                apiResponseData = MaintenanceManager.Instance.DeviceMaintion(Entity);
                 if (!apiResponseData.IsSuccess)
                     throw new Exception(apiResponseData.Message);
             }
             catch (Exception ex)
             {
-
                 throw;
             }
         }

DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.Designer.cs

@@ -79,7 +79,7 @@
             tableLayoutPanel1.RowCount = 2;
             tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F));
             tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            tableLayoutPanel1.Size = new System.Drawing.Size(1839, 854);
+            tableLayoutPanel1.Size = new System.Drawing.Size(0, 0);
             tableLayoutPanel1.TabIndex = 0;
             tableLayoutPanel1.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanel1_Paint);
             // 
@@ -123,7 +123,7 @@
             this.tvDevices.OptionsSelection.KeepSelectedOnClick = false;
             this.tvDevices.OptionsView.AutoWidth = false;
             this.tvDevices.OptionsView.BestFitNodes = DevExpress.XtraTreeList.TreeListBestFitNodes.All;
-            this.tvDevices.Size = new System.Drawing.Size(1831, 798);
+            this.tvDevices.Size = new System.Drawing.Size(1, 1);
             this.tvDevices.TabIndex = 13;
             this.tvDevices.TreeLevelWidth = 23;
             // 
@@ -290,12 +290,12 @@
             stackPanel1.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft;
             stackPanel1.Location = new System.Drawing.Point(3, 3);
             stackPanel1.Name = "stackPanel1";
-            stackPanel1.Size = new System.Drawing.Size(1833, 42);
+            stackPanel1.Size = new System.Drawing.Size(1, 42);
             stackPanel1.TabIndex = 0;
             // 
             // EditSearch
             // 
-            this.EditSearch.Location = new System.Drawing.Point(1528, 5);
+            this.EditSearch.Location = new System.Drawing.Point(-304, 5);
             this.EditSearch.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7);
             this.EditSearch.Name = "EditSearch";
             this.EditSearch.Properties.Appearance.Font = new System.Drawing.Font("Verdana", 10F);
@@ -318,7 +318,7 @@
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.ClientSize = new System.Drawing.Size(1839, 854);
+            this.ClientSize = new System.Drawing.Size(0, 0);
             this.Controls.Add(tableLayoutPanel1);
             this.Name = "page_DriveTypeTree";
             this.Text = "page_DriveTypeTree";

DeviceRepairAndOptimization/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.8")]
+[assembly: AssemblyVersion("2.0.1.9")]
-[assembly: AssemblyFileVersion("2.0.1.8")]
+[assembly: AssemblyFileVersion("2.0.1.9")]

DeviceRepairAndOptimization/ServiceRouteConstValue.cs

@@ -309,6 +309,11 @@
         /// </summary>
         public const string DoubleValidateMaintenance = "Api/Maintenance/ValidateMaintenance";
 
+        /// <summary>
+        /// 判断维修单是否提交
+        /// </summary>
+        public const string MaintionDataIsSubmit = "Api/Maintenance/MaintionDataIsSubmit";
+
         #endregion
 
         #region 枚举字段

TsSFCDeivceClient/DowntimeFormAdd.cs

@@ -19,7 +19,7 @@ namespace TsSFCDeivceClient
     public partial class DowntimeFormAdd : ToolbarForm
     {
         MailKitHelp mail = new MailKitHelp();
-        string emailPattern = @"^(?("")("".+?(?<!\\)""@)|(([a-zA-Z0-9\-]+\.)+[a-zA-Z]{2,}))$";
+        string emailPattern = @"\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*";
         public DeviceInfo CurrentDeviceInfo = null;
         System.Configuration.Configuration m_Config = System.Configuration.ConfigurationManager.OpenExeConfiguration(System.Configuration.ConfigurationUserLevel.None);
         string ServiceUrl
@@ -126,6 +126,8 @@ namespace TsSFCDeivceClient
                 txtBatch.Enabled = InProduction;
                 if (!InProduction)
                     txtBatch.EditValue = "N/A";
+                else
+                    txtBatch.EditValue = "";
             }
             catch (Exception ex)
             {