添加装箱插入的字段

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -236,7 +236,6 @@ namespace UAS_MES.Make
         {
             bigoutboxcode.Text = NewBigBox.OutBoxCode;
             palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
-            NewBigBox.Close();
         }
 
         private void Print_Click(object sender, EventArgs e)
@@ -277,8 +276,8 @@ namespace UAS_MES.Make
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserSourceCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱采集", "装箱" + bigoutboxcode.Text + "成功", outboxcode.Text, "");
                 bigoutboxcode.Text = LogicHandler.GetOutBoxCode("BIGBOX", "", pa_prodcode.Text, User.UserCode);
                 sql.Clear();
-                sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty)values");
-                sql.Append("(package_seq.nextval,'" + bigoutboxcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',2,'" + pa_prodcode.Text + "',0,'','" + pa_standardqty.Text + "')");
+                sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty,pa_sccode,pa_currentstep)values");
+                sql.Append("(package_seq.nextval,'" + bigoutboxcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',2,'" + pa_prodcode.Text + "',0,'','" + pa_standardqty.Text + "','"+User.UserSourceCode+"','"+User.CurrentStepCode+"')");
                 dh.ExecuteSql(sql.GetString(), "insert");
                 palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
             }

UAS-MES/FunctionCode/Make/Make_NewBigBox.cs

@@ -2,6 +2,7 @@
 using System.Data;
 using System.Windows.Forms;
 using UAS_MES.DataOperate;
+using UAS_MES.Entity;
 using UAS_MES.PublicMethod;
 
 namespace UAS_MES.Make
@@ -11,7 +12,6 @@ namespace UAS_MES.Make
         DataHelper dh;
         DataTable Dbfind;
         //生成的箱类型，2表示大箱号，3表示栈板号
-        string pa_type = "";
 
         string OutBoxCode1;
 
@@ -31,20 +31,6 @@ namespace UAS_MES.Make
         public Make_NewBigBox(string Caller, string MakeCode)
         {
             InitializeComponent();
-            switch (Caller)
-            {
-                case "PACKAGE":
-                    title.Text = "新增大箱号";
-                    pa_type = "2";
-                    break;
-                case "PALLET":
-                    title.Text = "新增栈板号";
-                    pr_bigboxinnerqty.Enabled = false;
-                    pa_type = "3";
-                    break;
-                default:
-                    break;
-            }
             pa_outboxcode.Caller = Caller;
             pa_outboxcode.MakeCode = MakeCode;
         }
@@ -74,12 +60,16 @@ namespace UAS_MES.Make
         {
             if (pa_outboxcode.Text != "" && pr_bigboxinnerqty.Text != "" && pr_code.Text != "")
             {
-                string sql = "insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty)values";
-                sql += "(package_seq.nextval,'" + pa_outboxcode.Text + "','" + pa_outboxcode.MakeCode + "',sysdate,'0','" + pa_type + "','" + pr_code.Text + "',0,'','" + pr_bigboxinnerqty.Text + "')";
+                string sql = "insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty,pa_sccode,pa_currentstep)values";
+                sql += "(package_seq.nextval,'" + pa_outboxcode.Text + "','" + pa_outboxcode.MakeCode + "',sysdate,'0',2,'" + pr_code.Text + "',0,0,'" + pr_bigboxinnerqty.Text + "','" + User.UserSourceCode + "','" + User.CurrentStepCode + "')";
                 dh.ExecuteSql(sql, "insert");
+                Close();
             }
             else
+            {
                 MessageBox.Show("请先填写完整信息");
+                return;
+            }
         }
 
         private void pa_outboxcode_UserControlTextChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_NewPallet.cs

@@ -2,6 +2,7 @@
 using System.Data;
 using System.Windows.Forms;
 using UAS_MES.DataOperate;
+using UAS_MES.Entity;
 using UAS_MES.PublicMethod;
 
 namespace UAS_MES.Make
@@ -31,19 +32,6 @@ namespace UAS_MES.Make
         public Make_NewPallet(string Caller, string MakeCode)
         {
             InitializeComponent();
-            switch (Caller)
-            {
-                case "PACKAGE":
-                    title.Text = "新增大箱号";
-                    pa_type = "2";
-                    break;
-                case "PALLET":
-                    title.Text = "新增栈板号";
-                    pa_type = "3";
-                    break;
-                default:
-                    break;
-            }
             pa_outboxcode.Caller = Caller;
             pa_outboxcode.MakeCode = MakeCode;
         }
@@ -73,8 +61,8 @@ namespace UAS_MES.Make
         {
             if (pa_outboxcode.Text != "" && pr_code.Text != "")
             {
-                string sql = "insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_type,pa_prodcode，pa_level，PA_STATUS)values";
-                sql += "(package_seq.nextval,'" + pa_outboxcode.Text + "','" + pa_outboxcode.MakeCode + "',sysdate,'" + pa_type + "','" + pr_code.Text + "',0,'')";
+                string sql = "insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_sccode,pa_currentstep)values";
+                sql += "(package_seq.nextval,'" + pa_outboxcode.Text + "','" + pa_outboxcode.MakeCode + "',sysdate,3,'" + pr_code.Text + "',0,0,'" + User.UserSourceCode + "','" + User.CurrentStepCode + "')";
                 dh.ExecuteSql(sql, "insert");
             }
             else MessageBox.Show("请先填写完整信息");

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -215,7 +215,7 @@ namespace UAS_MES.Make
             if (PrintLabel.Items.Count != 0)
             {
                 OperateResult.AppendText(">>打印箱号" + palletcode.Text + "\n", Color.Black);
-                doc = lbl.Documents.Open(ftpOperater.DownLoadTo+ PrintLabel.Text.Split(':')[1]);
+                doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text.Split(':')[1]);
                 Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
             }
             else
@@ -244,8 +244,8 @@ namespace UAS_MES.Make
                 OperateResult.AppendText(">>" + palletcode.Text + "装栈板成功\n", Color.Black);
                 palletcode.Text = LogicHandler.GetOutBoxCode("PALLET", "", pa_prodcode.Text, User.UserCode);
                 sql.Clear();
-                sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty)values");
-                sql.Append("(package_seq.nextval,'" + palletcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',3,'" + pa_prodcode.Text + "',0,'1','" + pa_standardqty.Text + "')");
+                sql.Append("insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS,pa_standardqty,pa_sccode,pa_currentstep)values");
+                sql.Append("(package_seq.nextval,'" + palletcode.Text + "','" + pa_makecode.Text + "',sysdate,'0',3,'" + pa_prodcode.Text + "',0,'1','" + pa_standardqty.Text + "','" + User.UserSourceCode + "','" + User.CurrentStepCode + "')");
                 dh.ExecuteSql(sql.GetString(), "insert");
                 palletcode_KeyDown(new object(), new KeyEventArgs(Keys.Enter));
             }