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

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -257,6 +257,7 @@ namespace UAS_MES.Make
                             Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ms_sncode.Text, int.Parse(PrintNum.Text));
                             RemainIndex = 0;
                             TSN.Clear();
+                            SPID.Clear();
                             CollectData.Clear();
                             CollectDataSonCode.Clear();
                             BaseUtil.CleanDataTable(ListA);
@@ -314,6 +315,7 @@ namespace UAS_MES.Make
             if (ListA != null)
                 BaseUtil.CleanDataTableData(ListA);
             TSN.Clear();
+            SPID.Clear();
             CollectDataSonCode.Clear();
             CollectData.Clear();
             RemainIndex = 0;

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -413,6 +413,7 @@ namespace UAS_MES.Make
                 }
                 CollectData.Clear();
                 TSN.Clear();
+                SPID.Clear();
                 CollectDataSonCode.Clear();
                 //采集成功，设置序列号栏目为空
                 RemainIndex = 0;
@@ -436,6 +437,7 @@ namespace UAS_MES.Make
         private void ClearSn_code_Click(object sender, EventArgs e)
         {
             sn_code.Clear();
+            SPID.Clear();
             TSN.Clear();
             CollectData.Clear();
             CollectDataSonCode.Clear();

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -145,7 +145,7 @@ namespace UAS_MES.Make
                         }
                         string unfinpack = dh.getFieldDataByCondition("Line", "nvl(li_allowUnFinPack,0)", "li_code='" + User.UserLineCode + "'").ToString();
                         pa_nextstep = dt.Rows[0]["pa_nextstep"].ToString();
-                        if (pa_nextstep != User.CurrentStepCode && pa_nextstep != "" && unfinpack == "0")
+                        if (pa_nextstep != User.CurrentStepCode && pa_nextstep != "" && (unfinpack == "0" && unfinpack != ""))
                         {
                             OperateResult.AppendText(">>箱号" + outboxcode.Text + "的下一工序不是当前岗位资源对应工序\n", Color.Red, outboxcode);
                             return;
@@ -171,7 +171,7 @@ namespace UAS_MES.Make
                         {
                             //判断线外，必须已完工并且未入库
                             dt = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from mes_package_view  left join makeserial on v_barcode=ms_sncode where  v_outboxcode='" + outboxcode.Text + "' and ms_status<>2", "select");
-                            if (dt.Rows[0][0].ToString() != "" || unfinpack != "0")
+                            if (dt.Rows[0][0].ToString() != "" || (unfinpack != "0" && unfinpack != ""))
                             {
                                 OperateResult.AppendText(">>序列号" + dt.Rows[0][0].ToString() + "尚未完工\n", Color.Red);
                                 return;