打印条码修改

UAS_MES_ZKLH/FunctionCode/Query/Query_Barcodeio.cs

@@ -91,7 +91,7 @@ namespace UAS_MES_NEW.Query
 
         private void LoadGridData()
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select de_code,de_name,de_spec,de_currentcentername,to_char(de_startdate,'yyyy-mm-dd')de_startdate from device  where de_currentcentername='" + DP_NAME.Text + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select de_code,de_name,de_spec,de_currentcentername,to_char(de_startdate,'yyyy-mm-dd')de_startdate from device  where de_currentcentername='" + DP_NAME.Text + "' order by de_currentcentername", "select");
             BaseUtil.FillDgvWithDataTable(DGV, dt);
         }
 
@@ -121,7 +121,7 @@ namespace UAS_MES_NEW.Query
                 {
                     string barcode = DGV.Rows[i].Cells["de_code"].Value.ToString();
                     string ErrorMessage = "";
-                    if (Print.BarTender(Tag.ToString(),  engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, barcode, int.Parse("1"), DP_NAME.Text, "", "自定义", "0", out ErrorMessage))
+                    if (!Print.BarTender(Tag.ToString(),  engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, barcode, int.Parse("1"), DP_NAME.Text, "", "自定义", "0", out ErrorMessage))
                     {
 
                     }

UAS_MES_ZKLH/PublicMethod/Print.cs

@@ -470,40 +470,40 @@ namespace UAS_MES_NEW.PublicMethod
             //        return false;
             //    }
             //}
-            if (IfRePrint != "-1" && LabelType != "机身标")
-            {
-                bool allowPallte = true;
-                if ((SystemInf.dh.getFieldDataByCondition("master", "MA_FUNCTION", "ma_user='" + SystemInf.CurrentDB + "'").ToString() == "万年MES系统(正式)"))
-                {
-                    allowPallte = false;
-                }
-                if (LabelType == "卡通箱标" || LabelType == "大箱标" || (LabelType == "栈板标" && allowPallte) || LabelType == "彩盒标")
-                {
-                    dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "' and lpl_file='" + LabelName + "'", "select");
-                }
-                else
-                {
-                    dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_makecode='" + MakeCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "'", "select");
-                }
-                ////如果已经打印过了,则不允许再打印
-                if (dt.Rows.Count > 0)
-                {
-                    ErrorMessage = SnCode + LabelType + "已打印";
-                    return false;
-                }
-            }
-            else
-            {
-                //if (LabelType == "卡通箱标" || LabelType == "大箱标" || LabelType == "彩盒标")
-                //{
-                //    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;
-                //    }
-                //}
-            }
+            //if (IfRePrint != "-1" && LabelType != "机身标")
+            //{
+            //    bool allowPallte = true;
+            //    if ((SystemInf.dh.getFieldDataByCondition("master", "MA_FUNCTION", "ma_user='" + SystemInf.CurrentDB + "'").ToString() == "万年MES系统(正式)"))
+            //    {
+            //        allowPallte = false;
+            //    }
+            //    if (LabelType == "卡通箱标" || LabelType == "大箱标" || (LabelType == "栈板标" && allowPallte) || LabelType == "彩盒标")
+            //    {
+            //        dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "' and lpl_file='" + LabelName + "'", "select");
+            //    }
+            //    else
+            //    {
+            //        dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_makecode='" + MakeCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "'", "select");
+            //    }
+            //    ////如果已经打印过了,则不允许再打印
+            //    if (dt.Rows.Count > 0)
+            //    {
+            //        ErrorMessage = SnCode + LabelType + "已打印";
+            //        return false;
+            //    }
+            //}
+            //else
+            //{
+            //    //if (LabelType == "卡通箱标" || LabelType == "大箱标" || LabelType == "彩盒标")
+            //    //{
+            //    //    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;
+            //    //    }
+            //    //}
+            //}
             string filelastwritetime = dh.getFieldDataByCondition("label", "la_lastwritetime", "la_id = '" + LaID + "'").ToString();
             string LA_SOFTTYPE = dh.getFieldDataByCondition("label", "LA_SOFTTYPE", "la_id = '" + LaID + "'").ToString();
             //如果有附件上传的话