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

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -78,23 +78,11 @@ namespace UAS_MES.Make
                                 isnetcode = true;
                                 return;
                             }
-                            else
-                            {
-                                sncode.Text = "";
-                                OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
-                            }
+                            else OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red, sncode);
                         }
-                        else
-                        {
-                            sncode.Text = "";
-                            OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
-                        }
-                    }
-                    else
-                    {
-                        sncode.Text = "";
-                        OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+                        else  OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red, sncode);
                     }
+                    else OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red, sncode);
                 }
                 //采集netcode
                 else

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -96,8 +96,8 @@ namespace UAS_MES.Make
                         {
                             sql.Clear();
                             sql.Append("select ms_makecode,ma_craftcode,ms_sncode,ma_qty,pr_detail,pr_code,ma_bomversion from makeserial left join make on ");
-                            sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_sncode=:sncode");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", code.Text);
+                            sql.Append("ms_makecode=ma_code left join product on ms_prodcode=pr_code where ms_id='" + Msid + "'");
+                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {
                                 BaseUtil.SetFormValue(this.Controls, dt);
@@ -162,7 +162,7 @@ namespace UAS_MES.Make
                         string sp_ifforsn = ListA.Rows[RemainIndex]["sp_ifforsn"].ToString();
                         string sp_tracekind = ListA.Rows[RemainIndex]["sp_tracekind"].ToString();
                         string sp_barcoderule = ListA.Rows[RemainIndex]["sp_barcoderule"].ToString();
-                        if (LogicHandler.CheckSNBeforeLoad(ma_code,code.Text, sp_soncode, sp_barcoderule, sp_prefix, length, out ErrorMessage))
+                        if (LogicHandler.CheckSNBeforeLoad(ma_code, code.Text, sp_soncode, sp_barcoderule, sp_prefix, length, out ErrorMessage))
                         {
                             CollectData.Add(code.Text);
                             CollectDataSonCode.Add(ListA.Rows[RemainIndex]["sp_soncode"].ToString());

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -87,7 +87,7 @@ namespace UAS_MES.Make
                 sql.Clear();
                 sql.Append("select ms_makecode,pa_status,pr_packrule,pr_code,pr_detail,pr_outboxinnerqty,pa_standardqty,pa_packageqty,pa_currentqty,");
                 sql.Append("pa_outboxcode 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_sncode='" + sn_code.Text + "'");
+                sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='"+oMsID+"'");
                 Err = "序列号";
             }
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -151,7 +151,7 @@ namespace UAS_MES.Make
                 sql.Clear();
                 sql.Append("select ms_makecode,pr_cartonunit,pa_status,pr_packrule,pr_code,pr_detail,pr_outboxinnerqty,pa_standardqty,pa_packageqty,pa_currentqty,");
                 sql.Append("pa_outboxcode,pr_cartonminw,pr_cartonmaxw,pr_cartongw from makeserial left join product on ms_prodcode=pr_code left ");
-                sql.Append("join packagedetail on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_sncode='" + sn_code.Text + "'");
+                sql.Append("join packagedetail on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='"+oMsID+"'");
                 Err = "序列号";
             }
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -343,7 +343,7 @@ namespace UAS_MES.Make
                 }
             }
             //判断是否所有的不良信息都有维护不良原因
-            DataTable dt = (DataTable)dh.ExecuteSql("select mb_id,bc_name,mbr_mbid from makebad left join makebadreason on mbr_mbid=mb_id left join badcode on mb_badcode=bc_code where mb_sncode='" + ms_sncode.Text + "' and mb_status=0", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select mb_id,bc_name,mbr_mbid from makebad left join makebadreason on mbr_mbid=mb_id left join badcode on mb_badcode=bc_code where mb_sncode='" + ms_sncode.Text + "'  and mb_makecode='" + ms_makecode.Text + "' and mb_status=0", "select");
             string ErrorMessage = "";
             for (int i = 0; i < dt.Rows.Count; i++)
             {

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1358,12 +1358,12 @@ namespace UAS_MES.PublicMethod
                     {
                         if (dt.Rows[0]["ms_downstatus"].ToString() != "0")
                         {
-                            ErrMessage = "序列号：" + iSonCode + "已下地,请先取消下地";
+                            ErrMessage = "序列号：" + iSN + "已下地,请先取消下地";
                             return false;
                         }
                         if (dt.Rows[0]["ms_nextmacode"].ToString() != "")
                         {
-                            ErrMessage = "序列号：" + iSonCode + "已被工单" + dt.Rows[0]["ms_nextmacode是否为空"].ToString() + "使用";
+                            ErrMessage = "序列号：" + iSN + "已被工单" + dt.Rows[0]["ms_nextmacode"].ToString() + "使用";
                             return false;
                         }
                         if (dt.Rows[0]["ms_salecode"].ToString() != dh.getFieldDataByCondition("make", "ma_salecode", "ma_code='" + iMakeCode + "'").ToString())
@@ -1378,7 +1378,10 @@ namespace UAS_MES.PublicMethod
                             return false;
                         }
                         else
+                        {
+                            dh.UpdateByCondition("makeserial", "ms_nextmacode='"+iMakeCode+"'", "ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')");
                             return true;
+                        }
                     }
                     else ErrMessage = "序列号" + iSN + "不存在";
                     break;