Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -30,6 +30,9 @@ namespace UAS_MES.Make
 
         ApplicationClass lbl;
 
+        string oMakeCode = "";
+        string oMsId = "";
+
         string oErrorMessage = "";
 
         Thread InitPrint;
@@ -81,11 +84,9 @@ namespace UAS_MES.Make
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
                 {
                     //定义临时变量
-                    string oMakeCode = "";
-                    string oMsId = "";
                     string oStatus = "";
                     //调用公共方法CheckStepSNAndMacode判断工序是否正确
-                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text == oMakeCode ? oMakeCode : "", User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out oErrorMessage))
+                    if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out oErrorMessage))
                     {
                         //IF (如果ma_code 为空)THEN
                         if (ma_code.Text == "" || ma_code.Text != oMakeCode)
@@ -125,6 +126,7 @@ namespace UAS_MES.Make
                             else
                             {
                                 OperateResult.AppendText(">>无序列号" + sncode.Text + "对应工单信息\n", Color.Red);
+                                return;
                             }
                         }
                         //所选标签不为空

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -171,7 +171,7 @@ namespace UAS_MES.Make
                         {
                             //判断线外，必须已完工并且未入库
                             dt = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from mes_package_view  left join makeserial on v_barcode=ms_sncode where  v_outboxcode='" + outboxcode.Text + "' and ms_status<>2", "select");
-                            if (dt.Rows[0][0].ToString() != "" || (unfinpack != "0" || unfinpack == ""))
+                            if (dt.Rows[0][0].ToString() != "" &&  (unfinpack != "0" || unfinpack == ""))
                             {
                                 OperateResult.AppendText(">>序列号" + dt.Rows[0][0].ToString() + "尚未完工\n", Color.Red);
                                 return;