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

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -179,6 +179,11 @@ namespace UAS_MES.Make
                                 string cm_mccode = dt.Rows[0]["cm_mccode"].ToString();
                                 string cm_makecode = dt.Rows[0]["cm_makecode"].ToString();
                                 string cm_craftcode = dt.Rows[0]["cm_craftcode"].ToString();
+                                sql.Clear();
+                                sql.Append("update makeserial set ms_nextmacode='' where ms_sncode in(select cm_barcode from craftmaterial where ");
+                                sql.Append("cm_makecode='" + cm_makecode + "' and cm_sncode='" + code.Text + "' and cm_stepcode='" + cm_stepcode + "' and cm_craftcode='" + cm_craftcode + "' ");
+                                sql.Append("and cm_materialtype=1 and nvl(cm_status,0) =0) and ms_nextmacode='" + macode + "'");
+                                dh.ExecuteSql(sql.GetString(), "update");
                                 //进行下料
                                 sql.Clear();
                                 sql.Append("delete from craftmaterial where (cm_sncode in (select sn from makesnrelation where firstsn");
@@ -186,11 +191,6 @@ namespace UAS_MES.Make
                                 sql.Append("and cm_status = 0 and cm_stepcode='" + User.CurrentStepCode + "' and cm_materialtype=1");
                                 dh.ExecuteSql(sql.GetString(), "delete");
                                 LogicHandler.InsertMakeProcess(macode, code.Text, User.UserSourceCode, "上料采集操作", "下料成功", User.UserCode);
-                                sql.Clear();
-                                sql.Append("update makeserial set ms_nextmacode='' where ms_sncode in(select cm_barcode from craftmaterial where ");
-                                sql.Append("cm_makecode='" + cm_makecode + "' and cm_stepcode='" + cm_stepcode + "' and cm_craftcode='" + cm_craftcode + "' ");
-                                sql.Append("and cm_materialtype=1 and nvl(cm_status,0) =0) and ms_nextmacode='" + macode + "'");
-                                dh.ExecuteSql(sql.GetString(), "update");
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "上料采集", "下料成功", code.Text, "");
                                 OperateResult.AppendText(">>序列号" + code.Text + "下料成功\n", Color.Green, code);
                             }

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -170,6 +170,13 @@ namespace UAS_MES.Make
                                 string cm_status = dt.Rows[0]["cm_status"].ToString();
                                 string cm_makecode = dt.Rows[0]["cm_makecode"].ToString();
                                 string cm_craftcode = dt.Rows[0]["cm_craftcode"].ToString();
+                            
+                                //清除已被使用的序列号
+                                sql.Clear();
+                                sql.Append("update makeserial set ms_nextmacode='' where ms_sncode in(select cm_barcode from craftmaterial where ");
+                                sql.Append("cm_makecode='" + cm_makecode + "' and cm_sncode='" + code.Text + "' and cm_stepcode='" + cm_stepcode + "' and cm_craftcode='" + cm_craftcode + "' ");
+                                sql.Append("and cm_materialtype=1 and nvl(cm_status,0) =0) and ms_nextmacode='" + oMakeCode + "'");
+                                dh.ExecuteSql(sql.GetString(), "update");
                                 //进行下料
                                 sql.Clear();
                                 sql.Append("delete from craftmaterial where (cm_sncode in (select sn from makesnrelation where firstsn");
@@ -177,12 +184,6 @@ namespace UAS_MES.Make
                                 sql.Append("and cm_status = 0 and cm_stepcode='" + User.CurrentStepCode + "' and cm_materialtype=1");
                                 dh.ExecuteSql(sql.GetString(), "delete");
                                 LogicHandler.InsertMakeProcess(ms_macode, code.Text, User.UserSourceCode, "上料采集操作", "下料成功", User.UserCode);
-                                //清除已被使用的序列号
-                                sql.Clear();
-                                sql.Append("update makeserial set ms_nextmacode='' where ms_sncode in(select cm_barcode from craftmaterial where ");
-                                sql.Append("cm_makecode='" + cm_makecode + "' and cm_stepcode='" + cm_stepcode + "' and cm_craftcode='" + cm_craftcode + "' ");
-                                sql.Append("and cm_materialtype=1 and nvl(cm_status,0) =0) and ms_nextmacode='" + oMakeCode + "'");
-                                dh.ExecuteSql(sql.GetString(), "update");
                                 //刷新界面值
                                 sql.Clear();
                                 sql.Append("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty ");
@@ -328,9 +329,10 @@ namespace UAS_MES.Make
                 string fsoncode = dt1.Rows[i]["sp_fsoncode"].ToString();
                 string soncode = dt1.Rows[i]["sp_soncode"].ToString();
                 if (fsoncode == soncode)
-                    RemainList[i] = fsoncode + "或" + soncode;
-                else
                     RemainList[i] = fsoncode;
+                else
+                    RemainList[i] = fsoncode + "或" + soncode;
+                
             }
             if (dt1.Rows.Count > 0)
             {

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);