重新提交

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -91,35 +91,44 @@ namespace UAS_MES.Make
                         if (PrintLabel.SelectedValue != null)
                         {
                             //按照打印张数打印
-                            Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text),indate[PrintLabel.SelectedIndex]);
+                            Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
                             //提示用户打印成功
                             OperateResult.AppendText(">>打印成功\n", Color.Green);
                             //更新打印的数据
-                            LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "机身标打印", User.UserSourceCode, User.UserName, "机身标打印成功", out oErrorMessage);
-                            //清空输入框的值，聚焦
-                            sncode.Text = "";
-                            sncode.Focus();
-                            //刷新打印数量和剩余数量
-                            mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
-                            mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
-
-                            //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
-                            if (int.Parse(mcd_remainqty.Text) == 0)
+                            if (LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "机身标打印", User.UserSourceCode, User.UserCode, "机身标打印成功", out oErrorMessage))
                             {
-                                BaseUtil.CleanForm(this);
-                                OperateResult.AppendText(">>工单：" + ma_code.Text + "打印完成，>>请输入SN\n", Color.Green);
+                                //清空输入框的值，聚焦
+                                sncode.Text = "";
+                                sncode.Focus();
+                                //刷新打印数量和剩余数量
+                                dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty 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)
+                                {
+                                    BaseUtil.CleanForm(this);
+                                    OperateResult.AppendText(">>工单：" + ma_code.Text + "打印完成，>>请输入SN\n", Color.Green);
+                                }
+                                //剩余数量不为0
+                                else
+                                {
+                                    //提示用户“>>请输入SN”
+                                    OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                }
                             }
-                            //剩余数量不为0
                             else
                             {
-                                //提示用户“>>请输入SN”
-                                OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                sncode.Text = "";
+                                sncode.Focus();
+                                OperateResult.AppendText(">>更新工序失败" + oErrorMessage + "\n", Color.Red);
                             }
                         }
                         //标签为空
                         else
                         {
-                            OperateResult.AppendText(">>无可用标签\n", Color.Red);
+                            OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red);
                             sncode.Text = "";
                         }
                     }
@@ -129,7 +138,8 @@ namespace UAS_MES.Make
                         sncode.Text = "";
                     }
                 }
-                else {
+                else
+                {
                     OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
                     sncode.Text = "";
                 }
@@ -140,12 +150,13 @@ namespace UAS_MES.Make
             dt = (DataTable)dh.ExecuteSql("select pl_labelname,pl_labelcode,to_char(nvl(pl_indate,sysdate),'YYYY-MM-DD HH24:Mi:SS') pl_indate,pl_labelurl from productlabel where pl_prodcode='" + ma_prodcode.Text + "'and PL_LABELTYPE='机身标' order by pl_isdefault desc", "select");
             if (dt.Rows.Count == 0)
             {
-                OperateResult.AppendText(">>该序列号对应的产品未维护机身标标签模板\n", Color.Red);
+                OperateResult.AppendText(">>产品:" + ma_prodcode.Text + "未维护机身标标签模板\n", Color.Red);
             }
             PrintLabel.DataSource = dt;
             PrintLabel.DisplayMember = "pl_labelname";
             PrintLabel.ValueMember = "pl_labelcode";
             ftpOperater ftp = new ftpOperater();
+            indate = new System.DateTime[dt.Rows.Count];
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 BaseUtil.GetPrintLabel(dt.Rows[i]["pl_labelname"].ToString(), dt.Rows[i]["pl_labelurl"].ToString(), dt.Rows[i]["pl_indate"].ToString());