打印修改

UAS_MES_YDCY/FunctionCode/Make/Make_FuselageLabelPrintRFID.cs

@@ -382,48 +382,52 @@ namespace UAS_MES_NEW.Make
                             }
                             OperateResult.AppendText("This example has been successfully demonstrated!\n");
 
+                            bool Passed=true;
                             SAMPLE_END:
                             {
                                 uRet = DSTP2x_Lib_Clear();
+                                Passed = false;
                             }
 
-                            //记录日志
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "机身标打印", "机身标打印成功", sncode.Text, "");
-                            //更新打印的数据
-                            if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "机身标打印", "机身标打印成功", User.UserCode, out oErrorMessage))
-                            {
-                                //提示正确返回时传递的信息
-                                if (oErrorMessage.Contains("AFTERSUCCESS"))
-                                    OperateResult.AppendText(">>" + oErrorMessage + "\n");
-                                if (CollectRemark.Checked && Remark.Text != "")
-                                {
-                                    LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
-                                }
-                                //清空输入框的值，聚焦
-                                sncode.Text = "";
-                                sncode.Focus();
-                                //刷新打印数量和剩余数量
-                                dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,nvl(ma_unlimitin,0)ma_unlimitin from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
-                                BaseUtil.SetFormValue(Controls, dt);
-                                mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
-                                //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
-                                if (int.Parse(mcd_remainqty.Text) == 0 && ma_unlimitin == "0")
+                            if (Passed) {
+                                //记录日志
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "机身标打印", "机身标打印成功", sncode.Text, "");
+                                //更新打印的数据
+                                if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "机身标打印", "机身标打印成功", User.UserCode, out oErrorMessage))
                                 {
-                                    OperateResult.AppendText(">>工单：" + ma_code.Text + "打印完成，>>请输入SN\n", Color.Green);
+                                    //提示正确返回时传递的信息
+                                    if (oErrorMessage.Contains("AFTERSUCCESS"))
+                                        OperateResult.AppendText(">>" + oErrorMessage + "\n");
+                                    if (CollectRemark.Checked && Remark.Text != "")
+                                    {
+                                        LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
+                                    }
+                                    //清空输入框的值，聚焦
+                                    sncode.Text = "";
+                                    sncode.Focus();
+                                    //刷新打印数量和剩余数量
+                                    dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,nvl(ma_unlimitin,0)ma_unlimitin from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
+                                    BaseUtil.SetFormValue(Controls, dt);
+                                    mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
+                                    //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
+                                    if (int.Parse(mcd_remainqty.Text) == 0 && ma_unlimitin == "0")
+                                    {
+                                        OperateResult.AppendText(">>工单：" + ma_code.Text + "打印完成，>>请输入SN\n", Color.Green);
+                                    }
+                                    //剩余数量不为0
+                                    else
+                                    {
+                                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                                    }
                                 }
-                                //剩余数量不为0
                                 else
                                 {
-                                    OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                                    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                                    //清空输入框的值，聚焦
+                                    sncode.Text = "";
+                                    sncode.Focus();
                                 }
                             }
-                            else
-                            {
-                                OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                                //清空输入框的值，聚焦
-                                sncode.Text = "";
-                                sncode.Focus();
-                            }
                         }
                         //标签为空
                         else