diff --git a/SlnMesnac.LabelPrint.BarTender/equip/DrumLabelPrintEquip.cs b/SlnMesnac.LabelPrint.BarTender/equip/DrumLabelPrintEquip.cs index a78f8fd..1bc5139 100644 --- a/SlnMesnac.LabelPrint.BarTender/equip/DrumLabelPrintEquip.cs +++ b/SlnMesnac.LabelPrint.BarTender/equip/DrumLabelPrintEquip.cs @@ -46,9 +46,9 @@ namespace SlnMesnac.LabelPrint.BarTender.equip + para.column_C.ToString() + "+" + para.column_B.ToString(); base.EngineFormat.SubStrings["serial"].Value = para.column_B.ToString(); - base.EngineFormat.SubStrings["exp.date"].Value = ReformatDate(para.column_C.ToString()); - base.EngineFormat.SubStrings["lot"].Value = para.column_B.ToString(); - base.EngineFormat.SubStrings["p/n"].Value = para.column_D.ToString(); + base.EngineFormat.SubStrings["exp.date"].Value = ReformatDate(para.column_D.ToString()); + base.EngineFormat.SubStrings["lot"].Value = para.column_C.ToString(); + base.EngineFormat.SubStrings["p/n"].Value = para.column_E.ToString(); base.EngineFormat.SubStrings["barcode1"].Value = "1" + para.column_D.ToString() + " " + ReformatDate(para.column_C.ToString()) + "TS"; base.EngineFormat.SubStrings["barcode2"].Value = "2" + para.column_A.ToString(); base.EngineFormat.SubStrings["barcode3"].Value = "3" + para.column_B.ToString(); diff --git a/SlnMesnac.LabelPrint.BarTender/equip/GasLabelPrintEquip.cs b/SlnMesnac.LabelPrint.BarTender/equip/GasLabelPrintEquip.cs index 92b7b1b..3bad684 100644 --- a/SlnMesnac.LabelPrint.BarTender/equip/GasLabelPrintEquip.cs +++ b/SlnMesnac.LabelPrint.BarTender/equip/GasLabelPrintEquip.cs @@ -48,9 +48,9 @@ namespace SlnMesnac.LabelPrint.BarTender.equip base.EngineFormat.SubStrings["exp.date"].Value = ReformatDate(para.column_C.ToString()); base.EngineFormat.SubStrings["lot"].Value = para.column_B.ToString(); base.EngineFormat.SubStrings["p/n"].Value = para.column_D.ToString(); - base.EngineFormat.SubStrings["barcode1"].Value = "4" + para.column_D.ToString() + " " + ReformatDate(para.column_C.ToString()) + "TS"; - base.EngineFormat.SubStrings["barcode2"].Value = "5" + para.column_A.ToString(); - base.EngineFormat.SubStrings["barcode3"].Value = "6" + para.column_B.ToString(); + base.EngineFormat.SubStrings["barcode1"].Value = "1" + para.column_D.ToString() + " " + ReformatDate(para.column_C.ToString()) + "TS"; + base.EngineFormat.SubStrings["barcode2"].Value = "2" + para.column_A.ToString(); + base.EngineFormat.SubStrings["barcode3"].Value = "3" + para.column_B.ToString(); //para.column_A.ToString(); //para.column_C.ToString() diff --git a/SlnMesnac.LabelPrint.BarTender/equip/TFLablePrintEquip.cs b/SlnMesnac.LabelPrint.BarTender/equip/TFLablePrintEquip.cs index 0b2f7a7..509125b 100644 --- a/SlnMesnac.LabelPrint.BarTender/equip/TFLablePrintEquip.cs +++ b/SlnMesnac.LabelPrint.BarTender/equip/TFLablePrintEquip.cs @@ -48,9 +48,9 @@ namespace SlnMesnac.LabelPrint.BarTender.equip base.EngineFormat.SubStrings["exp.date"].Value = ReformatDate(para.column_C.ToString()); base.EngineFormat.SubStrings["lot"].Value = para.column_B.ToString(); base.EngineFormat.SubStrings["p/n"].Value = para.column_D.ToString(); - base.EngineFormat.SubStrings["barcode1"].Value = "4" + para.column_D.ToString() + " " + ReformatDate(para.column_C.ToString()) + "TS"; - base.EngineFormat.SubStrings["barcode2"].Value = "5" + para.column_A.ToString(); - base.EngineFormat.SubStrings["barcode3"].Value = "6" + para.column_B.ToString(); + base.EngineFormat.SubStrings["barcode1"].Value = "1" + para.column_D.ToString() + " " + ReformatDate(para.column_C.ToString()) + "TS"; + base.EngineFormat.SubStrings["barcode2"].Value = "2" + para.column_A.ToString(); + base.EngineFormat.SubStrings["barcode3"].Value = "3" + para.column_B.ToString(); //para.column_A.ToString(); return true;