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

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -86,7 +86,7 @@ namespace UAS_MES.Make
                         //为0，输入TSN
                         if (step == 0)
                         {
-                            OperateResult.AppendText(">>序列号：" + code.Text + " , 发送请求\n", Color.Black);
+                            OperateResult.AppendText(">>序列号：" + code.Text + ", 发送请求\n", Color.Black);
 
                             //记录当前序列号查出来的工单
                             if (GetMakeInfo(code.Text, out makecode, out errorMessage))
@@ -176,7 +176,7 @@ namespace UAS_MES.Make
                                             }
                                             else
                                             {
-                                                OperateResult.AppendText(">>序列号:" + code.Text + "错误\n", Color.Red, code);
+                                                OperateResult.AppendText(">>序列号:" + code.Text + "已转换过\n", Color.Red, code);
                                                 OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                                             }
                                         }

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -46,7 +46,7 @@ namespace UAS_MES.Make
             asc.controllInitializeSize(this);
             dh = new DataHelper();
             sncode.Focus();
-            OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Black);
+            OperateResult.AppendText(">>请输入要转换的序列号\n", Color.Black);
 
             ////设置锁定工单
             //ms_makecode_lock.GetMakeCodeCtl(ma_code);
@@ -75,7 +75,7 @@ namespace UAS_MES.Make
                 {
                     if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out errorMessage))
                     {
-                        OperateResult.AppendText(">>序列号：" + sncode.Text + " , 发送请求\n", Color.Black);
+                        OperateResult.AppendText(">>序列号：" + sncode.Text + ", 发送请求\n", Color.Black);
                         //如果用户没有输入工单号自行去后台查询
                         //通过工单序列号关系验证
                         //bsncode为空，就说明是输入转换之前的序列号
@@ -86,7 +86,7 @@ namespace UAS_MES.Make
                             oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
                             if (oMakeCode == "")
                             {
-                                OperateResult.AppendText(">>序列号:" + sncode.Text + " 未归属工单\n", Color.Red);
+                                OperateResult.AppendText(">>序列号:" + sncode.Text + "未归属工单\n", Color.Red);
                                 OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Black, sncode);
                                 return;
                             }
@@ -156,7 +156,7 @@ namespace UAS_MES.Make
                                             }
                                             else
                                             {
-                                                OperateResult.AppendText(">>序列号:" + sncode.Text + "错误\n", Color.Red, sncode);
+                                                OperateResult.AppendText(">>序列号:" + sncode.Text + "已转换过\n", Color.Red, sncode);
                                                 OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                                             }
                                         }

UAS-MES/FunctionCode/Packing/Packing_CartonSplit.cs

@@ -63,12 +63,12 @@ namespace UAS_MES.Packing
                     OperateResult.AppendText("<<输入不能为空\n", Color.Red);
                     return;
                 }
-                //判断箱号是否为空
-                if (pa_outboxcode.Text == "")
-                {
-                    OperateResult.AppendText("<<请先选择箱号\n", Color.Red, sncode);
-                    return;
-                }
+                //根据序列号带出箱号
+                //if (pa_outboxcode.Text == "")
+                //{
+                //    OperateResult.AppendText("<<请先选择箱号\n", Color.Red, sncode);
+                //    return;
+                //}
                 OperateResult.AppendText(">>" + sncode.Text + "\n", Color.Black);
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out error))
                 {
@@ -86,6 +86,13 @@ namespace UAS_MES.Packing
                         OperateResult.AppendText("<<序列号" + sncode.Text + "未装箱\n", Color.Red, sncode);
                         return;
                     }
+                    //没填箱号,就赋值箱号
+                    if (pa_outboxcode.Text == "")
+                    {
+                        pa_outboxcode.Text = outboxcode;
+                        //勾上
+                        lock_outbox.Checked = true;
+                    }
                     if (pa_outboxcode.Text != outboxcode)
                     {
                         OperateResult.AppendText("<<序列号" + sncode.Text + "箱号为：" + outboxcode + "，不在箱号：" + pa_outboxcode.Text + "中，无法拆箱\n", Color.Red, sncode);

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.cs

@@ -212,6 +212,10 @@ namespace UAS_MES.Packing
                                 {
                                     if (CheckBoxCode())
                                     {
+                                        if (pa_outboxcode.Text == ms_outboxcode) {
+                                            OperateResult.AppendText(">>原箱" + ms_outboxcode + "和目标箱号" + pa_outboxcode.Text + "相同，不允许转移\n", Color.Red, sn_code);
+                                            return;
+                                        }
                                         if (PA_PACKTYPE != new_pa_packtype)
                                         {
                                             OperateResult.AppendText(">>原箱" + ms_outboxcode + "和目标箱号" + pa_outboxcode.Text + "的包装方式不一致，不允许转移\n", Color.Red, sn_code);