工单切换修改

UAS_MES_XMW/FunctionCode/Make/Make_MakeCancelDown.cs

@@ -102,7 +102,7 @@ namespace UAS_MES_NEW.Make
             if (e.KeyCode == Keys.Enter)
             {
                 sql.Clear();
-                sql.Append("select md_code,md_sncode,md_macode,md_prodcode,pr_detail from makedown left join product on pr_code=md_prodcode left join makeserial on ms_sncode=md_sncode and ms_makecode=md_macode where md_sncode='" + sn_code.Text + "' or ms_imei1='" + sn_code.Text + "' or ms_imei2='" + sn_code.Text + "' or ms_imei3='" + sn_code.Text + "' and md_status=-1");
+                sql.Append("select md_code,md_sncode,md_macode,md_prodcode,pr_detail from makedown left join product on pr_code=md_prodcode left join makeserial on ms_sncode=md_sncode and ms_makecode=md_macode where md_sncode='" + sn_code.Text + "'  and md_status=-1");
                 dtbar = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dtbar.Rows.Count > 0)
                 {

UAS_MES_XMW/FunctionCode/Make/Make_MakeDown.cs

@@ -1,11 +1,6 @@
-using HslCommunication.Profinet.Knx;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System;
 using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
@@ -199,4 +194,4 @@ namespace UAS_MES_NEW.Make
             OperateResult.AppendText(">>>设置拦截工序成功\n", Color.Green);
         }
     }
-}
+}

UAS_MES_XMW/FunctionCode/Make/Make_TestCollection_Param.cs

@@ -800,7 +800,7 @@ namespace UAS_MES_NEW.Make
         private void ma_prodcode_TextChanged(object sender, EventArgs e)
         {
             LoadBadGroupData();
-            DataTable par = (DataTable)dh.ExecuteSql("select PID_DETNO, PID_ITEM,pid_maxvalue,pid_minvalue from productitem left join productitemdetail on pi_id=pid_piid where pi_prodcode='" + ma_prodcode.Text + "'", "select");
+            DataTable par = (DataTable)dh.ExecuteSql("select PID_DETNO, PID_ITEM,pid_maxvalue,pid_minvalue from productitem left join productitemdetail on pi_id=pid_piid where pi_prodcode='" + ma_prodcode.Text + "' and PID_STEPCODE='" + User.CurrentStepCode + "'", "select");
             BaseUtil.FillDgvWithDataTable(ParamDataGridView, par);
         }
 

UAS_MES_XMW/FunctionCode/Special/Special_ChangeMakeCodeBySN.cs

@@ -50,7 +50,7 @@ namespace UAS_MES_NEW.Special
         {
             Dbfind = ma_code.ReturnData;
             BaseUtil.SetFormValue(this.Controls, Dbfind);
-            DataTable dt = (DataTable)dh.ExecuteSql("select ma_qty,ma_prodcode,pr_detail,ma_printnum from make left join product on ma_prodcode=pr_code left join (select count(1)ma_printnum,mil_makecode from makeimeilist where mil_printstatus=-1 group by mil_makecode) on mil_makecode=ma_code where ma_code='" + ma_code.Text + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ma_qty,ma_prodcode,pr_detail from make left join product on ma_prodcode=pr_code  where ma_code='" + ma_code.Text + "'", "select");
             if (dt.Rows.Count > 0)
             {
                 pr_code.Text = dt.Rows[0]["ma_prodcode"].ToString();
@@ -62,18 +62,18 @@ namespace UAS_MES_NEW.Special
         {
             Dbfind = ma_code1.ReturnData;
             BaseUtil.SetFormValue(this.Controls, Dbfind);
-            DataTable dt = (DataTable)dh.ExecuteSql("select ma_qty,ma_prodcode,pr_detail,ma_printnum from make left join product on ma_prodcode=pr_code left join (select count(1)ma_printnum,mil_makecode from makeimeilist where mil_printstatus=-1 group by mil_makecode) on mil_makecode=ma_code where ma_code='" + ma_code1.Text + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ma_qty,ma_prodcode,pr_detail from make left join product on ma_prodcode=pr_code  where ma_code='" + ma_code1.Text + "'", "select");
             if (dt.Rows.Count > 0)
             {
                 pr_code1.Text = dt.Rows[0]["ma_prodcode"].ToString();
                 pr_detail1.Text = dt.Rows[0]["pr_detail"].ToString();
             }
         }
-                                            
+
         private void Confirm_Click(object sender, EventArgs e)
         {
 
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_sncode,ms_makecode from makeserial where ms_sncode='" + ms_sncode.Text + "' and ms_imei1='" + ms_sncode.Text + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_sncode,ms_makecode from makeserial where ms_sncode='" + ms_sncode.Text + "'  order by ms_id desc", "select");
             string sncode = "";
             if (dt.Rows.Count == 0)
             {
@@ -114,12 +114,12 @@ namespace UAS_MES_NEW.Special
             sqls.Add("update CRAFTMATERIAL set cm_makecode='" + ma_code1.Text + "' where cm_makecode= '" + ma_code.Text + "' and cm_sncode='" + sncode + "'");
             sqls.Add("update steppassed set sp_makecode='" + ma_code1.Text + "' where sp_makecode= '" + ma_code.Text + "' and sp_sncode='" + sncode + "'");
             sqls.Add("update makeserial set ms_makecode='" + ma_code1.Text + "' where ms_makecode= '" + ma_code.Text + "' and ms_sncode='" + sncode + "'");
-            sqls.Add("update makeprocess set mp_makecode='" + ma_code1.Text + "' where mp_makecode= '" + ma_code.Text + "' and ms_sncode='" + sncode + "'");
+            sqls.Add("update makeprocess set mp_makecode='" + ma_code1.Text + "' where mp_makecode= '" + ma_code.Text + "' and mp_sncode='" + sncode + "'");
             sqls.Add("update commandlog set cl_makecode='" + ma_code1.Text + "' where cl_makecode= '" + ma_code.Text + "' and cl_sncode='" + sncode + "'");
             sqls.Add("update makebad set mb_makecode='" + ma_code1.Text + "' where mb_makecode= '" + ma_code.Text + "' and mb_sncode='" + sncode + "'");
             sqls.Add("update labelprintlog set lpl_makecode='" + ma_code1.Text + "' where lpl_makecode= '" + ma_code.Text + "' and lpl_value='" + sncode + "'");
             sqls.Add("update make set ma_inqty=(select count(1) from makeserial where ms_makecode='" + ma_code1.Text + "') and ma_code='" + ma_code1.Text + "' ");
-            sqls.Add("update make set ma_endqty=(select count(1) from makeserial where ms_makecode='" + ma_code1.Text + "' and ms_status=2) and ma_code='" + ma_code1.Text + "'");
+            sqls.Add("update make set ma_endqty=(select count(1) from makeserial where ms_makecode='" + ma_code1.Text + "' and ms_status=2) where ma_code='" + ma_code1.Text + "'");
             dh.ExecuteSQLTran(sqls.ToArray());
             OperateResult.AppendText("工单号切换成功\n");
             LogicHandler.DoCommandLog("", User.UserName, ma_code.Text, User.UserLineCode, User.UserSourceCode, "工单变更", "工单变更" + ma_code.Text + "切换到" + ma_code1.Text, "", "");