增加异常处理

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -269,7 +269,7 @@ namespace UAS_MES.Make
                                 sql.Append("update makeserial set ms_status=3 ,ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
                                 dh.ExecuteSql(sql.GetString(), "update");
                             }
-                            //采购件，则将不良信息插入不良零件表中MAKEBADRSPART
+                            //没有生产信息，判定为采购件，则将不良信息插入不良零件表中MAKEBADRSPART
                             else
                             {
                                 sql.Clear();
@@ -316,24 +316,25 @@ namespace UAS_MES.Make
                             decompose = true;
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "物料" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "拆解", "拆解成功", ms_sncode.Text, "");
                         }
-                        else {
-                            OperateResult.AppendText(">>>没有选择拆解方式\n",Color.Red);
+                        else
+                        {
+                            OperateResult.AppendText(">>>没有选择拆解方式\n", Color.Red);
                             return;
                         }
                     }
                 }
-                }
-                if (decompose)
-                {
-                    count++;
-                    deccount.Text = count + "";
-                    LoadData(sncode_1, sender, new KeyEventArgs(Keys.Enter));
-                }
-                else
-                {
-                    OperateResult.AppendText("没有选择拆解项\n", Color.Red);
-                }
             }
+            if (decompose)
+            {
+                count++;
+                deccount.Text = count + "";
+                LoadData(sncode_1, sender, new KeyEventArgs(Keys.Enter));
+            }
+            else
+            {
+                OperateResult.AppendText("没有选择拆解项\n", Color.Red);
+            }
+        }
 
         private void LabelDataGridView_Sorted(object sender, EventArgs e)
         {

UAS-MES/PublicMethod/ftpOperater.cs

@@ -281,7 +281,12 @@ namespace UAS_MES.PublicMethod
             if (!Directory.Exists(DownLoadTo))
             Directory.CreateDirectory(DownLoadTo);
             //将文件复制到指定位置
-            File.Copy(sourceFile, destFile, true);
+            try
+            {
+                File.Copy(sourceFile, destFile, true);
+            }
+            catch {
+            }
             return destFile;
         }