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

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -113,14 +113,8 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(">>卡通箱号不能为空\n", Color.Red);
                         return;
                     }
-                    string pallteiostatus = dh.getFieldDataByCondition("package", "nvl(pa_iostatus,0)", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString();
-                    if (pallteiostatus != "" && pallteiostatus != "0")
-                    {
-                        OperateResult.AppendText(">>大箱" + pa_outboxcode.Text + "已入库不允许采集\n", Color.Red, outboxcode);
-                        return;
-                    }
                     sql.Clear();
-                    sql.Append("select nvl(pa_iostatus,0)pa_iostatus,pa_makecode pd_makecode,nvl(pa_downstatus,0)pa_downstatus,pa_salecode pd_salecode,");
+                    sql.Append("select nvl(pa_iostatus,0)pa_iostatus,pa_outno,pa_makecode pd_makecode,nvl(pa_downstatus,0)pa_downstatus,pa_salecode pd_salecode,");
                     sql.Append("pr_packrule,pa_id,pa_prodcode pd_prodcode,pa_status,pa_mothercode,pa_nextstep from packagedetail left ");
                     sql.Append("join package on pd_paid=pa_id left join product on pd_prodcode=pr_code where pd_outboxcode='" + outboxcode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -133,6 +127,11 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>箱号" + outboxcode.Text + "下地状态不允许采集\n", Color.Red, outboxcode);
                             return;
                         }
+                        if (dt.Rows[0]["pa_outno"].ToString() != "")
+                        {
+                            OperateResult.AppendText(">>箱号" + outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red, outboxcode);
+                            return;
+                        }
                         if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
                         {
                             OperateResult.AppendText(">>箱号" + outboxcode.Text + "已入库不允许采集\n", Color.Red, outboxcode);
@@ -153,23 +152,41 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "的下一工序不是当前岗位资源对应工序,下一工序为" + pa_nextstep + "\n", Color.Red, outboxcode);
                             return;
                         }
