diff --git a/service/Ordmsg.go b/service/Ordmsg.go index ff820c0..3a46896 100644 --- a/service/Ordmsg.go +++ b/service/Ordmsg.go @@ -303,6 +303,7 @@ func (bl_ordmsg *BL_Ordmsg) GeneratePrintDataForPickOrder(session *xorm.Session, slaveprintheadtab.Printfiletype = "ACTIVE" slaveprintheadtab.Printobjid = pickordtab.Pickorderid slaveprintheadtab.Templatefile = bl_picktmp.Picktemplatetab.Templatefile + strings.Replace(slaveprintheadtab.Templatefile, ".XLSX", ".rdlx", 1 ) slaveprintheadtab.Orientation = bl_picktmp.Picktemplatetab.Orientation slaveprintheadtab.Printcopies = common.Max(bl_ordmsg.Ordmsgtab.Printcopies, bl_picktmp.Picktemplatetab.Printqty, 1) slaveprintheadtab.Credatuz = common.Date(time.Now().Unix(), "YYYYMMDDHHmmss") @@ -737,6 +738,7 @@ func (bl_ordmsg *BL_Ordmsg) GeneratePrintDataForPackOrder(session *xorm.Session, } else { slaveprintheadtab.Templatefile = packordtab.Templatefile } + strings.Replace(slaveprintheadtab.Templatefile, ".XLSX", ".rdlx", 1 ) slaveprintheadtab.Orientation = bl_packtmp.Paktmpltab.Orientation slaveprintheadtab.Printcopies = common.Max(bl_ordmsg.Ordmsgtab.Printcopies, bl_packtmp.Paktmpltab.Printqty, 1) slaveprintheadtab.Credatuz = common.Date(time.Now().Unix(), "YYYYMMDDHHmmss") @@ -1004,6 +1006,7 @@ func (bl_ordmsg *BL_Ordmsg) GeneratePrintDataForPackOrderToJson(session *xorm.Se } else { slaveprintheadtab.Templatefile = packordtab.Templatefile } + strings.Replace(slaveprintheadtab.Templatefile, ".XLSX", ".rdlx", 1 ) slaveprintheadtab.Orientation = bl_packtmp.Paktmpltab.Orientation slaveprintheadtab.Printcopies = common.Max(bl_ordmsg.Ordmsgtab.Printcopies, bl_packtmp.Paktmpltab.Printqty, 1) slaveprintheadtab.Credatuz = common.Date(time.Now().Unix(), "YYYYMMDDHHmmss") @@ -1392,6 +1395,7 @@ func (bl_ordmsg *BL_Ordmsg) GeneratePrintDataForBbaasn(session *xorm.Session, sl } else { slaveprintheadtab.Templatefile = bbaasntmptab.Templatefile } + strings.Replace(slaveprintheadtab.Templatefile, ".XLSX", ".rdlx", 1 ) slaveprintheadtab.Orientation = bbaasntmptab.Orientation slaveprintheadtab.Printcopies = common.Max(bl_ordmsg.Ordmsgtab.Printcopies, bbaasntmptab.Printqty, 1) slaveprintheadtab.Credatuz = common.Date(time.Now().Unix(), "YYYYMMDDHHmmss")