BUG修改

UAS_MES_ODLF/CustomControl/AccordionMenu/NavagationBar.cs

@@ -102,7 +102,10 @@ namespace UAS_MES_NEW.CustomControl.AccordionMenu
                         }
                     }
                     Groups.Add(nbg);
-                    nbg.ItemLinks.Add(nbi);
+                    if (dt.Rows[i]["ugp_ifread"].ToString() != "0" || dt.Rows[i]["ugp_ifall"].ToString() != "0")
+                    {
+                        nbg.ItemLinks.Add(nbi);
+                    }
                 }
             }
             //查询出的用户可见的Caller

UAS_MES_ODLF/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -290,7 +290,7 @@ namespace UAS_MES_NEW.Make
                 sql.Clear();
                 sql.Append("select ma_prodcode,ma_ecncode,ma_softversion,ms_firstsn,ma_bomversion,ma_qty,ma_code,pr_spec,ms_status,ms_id,ms_craftcode,ms_nextstepcode");
                 sql.Append(",ms_prodcode,ms_makecode,ms_code,ms_stepname  from makeserial left join make on ma_code=ms_makecode ");
-                sql.Append("left join product on ms_prodcode=pr_code where ms_sncode='" + code.Text + "' order by ms_id desc");
+                sql.Append("left join product on ms_prodcode=pr_code where ms_id='" + oMsid + "' order by ms_id desc");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt.Rows.Count > 0)
                 {
@@ -355,7 +355,7 @@ namespace UAS_MES_NEW.Make
                     }
                     else
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_sncode='" + code.Text + "' and ms_makecode='" + ma_code.Text + "' order by ms_id desc", "select");
+                        dt = (DataTable)dh.ExecuteSql("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id='" + oMsid + "' and ms_makecode='" + ma_code.Text + "' order by ms_id desc", "select");
                         nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
                         ms_status = dt.Rows[0]["ms_status"].ToString();
                         sn_code.Text = code.Text;
@@ -471,7 +471,7 @@ namespace UAS_MES_NEW.Make
                 sql.Append("mcd_stepname,sp_fsoncode,ms_craftcode,ms_craftname,:barcode,1,sysdate,'" + User.UserCode + "','" + User.UserLineCode + "',ma_wccode,");
                 sql.Append("'" + User.UserSourceCode + "',:sp_id,0,1,ms_firstsn from make left join makecraftdetail on mcd_macode=ma_code  left join stepproduct on sp_stepcode=mcd_stepcode ");
                 sql.Append(" and sp_mothercode = ma_prodcode left join makeserial on ms_makecode=ma_code and sp_craftcode=ms_craftcode ");
-                sql.Append("where ma_code='" + make_code + "'and sp_id=:sp_id1 and mcd_stepcode = '" + User.CurrentStepCode + "' and ms_sncode='" + ms_sncode + "'");
+                sql.Append("where ma_code='" + make_code + "'and sp_id=:sp_id1 and mcd_stepcode = '" + User.CurrentStepCode + "' and ms_id='" + oMsid + "'");
                 dh.BatchInsert(sql.GetString(), new string[] { "soncode", "barcode", "sp_id", "sp_id1" }, CollectDataSonCode.ToArray(), CollectData.ToArray(), SPID.ToArray(), SPID.ToArray());
                 try
                 {

UAS_MES_PW/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -198,6 +198,7 @@ namespace UAS_MES_NEW.Make
                             lsi.SubItems.Add(ActualWeight.ToString());
                             lsi.SubItems.Add(System.DateTime.Now.ToString());
                             WeighRecord.Items.Add(lsi);
+                            WeighRecord.Items[this.WeighRecord.Items.Count - 1].EnsureVisible();
                             OperateResult.AppendText(">>彩盒" + sncode.Text + "称重完成\n", Color.Green);
                             //显示最近的三个称量记录
                             if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "彩盒称量", "称量合格", User.UserCode, out ErrorMessage))