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

UAS-MES/FunctionCode/Packing/Packing_CartonSplit.cs

@@ -182,7 +182,10 @@ namespace UAS_MES.Packing
             else
             {
                 //勾选
-                lKeyDown(true);
+                if (!lKeyDown(true))
+                {
+                    lock_outbox.Checked = false;
+                }
             }
         }
 
@@ -190,7 +193,7 @@ namespace UAS_MES.Packing
         {
             asc.controlAutoSize(this);
         }
-        private void lKeyDown(bool flag)
+        private bool lKeyDown(bool flag)
         {
             //输入不能为空
             if (pa_outboxcode.Text == "")
@@ -198,10 +201,10 @@ namespace UAS_MES.Packing
                 if (flag)
                 {
                     MessageBox.Show("输入不能为空");
-                    return;
+                    return false; ;
                 }
                 OperateResult.AppendText("<<输入不能为空\n", Color.Red);
-                return;
+                return false;
             }
             if (pa_outboxcode.Enabled)
             {
@@ -210,7 +213,7 @@ namespace UAS_MES.Packing
             //验证箱号
             if (!checkOutboxcode(flag))
             {
-                return;
+                return false;
             }
             //判定通过，则自动勾选，显示箱号相关信息
             BaseUtil.SetFormValue(this.Controls, dt);
@@ -230,6 +233,7 @@ namespace UAS_MES.Packing
             pa_outboxcode.Enabled = false;
             lock_outbox.Checked = true;
             sncode.Focus();
+            return true;
         }
     }
 }

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.cs

@@ -95,8 +95,6 @@ namespace UAS_MES.Packing
             }
         }
 
-
-
         private void sn_code_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
@@ -169,6 +167,8 @@ namespace UAS_MES.Packing
                                                     sql.Append("values (packagedetail_seq.nextval,'" + pa_id + "','" + pa_outboxcode.Text + "','" + sn_code.Text + "','1','" + msprodcode + "','" + ms_makecode + "',sysdate,to_char(sysdate,'yymmdd'))");
                                                     dh.ExecuteSql(sql.GetString(), "insert");
 
+                                                    //删除原明细
+                                                    dh.ExecuteSql("delete from packagedetail where pd_id='" + old_pa_id + "'", "delete");
                                                     //更新原箱数量
                                                     dh.UpdateByCondition("package", "pa_currentqty=pa_currentqty-1", "pa_outboxcode = '" + ms_outboxcode + "'");
                                                     //更新目标箱数量
@@ -263,6 +263,9 @@ namespace UAS_MES.Packing
                                         sql.Append("values (packagedetail_seq.nextval,'" + old_pa_id + "','" + pa_outboxcode.Text + "','" + sn_code.Text + "','1','" + msprodcode + "','" + ms_makecode + "',sysdate,to_char(sysdate,'yymmdd'))");
                                         dh.ExecuteSql(sql.GetString(), "insert");
 
+
+                                        //删除原明细
+                                        dh.ExecuteSql("delete from packagedetail where pd_id='" + old_pa_id + "'", "delete");
                                         //更新原箱数量
                                         dh.UpdateByCondition("package", "pa_currentqty=pa_currentqty-1", "pa_outboxcode = '" + ms_outboxcode + "'");
                                         //更新目标箱数量