-                        //未空表示线外
+                        sql.Clear();
+                        sql.Append("select nvl(pa_iostatus,0) pa_iostatus,pa_outno,pa_mothercode from package where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            if (dt.Rows[0]["pa_mothercode"].ToString() != "")
+                            {
+                                OperateResult.AppendText(">>大箱" + pa_outboxcode.Text + "已被栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "采集，不允许操作\n", Color.Red);
+                                return;
+                            }
+                            if (dt.Rows[0]["pa_outno"].ToString() != "")
+                            {
+                                OperateResult.AppendText(">>大箱" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                                return;
+                            }
+                            if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
+                            {
+                                OperateResult.AppendText(">>大箱" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
+                                return;
+                            }
+                        }
+                        //为空表示线外
                         if (pa_nextstep == "")
                         {
                             //判断线外，必须已完工并且未入库
                             dt = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from mes_package_view  left join makeserial on v_makecode=ms_makecode and ms_sncode=v_barcode where v_outboxcode='" + outboxcode.Text + "' and ms_status<>2", "select");
-                            if (dt.Rows[0][0].ToString() == "")
-                            {
-                                //判断箱未入库
-                                dt = (DataTable)dh.ExecuteSql("select count(1) from package where pa_outboxcode='" + outboxcode.Text + "' and nvl(pa_iostatus,0)<>0", "select");
-                                if (dt.Rows[0][0].ToString() != "0")
-                                {
-                                    OperateResult.AppendText(">>序列号" + dt.Rows[0][0].ToString() + "已入库，不允许装箱\n", Color.Red);
-                                    return;
-                                }
-                            }
-                            else
+                            if (dt.Rows[0][0].ToString() != "")
                             {
+                                ////判断箱未入库
+                                //dt = (DataTable)dh.ExecuteSql("select count(1) from package where pa_outboxcode='" + outboxcode.Text + "' and nvl(pa_iostatus,0)<>0", "select");
+                                //if (dt.Rows[0][0].ToString() != "0")
+                                //{
+                                //    OperateResult.AppendText(">>卡通箱" + outboxcode.Text + "已入库，不允许装箱\n", Color.Red);
+                                //    return;
+                                //}
                                 OperateResult.AppendText(">>序列号" + dt.Rows[0][0].ToString() + "尚未完工\n", Color.Red);
                                 return;
                             }
@@ -403,6 +420,22 @@ namespace UAS_MES.Make
                     string Delete = MessageBox.Show(this.ParentForm, "是否确认拆箱？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                     if (Delete == "Yes")
                     {
+                        sql.Clear();
+                        sql.Append("select nvl(pa_iostatus,0) pa_iostatus,pa_outno from package where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            if (dt.Rows[0]["pa_outno"].ToString() != "")
+                            {
+                                OperateResult.AppendText(">>大箱" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                                return;
+                            }
+                            if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
+                            {
+                                OperateResult.AppendText(">>大箱" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
+                                return;
+                            }
+                        }
                         if (dh.getFieldDataByCondition("package", "pa_nextstep", "pa_mothercode='" + pa_outboxcode.Text + "'").ToString() != "")
                             LogicHandler.OutBoxDrawStepPass(pa_outboxcode.Text, pa_makecode.Text, User.UserSourceCode);
                         else

UAS-MES/FunctionCode/Make/Make_MakeDown.cs

@@ -86,7 +86,7 @@ namespace UAS_MES.Make
                         string ms_outno = dt.Rows[0]["ms_outno"].ToString();
                         if (ms_downstatus == "0")
                         {
-                            if (ms_outno == "")
+                            if (ms_outno == ""&& ms_iostatus =="0")
                             {
                                 if (ms_outboxcode == null || ms_outboxcode == "")
                                 {

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -161,19 +161,33 @@ namespace UAS_MES.Make
                         PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         //获取序列号信息
                         sql.Clear();
-                        sql.Append("select ms_makecode,ms_prodcode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
+                        sql.Append("select nvl(ms_iostatus,0) ms_iostatus,ms_outno,ms_makecode,ms_prodcode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
                         sql.Append("nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
                         sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         string ms_makecode = "";
                         string ms_prodcode = "";
+                        string ms_iostatus = "";
+                        string ms_outno = "";
                         if (dt.Rows.Count > 0)
                         {
                             StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
                             ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
                             ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
+                            ms_iostatus = dt.Rows[0]["ms_iostatus"].ToString();
+                            ms_outno = dt.Rows[0]["ms_outno"].ToString();
                             BaseUtil.SetFormValue(this.Controls, dt);
                         }
+                        if (dt.Rows[0]["ms_outno"].ToString() != "")
+                        {
+                            OperateResult.AppendText(">>序列号" + sn_code.Text + "已被出货单" + dt.Rows[0]["ms_outno"].ToString() + "采集，不允许操作\n", Color.Red,sn_code);
+                            return;
+                        }
+                        if (dt.Rows[0]["ms_iostatus"].ToString() != "0")
+                        {
+                            OperateResult.AppendText(">>序列号" + sn_code.Text + "已入库不允许采集\n", Color.Red, sn_code);
+                            return;
+                        }
                         //保证箱内容量不会被重置
                         if (pa_standardqty.Text != "0" && pa_standardqty.Text != "")
                         {
@@ -246,6 +260,27 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>箱内容量必须大于0\n", Color.Red);
                             return;
                         }
+                        sql.Clear();
+                        sql.Append("select nvl(pa_iostatus,0)pa_iostatus,pa_outno,pa_mothercode from package where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            if (dt.Rows[0]["pa_mothercode"].ToString() != "")
+                            {
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被大箱或栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "采集，不允许操作\n", Color.Red);
+                                return;
+                            }
+                            if (dt.Rows[0]["pa_outno"].ToString() != "")
+                            {
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                                return;
+                            }
+                            if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
+                            {
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
+                                return;
+                            }
+                        }
                         //如果未勾选了取消录入
                         if (!Cancel.Checked)
                         {
@@ -541,9 +576,19 @@ namespace UAS_MES.Make
             string Delete = MessageBox.Show(this.ParentForm, "是否确认拆箱？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
             if (Delete == "Yes")
             {
-                DataTable dt = (DataTable)dh.ExecuteSql("select pa_checkno,ob_status,pa_mothercode,nvl(pa_downstatus,0)pa_downstatus from package left join oqcbatch on pa_checkno=ob_checkno where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
+                DataTable dt = (DataTable)dh.ExecuteSql("select nvl(pa_iostatus,0)pa_iostatus,pa_outno,pa_checkno,ob_status,pa_mothercode,nvl(pa_downstatus,0)pa_downstatus from package left join oqcbatch on pa_checkno=ob_checkno where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
+                    if (dt.Rows[0]["pa_outno"].ToString() != "")
+                    {
+                        OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                        return;
+                    }
+                    if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
+                    {
+                        OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
+                        return;
+                    }
                     if (dt.Rows[0]["pa_mothercode"].ToString() == "")
                     {
                         if (dt.Rows[0]["pa_downstatus"].ToString() == "0")

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -239,19 +239,33 @@ namespace UAS_MES.Make
                         }
                         // PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         sql.Clear();
-                        sql.Append("select ms_makecode,ms_prodcode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
+                        sql.Append("select nvl(ms_iostatus,0) ms_iostatus,ms_outno,ms_makecode,ms_prodcode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
                         sql.Append("nvl(pr_outboxinnerqty,0)pr_outboxinnerqty from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
                         sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         string ms_makecode = "";
                         string ms_prodcode = "";
+                        string ms_iostatus = "";
+                        string ms_outno = "";
                         if (dt.Rows.Count > 0)
                         {
                             StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
                             ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
                             ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
+                            ms_iostatus = dt.Rows[0]["ms_iostatus"].ToString();
+                            ms_outno = dt.Rows[0]["ms_outno"].ToString();
                             BaseUtil.SetFormValue(this.Controls, dt);
                         }
+                        if (dt.Rows[0]["ms_outno"].ToString() != "")
+                        {
+                            OperateResult.AppendText(">>序列号" + sn_code.Text + "已被出货单" + dt.Rows[0]["ms_outno"].ToString() + "采集，不允许操作\n", Color.Red, sn_code);
+                            return;
+                        }
+                        if (dt.Rows[0]["ms_iostatus"].ToString() != "0")
+                        {
+                            OperateResult.AppendText(">>序列号" + sn_code.Text + "已入库不允许采集\n", Color.Red, sn_code);
+                            return;
+                        }
                         if (pa_standardqty.Text != "0" && pa_standardqty.Text != "")
                         {
                             pr_outboxinnerqty.Text = pa_standardqty.Text;
@@ -320,6 +334,27 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>箱内容量必须大于0\n", Color.Red);
                             return;
                         }
+                        sql.Clear();
+                        sql.Append("select nvl(pa_iostatus,0) pa_iostatus,pa_outno,pa_mothercode from package where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            if (dt.Rows[0]["pa_mothercode"].ToString() != "")
+                            {
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被大箱或栈板" + dt.Rows[0]["pa_mothercode"].ToString() + "采集，不允许操作\n", Color.Red);
+                                return;
+                            }
+                            if (dt.Rows[0]["pa_outno"].ToString() != "")
+                            {
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                                return;
+                            }
+                            if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
+                            {
+                                OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
+                                return;
+                            }
+                        }
                         //如果未勾选了取消录入
                         if (!Cancel.Checked)
                         {
@@ -639,9 +674,19 @@ namespace UAS_MES.Make
             string Delete = MessageBox.Show(this.ParentForm, "是否确认拆箱？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
             if (Delete == "Yes")
             {
-                DataTable dt = (DataTable)dh.ExecuteSql("select pa_checkno,ob_status,pa_mothercode,nvl(pa_downstatus,0)pa_downstatus from package left join oqcbatch on pa_checkno=ob_checkno where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
+                DataTable dt = (DataTable)dh.ExecuteSql("select nvl(pa_iostatus,0) pa_iostatus,pa_outno,pa_checkno,ob_status,pa_mothercode,nvl(pa_downstatus,0)pa_downstatus from package left join oqcbatch on pa_checkno=ob_checkno where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
+                    if (dt.Rows[0]["pa_outno"].ToString() != "")
+                    {
+                        OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                        return;
+                    }
+                    if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
+                    {
+                        OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
+                        return;
+                    }
                     if (dt.Rows[0]["pa_mothercode"].ToString() == "")
                     {
                         if (dt.Rows[0]["pa_downstatus"].ToString() == "0")

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -110,14 +110,8 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(">>箱号不能为空\n", Color.Red);
                         return;
                     }
-                    string pallteiostatus = dh.getFieldDataByCondition("package", "nvl(pa_iostatus,0)", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString();
-                    if (pallteiostatus != "" && pallteiostatus != "0")
-                    {
-                        OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "已入库不允许采集\n", Color.Red, outboxcode);
-                        return;
-                    }
                     sql.Clear();
-                    sql.Append("select nvl(pa_iostatus,0)pa_iostatus,pa_makecode pd_makecode,nvl(pa_downstatus,0)pa_downstatus,pa_salecode pd_salecode,pr_packrule,pa_id,pa_prodcode pd_prodcode,pa_status,pa_mothercode,pa_nextstep  ");
+                    sql.Append("select nvl(pa_iostatus,0)pa_iostatus,pa_outno,pa_makecode pd_makecode,nvl(pa_downstatus,0)pa_downstatus,pa_salecode pd_salecode,pr_packrule,pa_id,pa_prodcode pd_prodcode,pa_status,pa_mothercode,pa_nextstep  ");
                     sql.Append("from packagedetail left join package on pd_paid=pa_id left join product on pd_prodcode=pr_code where pd_outboxcode='" + outboxcode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count > 0)
@@ -128,6 +122,11 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>箱号" + outboxcode.Text + "下地状态不允许采集\n", Color.Red, outboxcode);
                             return;
                         }
+                        if (dt.Rows[0]["pa_outno"].ToString() != "")
+                        {
+                            OperateResult.AppendText(">>箱号" + outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                            return;
+                        }
                         if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
                         {
                             OperateResult.AppendText(">>箱号" + outboxcode.Text + "已入库不允许采集\n", Color.Red, outboxcode);
@@ -147,23 +146,35 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>箱号" + outboxcode.Text + "的下一工序不是当前岗位资源对应工序\n", Color.Red, outboxcode);
                             return;
                         }
-                        //未空表示线外
+                        sql.Clear();
+                        sql.Append("select nvl(pa_iostatus,0) pa_iostatus,pa_outno from package where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            if (dt.Rows[0]["pa_outno"].ToString() != "") {
+                                OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "已被出货单"+ dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                                return;
+                            }
+                            if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
+                            {
+                                OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
+                                return;
+                            }
+                        }
+                        //为空表示线外
                         if (pa_nextstep == "")
                         {
                             //判断线外，必须已完工并且未入库
                             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() == "")
-                            {
-                                //判断箱未入库
-                                dt = (DataTable)dh.ExecuteSql("select count(1) from package where pa_outboxcode='" + outboxcode.Text + "' and nvl(pa_iostatus,0)<>0", "select");
-                                if (dt.Rows[0][0].ToString() != "0")
-                                {
-                                    OperateResult.AppendText(">>序列号" + dt.Rows[0][0].ToString() + "已入库，不允许装箱\n", Color.Red);
-                                    return;
-                                }
-                            }
-                            else
+                            if (dt.Rows[0][0].ToString() != "")
                             {
+                                ////判断箱未入库
+                                //dt = (DataTable)dh.ExecuteSql("select count(1) from package where pa_outboxcode='" + outboxcode.Text + "' and nvl(pa_iostatus,0)<>0", "select");
+                                //if (dt.Rows[0][0].ToString() != "0")
+                                //{
+                                //    OperateResult.AppendText(">>箱号" + outboxcode.Text + "已入库，不允许装箱\n", Color.Red);
+                                //    return;
+                                //}
                                 OperateResult.AppendText(">>序列号" + dt.Rows[0][0].ToString() + "尚未完工\n", Color.Red);
                                 return;
                             }
@@ -389,6 +400,22 @@ namespace UAS_MES.Make
                 string Delete = MessageBox.Show(this.ParentForm, "是否确认拆栈板？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                 if (Delete == "Yes")
                 {
+                    sql.Clear();
+                    sql.Append("select nvl(pa_iostatus,0) pa_iostatus,pa_outno from package where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        if (dt.Rows[0]["pa_outno"].ToString() != "")
+                        {
+                            OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "已被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集，不允许操作\n", Color.Red);
+                            return;
+                        }
+                        if (dt.Rows[0]["pa_iostatus"].ToString() != "0")
+                        {
+                            OperateResult.AppendText(">>栈板" + pa_outboxcode.Text + "处于入库状态，不允许操作\n", Color.Red);
+                            return;
+                        }
+                    }
                     //如果含有下一执行步骤的撤销过站，否则直接删除
                     if (dh.getFieldDataByCondition("package", "pa_nextstep", "pa_mothercode='" + pa_outboxcode.Text + "'").ToString() != "")
                         LogicHandler.OutBoxDrawStepPass(pa_outboxcode.Text, pa_makecode.Text, User.UserSourceCode);

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.Designer.cs

@@ -30,7 +30,6 @@
         {
             this.components = new System.ComponentModel.Container();
             this.label8 = new System.Windows.Forms.Label();
-            this.input = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.bigboxBtn = new System.Windows.Forms.RadioButton();
             this.serBtn = new System.Windows.Forms.RadioButton();
             this.palletBtn = new System.Windows.Forms.RadioButton();
@@ -38,6 +37,7 @@
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.cancel = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.input = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.getqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.InOutDetailDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.pim_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -46,6 +46,7 @@
             this.pim_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Sp = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).BeginInit();
             this.SuspendLayout();
@@ -60,15 +61,6 @@
             this.label8.TabIndex = 227;
             this.label8.Text = "已采集数";
             // 
-            // input
-            // 
-            this.input.Location = new System.Drawing.Point(87, 447);
-            this.input.Margin = new System.Windows.Forms.Padding(2);
-            this.input.Name = "input";
-            this.input.Size = new System.Drawing.Size(125, 21);
-            this.input.TabIndex = 232;
-            this.input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.input_KeyDown);
-            // 
             // bigboxBtn
             // 
             this.bigboxBtn.AutoSize = true;
@@ -142,6 +134,22 @@
             this.cancel.Text = "取消";
             this.cancel.UseVisualStyleBackColor = true;
             // 
+            // input
+            // 
+            this.input.AllPower = null;
+            this.input.BackColor = System.Drawing.Color.White;
+            this.input.ID = null;
+            this.input.Location = new System.Drawing.Point(87, 447);
+            this.input.Margin = new System.Windows.Forms.Padding(2);
+            this.input.Name = "input";
+            this.input.Power = null;
+            this.input.Size = new System.Drawing.Size(125, 21);
+            this.input.Str = null;
+            this.input.Str1 = null;
+            this.input.Str2 = null;
+            this.input.TabIndex = 232;
+            this.input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.input_KeyDown);
+            // 
             // getqty
             // 
             this.getqty.AutoSize = true;
@@ -163,7 +171,8 @@
             this.pim_mac,
             this.pim_prodcode,
             this.pr_detail,
-            this.pr_spec});
+            this.pr_spec,
+            this.Sp});
             this.InOutDetailDGV.EnableContentClick = true;
             this.InOutDetailDGV.Location = new System.Drawing.Point(11, 42);
             this.InOutDetailDGV.Margin = new System.Windows.Forms.Padding(2);
@@ -176,10 +185,9 @@
             // 
             this.pim_outboxcode.DataPropertyName = "pim_outboxcode";
             this.pim_outboxcode.HeaderText = "栈板/箱号";
-            this.pim_outboxcode.MinimumWidth = 120;
             this.pim_outboxcode.Name = "pim_outboxcode";
             this.pim_outboxcode.ReadOnly = true;
-            this.pim_outboxcode.Width = 120;
+            this.pim_outboxcode.Width = 124;
             // 
             // pim_id
             // 
@@ -194,6 +202,7 @@
             this.pim_mac.HeaderText = "SN号";
             this.pim_mac.Name = "pim_mac";
             this.pim_mac.ReadOnly = true;
+            this.pim_mac.Width = 125;
             // 
             // pim_prodcode
             // 
@@ -201,6 +210,7 @@
             this.pim_prodcode.HeaderText = "产品代码";
             this.pim_prodcode.Name = "pim_prodcode";
             this.pim_prodcode.ReadOnly = true;
+            this.pim_prodcode.Width = 124;
             // 
             // pr_detail
             // 
@@ -208,6 +218,7 @@
             this.pr_detail.HeaderText = "名称";
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.ReadOnly = true;
+            this.pr_detail.Width = 125;
             // 
             // pr_spec
             // 
@@ -215,6 +226,15 @@
             this.pr_spec.HeaderText = "规格";
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.ReadOnly = true;
+            this.pr_spec.Width = 124;
+            // 
+            // Sp
+            // 
+            this.Sp.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Sp.HeaderText = " ";
+            this.Sp.MinimumWidth = 2;
+            this.Sp.Name = "Sp";
+            this.Sp.Width = 2;
             // 
             // Warehouse_ProductMakeIn
             // 
@@ -263,5 +283,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pim_prodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Sp;
     }
 }

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.resx

@@ -138,4 +138,7 @@
   <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Sp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>