1.生成VDA时校验在途数量后，选择条件结果的bug调整

Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs

@@ -289,10 +289,17 @@ namespace Stone.WinModule.Standard
                 bool quantity_new = false; //是否采用新的数量来计算
                 if (msg2 != "")
                 {
-                    if (MyMessageBox.ShowQuestionPop("以下询问是否继续？\r\n" + msg2))
+                    var dr = ShowQuestionPopDr("以下询问是否继续？\r\n" + msg2);
+                    if(dr == DialogResult.Cancel)
+                        return;
+                    if (dr==DialogResult.OK)
                     {
                         quantity_new = true;
                     }
+                    else
+                    {
+                        quantity_new = false;
+                    }
                 }
 
                 CreateVDA(dtData, quantity_new);
@@ -732,5 +739,15 @@ namespace Stone.WinModule.Standard
             string partcode;
             int qty;
         }
+
+        public static DialogResult ShowQuestionPopDr(string MessageInfo)
+        {
+            var dr = new DialogResult();
+
+            frmMessageQuestion frm = new frmMessageQuestion(1);
+            frm.ShowQuestion(MessageInfo);
+            dr = frm.DialogResult;
+            return dr;
+        }
     }
 }

Stone.WinForm/Stone.WinModule/Standard/frmMessageQuestion.cs

@@ -10,31 +10,46 @@ namespace Stone.WinModule.Standard
 {
     public partial class frmMessageQuestion : Form
     {
+        private int BillType = 0;
         public frmMessageQuestion()
         {
             InitializeComponent();
         }
+        public frmMessageQuestion(int billType)
+        {
+            InitializeComponent();
+            BillType = billType;
+        }
 
         public DialogResult ShowQuestion(string msg)
         {
             this.lblMessage.Text = msg;
+            this.DialogResult = DialogResult.None;
             return this.ShowDialog();
         }
 
         private void btnOK_Click(object sender, EventArgs e)
         {
-            frmPasswordVerify frm = new frmPasswordVerify();
-            frm.UserName = User.UserInfo.UserName;
-            if (frm.ShowDialog() == DialogResult.OK)
+            if (BillType == 0)
+            {
+                frmPasswordVerify frm = new frmPasswordVerify();
+                frm.UserName = User.UserInfo.UserName;
+                if (frm.ShowDialog() == DialogResult.OK)
+                {
+                    this.DialogResult = DialogResult.OK;
+                    this.Close();
+                }
+            }
+            else
             {
                 this.DialogResult = DialogResult.OK;
                 this.Close();
             }
-
         }
 
         private void btnCancel_Click(object sender, EventArgs e)
         {
+            DialogResult = DialogResult.No;
             this.Close();
         }
     }