标签分配号段合并打印

UAS_MES_ODLF/FunctionCode/Make/Make_FuselageLabelPrintGetIMEI.cs

@@ -209,7 +209,7 @@ namespace UAS_MES_NEW.Make
                             //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
                             //    return;
                             //};
-                            if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
+                            if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, oPSN, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
                             {
                                 //提示用户打印成功
                                 OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);

UAS_MES_ODLF/FunctionCode/Make/Make_RePrintLabel.cs

@@ -119,7 +119,7 @@ namespace UAS_MES_NEW.Make
                 if (giftBox.Checked || fuselagel.Checked || pitao.Checked)
                 {
                     //select max(ms_id)ms_id from makeserial where ms_sncode=? 
-                    ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id) ms_id", "ms_sncode='" + inputText.Text + "' or ms_firstsn='" + inputText.Text + "' or ms_imei1='" + inputText.Text + "' or ms_imei2='" + inputText.Text + "'").ToString();
+                    ms_id = dh.getFieldDataByCondition("makeserial", "max(ms_id) ms_id", "ms_sncode='" + inputText.Text + "' or ms_code='" + inputText.Text + "' or ms_imei1='" + inputText.Text + "' or ms_imei2='" + inputText.Text + "'").ToString();
                     //如果ms_id 无值或者为空，提示用户SN不存在，请输入SN
                     if (ms_id == "")
                     {

UAS_MES_ODLF/FunctionCode/Special/Special_CancelCollection.cs

@@ -24,11 +24,12 @@ namespace UAS_MES_NEW.Special
         private void Confirm_Click(object sender, EventArgs e)
         {
             //获取序列号的途程
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,ms_outboxcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where ms_sncode='" + sn_code.Text + "' or ms_imei1='" + sn_code.Text + "' and ms_outboxcode is null order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_firstsn,ms_sncode,ms_id,ms_nextstepcode,ms_currentstepcode,ms_outboxcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode from makeserial where ms_sncode='" + sn_code.Text + "' or ms_imei1='" + sn_code.Text + "' and ms_outboxcode is null order by ms_id desc", "select");
             if (dt.Rows.Count > 0)
             {
                 string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
                 string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
+                string ms_sncode = dt.Rows[0]["ms_sncode"].ToString();
                 string pr_code = dt.Rows[0]["ms_prodcode"].ToString();
                 string cr_code = dt.Rows[0]["ms_craftcode"].ToString();
                 string ms_nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
@@ -54,7 +55,7 @@ namespace UAS_MES_NEW.Special
                 //存在不良删除不良记录
                 if (ms_status == "3")
                 {
-                    sqls.Add("delete from makebad where mb_sncode='" + sn_code.Text + "' and mb_makecode='" + ms_makecode + "'");
+                    sqls.Add("delete from makebad where mb_sncode='" + ms_sncode + "' and mb_makecode='" + ms_makecode + "'");
                     //更新MakeCraftDetail表记录
                     sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1 where mcd_macode='" + ms_makecode + "' and instr((select ms_paststep from makeserial where ms_sncode='" + sn_code.Text + "' and ms_makecode='" + ms_makecode + "'),mcd_stepcode)>0 ");
                 }
@@ -62,15 +63,15 @@ namespace UAS_MES_NEW.Special
                 {
                     sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1,mcd_outqty=mcd_outqty-1,mcd_okqty=mcd_okqty-1 where mcd_macode='" + ms_makecode + "' and instr((select ms_paststep from makeserial where ms_sncode='" + sn_code.Text + " and ms_makecode='" + ms_makecode + "''),mcd_stepcode)>0 ");
                 }
-                sqls.Add("delete from makebad where mb_sncode='" + sn_code.Text + "' and mb_makecode='" + ms_makecode + "'");
+                sqls.Add("delete from makebad where mb_sncode='" + ms_sncode + "' and mb_makecode='" + ms_makecode + "'");
                 if (ms_checkno != "")
                 {
                     //删除送检明细
-                    sqls.Add("delete from oqcbatchdetail where obd_sncode='" + sn_code.Text + "' and obd_makecode='" + ms_makecode + "'");
+                    sqls.Add("delete from oqcbatchdetail where obd_sncode='" + ms_sncode + "' and obd_makecode='" + ms_makecode + "'");
                     //送检数量-1
                     sqls.Add("update oqcbatch set ob_nowcheckqty=ob_nowcheckqty-1 where ob_checkno='" + ms_checkno + "'");
                 }
-                sqls.Add("delete from makebadcount where mbc_sncode='" + sn_code.Text + "'");
+                sqls.Add("delete from makebadcount where mbc_sncode='" + ms_sncode + "'");
                 //清除上料数据
                 dt = (DataTable)dh.ExecuteSql("select cm_barcode,cm_materialtype,cm_makecode,cm_stepcode from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'", "select");
                 if (dt.Rows.Count > 0)
@@ -89,37 +90,37 @@ namespace UAS_MES_NEW.Special
                     sql.Clear();
                     sql.Append("update makeserial set ms_nextmacode='' where ms_sncode=:barcode and ms_nextmacode='" + ms_makecode + "'");
                     dh.BatchInsert(sql.GetString(), new string[] { "barcode" }, barcode.ToArray());
-                    sqls.Add("delete from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ms_makecode + "'");
+                    sqls.Add("delete from craftmaterial where cm_sncode='" + ms_sncode + "' and cm_makecode='" + ms_makecode + "'");
                 }
-                sqls.Add("delete from sninfo where si_sn='" + sn_code.Text + "' or si_sn='" + ms_firstsn + "'");
-                sqls.Add("update makeaddresslist set mal_sncode='',mal_status=0 where mal_sncode='" + sn_code.Text + "'");
+                sqls.Add("delete from sninfo where si_sn='" + ms_sncode + "' or si_sn='" + ms_firstsn + "'");
+                sqls.Add("update makeaddresslist set mal_sncode='',mal_status=0 where mal_sncode='" + ms_sncode + "'");
                 //删除打印日志
-                sqls.Add("delete from labelprintlog where lpl_value='" + sn_code.Text + "' and lpl_makecode='" + ms_makecode + "'");
+                sqls.Add("delete from labelprintlog where lpl_value='" + ms_sncode + "' and lpl_makecode='" + ms_makecode + "'");
                 //删除老化记录
-                sqls.Add("delete from AGINGRECORD where ar_sncode='" + sn_code.Text + "' and ar_macode='" + ms_makecode + "'");
+                sqls.Add("delete from AGINGRECORD where ar_sncode='" + ms_sncode + "' and ar_macode='" + ms_makecode + "'");
                 //解除前一工单板的使用
-                sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='" + sn_code.Text + "' and ms_nextmacode='" + ms_makecode + "'");
+                sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='" + ms_sncode + "' and ms_nextmacode='" + ms_makecode + "'");
                 //初始化导入数据状态
-                sqls.Add("update  makeimeilist set mil_status=0,mil_sncode='' where ( mil_sncode='" + sn_code.Text + "' or mil_psn='" + sn_code.Text + "') and mil_makecode='" + ms_makecode + "'");
+                sqls.Add("update  makeimeilist set mil_status=0,mil_sncode='' where ( mil_sncode='" + ms_sncode + "' or mil_psn='" + ms_sncode + "') and mil_makecode='" + ms_makecode + "'");
                 //更新MAC使用记录
-                sqls.Add("update  makeaddresslist set mal_status=0,mal_sncode='' where mal_sncode='" + sn_code.Text + "' and mal_makecode='" + ms_makecode + "'");
-                sqls.Add("delete from makesnrelation where (sn='"+sn_code.Text+"' or beforesn='"+sn_code.Text+"') and makecode='"+ms_makecode+"'");
+                sqls.Add("update  makeaddresslist set mal_status=0,mal_sncode='' where mal_sncode='" + ms_sncode + "' and mal_makecode='" + ms_makecode + "'");
+                sqls.Add("delete from makesnrelation where (sn='" + ms_sncode + "' or beforesn='" + ms_sncode + "') and makecode='" + ms_makecode + "'");
 
-                sqls.Add("update makesnlist set msl_status=0,msl_sncode='' where msl_sncode='" + sn_code.Text + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");
+                sqls.Add("update makesnlist set msl_status=0,msl_sncode='' where msl_sncode='" + ms_sncode + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");
                 ////初始化号段状态
-                sqls.Add("update MAKESNRULEDETAIL set msd_status=0 where msd_sncode='" + sn_code.Text + "' and msd_makecode='" + ms_makecode + "'  and msd_type='before'");
+                sqls.Add("update MAKESNRULEDETAIL set msd_status=0 where msd_sncode='" + ms_sncode + "' and msd_makecode='" + ms_makecode + "'  and msd_type='before'");
                 //清除操作日志
-                //sqls.Add("delete from commandlog where cl_makecode='" + ms_makecode + "' and cl_sncode='" + sn_code.Text + "'");
+                //sqls.Add("delete from commandlog where cl_makecode='" + ms_makecode + "' and cl_sncode='" + ms_sncode + "'");
                 //删除过站记录
-                //sqls.Add("delete from makeprocess where mp_sncode='" + sn_code.Text + "' and mp_makecode='" + ms_makecode + "'");
+                //sqls.Add("delete from makeprocess where mp_sncode='" + ms_sncode + "' and mp_makecode='" + ms_makecode + "'");
                 //投入数-1
                 sqls.Add("update make set ma_inqty=ma_inqty-1 where ma_code='" + ms_makecode + "'");
                 //删除StepPass
-                sqls.Add("delete from steppassed where sp_sncode='" + sn_code.Text + "' and sp_makecode='" + ms_makecode + "'");
+                sqls.Add("delete from steppassed where sp_sncode='" + ms_sncode + "' and sp_makecode='" + ms_makecode + "'");
                 sqls.Add("delete from makeserial where ms_id='" + ms_id + "'");
                 dh.ExecuteSQLTran(sqls.ToArray());
-                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "取消采集", "取消采集成功", sn_code.Text, "");
-                OperateResult.AppendText(">>序列号" + sn_code.Text + "成功解除绑定\n", Color.Green, sn_code);
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "取消采集", "取消采集成功", ms_sncode, "");
+                OperateResult.AppendText(">>序列号" + ms_sncode + "成功解除绑定\n", Color.Green, sn_code);
                 //}
                 //else OperateResult.AppendText(">>序列号" + sn_code.Text + "不处于第一道工序，不允许取消采集\n", Color.Red, sn_code);
             }

UAS_MES_ODLF/PublicMethod/Print.cs

@@ -136,8 +136,8 @@ namespace UAS_MES_NEW.PublicMethod
                     dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_type='" + LabelType + "'", "select");
                     if (dt.Rows.Count == 0)
                     {
-                        ErrorMessage = SnCode + LabelType + "未打印，不允许补打";
-                        return false;
+                        //ErrorMessage = SnCode + LabelType + "未打印，不允许补打";
+                        //return false;
                     }
                 }
             }