昱硕 冯 1 год назад
Родитель
Сommit
88b2d387bf

+ 91 - 0
DK.Service/BarcodePrintService/BarcodePrintLogic.cs

@@ -970,6 +970,28 @@ namespace Dongke.IBOSS.PRD.Service.BarcodePrintService
                     {
                     {
                         int layoutID = Convert.ToInt32(layoutData2.Rows[0]["LayoutID"]);
                         int layoutID = Convert.ToInt32(layoutData2.Rows[0]["LayoutID"]);
                         byte[] bytes = layoutData2.Rows[0]["LayoutData"] as byte[];
                         byte[] bytes = layoutData2.Rows[0]["LayoutData"] as byte[];
+
+                        string itemstyle = string.Empty;
+                        if (layoutID > 0)
+                        {
+                            string sqlString = @"SELECT
+	                                                        B.ITEMSTYLE
+                                                        FROM
+	                                                        TP_MST_BARCODEPRINTLAYOUT P
+	                                                        LEFT JOIN TP_MST_BARCODEPRINTITEM T ON P.LAYOUTID = T.LAYOUTID 
+	                                                        INNER JOIN TP_SYS_BARCODEPRINTITEM B ON T.ITEMCODE = B.ITEMCODE
+	                                                        AND B.ITEMCODE = 'OUTONLYCODE2'
+                                                        WHERE
+	                                                        P.LAYOUTID = :LAYOUTID";
+                            OracleParameter[] paras1 = new OracleParameter[]{
+                                    new OracleParameter(":LAYOUTID",OracleDbType.Int16, layoutID,ParameterDirection.Input)
+                                };
+                            itemstyle = oracleTrConn.GetSqlResultToStr(sqlString, paras1);
+                        }
+                        if (itemstyle != "6")
+                        {
+                            printData.Rows[0]["OUTONLYCODE"] = printData.Rows[0]["OUTONLYCODE"].ToString().Substring(45);
+                        }
                         try
                         try
                         {
                         {
                             //Dongke.IBOSS.PRD.Basics.Library.OutputLog.TraceLog(Dongke.IBOSS.PRD.Basics.Library.LogPriority.Debug,
                             //Dongke.IBOSS.PRD.Basics.Library.OutputLog.TraceLog(Dongke.IBOSS.PRD.Basics.Library.LogPriority.Debug,
@@ -1013,6 +1035,29 @@ namespace Dongke.IBOSS.PRD.Service.BarcodePrintService
                     {
                     {
                         int layoutID = Convert.ToInt32(layoutData3.Rows[0]["LayoutID"]);
                         int layoutID = Convert.ToInt32(layoutData3.Rows[0]["LayoutID"]);
                         byte[] bytes = layoutData3.Rows[0]["LayoutData"] as byte[];
                         byte[] bytes = layoutData3.Rows[0]["LayoutData"] as byte[];
+
+                        string itemstyle = string.Empty;
+                        if (layoutID > 0)
+                        {
+                            string sqlString = @"SELECT
+	                                                        B.ITEMSTYLE
+                                                        FROM
+	                                                        TP_MST_BARCODEPRINTLAYOUT P
+	                                                        LEFT JOIN TP_MST_BARCODEPRINTITEM T ON P.LAYOUTID = T.LAYOUTID 
+	                                                        INNER JOIN TP_SYS_BARCODEPRINTITEM B ON T.ITEMCODE = B.ITEMCODE
+	                                                        AND B.ITEMCODE = 'OUTONLYCODE2'
+                                                        WHERE
+	                                                        P.LAYOUTID = :LAYOUTID";
+                            OracleParameter[] paras1 = new OracleParameter[]{
+                                    new OracleParameter(":LAYOUTID",OracleDbType.Int16, layoutID,ParameterDirection.Input)
+                                };
+                            itemstyle = oracleTrConn.GetSqlResultToStr(sqlString, paras1);
+                        }
+                        if (itemstyle != "6")
+                        {
+                            printData.Rows[0]["OUTONLYCODE"] = printData.Rows[0]["OUTONLYCODE"].ToString().Substring(45);
+                        }
+
                         try
                         try
                         {
                         {
                             //Dongke.IBOSS.PRD.Basics.Library.OutputLog.TraceLog(Dongke.IBOSS.PRD.Basics.Library.LogPriority.Debug,
                             //Dongke.IBOSS.PRD.Basics.Library.OutputLog.TraceLog(Dongke.IBOSS.PRD.Basics.Library.LogPriority.Debug,
@@ -1239,6 +1284,29 @@ namespace Dongke.IBOSS.PRD.Service.BarcodePrintService
                         {
                         {
                             int layoutID = Convert.ToInt32(layoutData2.Rows[0]["LayoutID"]);
                             int layoutID = Convert.ToInt32(layoutData2.Rows[0]["LayoutID"]);
                             byte[] bytes = layoutData2.Rows[0]["LayoutData"] as byte[];
                             byte[] bytes = layoutData2.Rows[0]["LayoutData"] as byte[];
+
+                            string itemstyle = string.Empty;
+                            if (layoutID > 0)
+                            {
+                                string sqlString = @"SELECT
+	                                                        B.ITEMSTYLE
+                                                        FROM
+	                                                        TP_MST_BARCODEPRINTLAYOUT P
+	                                                        LEFT JOIN TP_MST_BARCODEPRINTITEM T ON P.LAYOUTID = T.LAYOUTID 
+	                                                        INNER JOIN TP_SYS_BARCODEPRINTITEM B ON T.ITEMCODE = B.ITEMCODE
+	                                                        AND B.ITEMCODE = 'OUTONLYCODE2'
+                                                        WHERE
+	                                                        P.LAYOUTID = :LAYOUTID";
+                                OracleParameter[] paras1 = new OracleParameter[]{
+                                    new OracleParameter(":LAYOUTID",OracleDbType.Int16, layoutID,ParameterDirection.Input)
+                                };
+                                itemstyle = oracleTrConn.GetSqlResultToStr(sqlString, paras1);
+                            }
+                            if (itemstyle != "6")
+                            {
+                                printData.Rows[0]["OUTONLYCODE"] = printData.Rows[0]["OUTONLYCODE"].ToString().Substring(45);
+                            }
+
                             //生成电子票据;
                             //生成电子票据;
                             InvoiceLayoutPrinter.Print(printerName, 1, bytes, printData.Rows[0], printData, 1);
                             InvoiceLayoutPrinter.Print(printerName, 1, bytes, printData.Rows[0], printData, 1);
                             // 打印记录
                             // 打印记录
@@ -1249,6 +1317,29 @@ namespace Dongke.IBOSS.PRD.Service.BarcodePrintService
                         {
                         {
                             int layoutID = Convert.ToInt32(layoutData3.Rows[0]["LayoutID"]);
                             int layoutID = Convert.ToInt32(layoutData3.Rows[0]["LayoutID"]);
                             byte[] bytes = layoutData3.Rows[0]["LayoutData"] as byte[];
                             byte[] bytes = layoutData3.Rows[0]["LayoutData"] as byte[];
+
+                            string itemstyle = string.Empty;
+                            if (layoutID > 0)
+                            {
+                                string sqlString = @"SELECT
+	                                                        B.ITEMSTYLE
+                                                        FROM
+	                                                        TP_MST_BARCODEPRINTLAYOUT P
+	                                                        LEFT JOIN TP_MST_BARCODEPRINTITEM T ON P.LAYOUTID = T.LAYOUTID 
+	                                                        INNER JOIN TP_SYS_BARCODEPRINTITEM B ON T.ITEMCODE = B.ITEMCODE
+	                                                        AND B.ITEMCODE = 'OUTONLYCODE2'
+                                                        WHERE
+	                                                        P.LAYOUTID = :LAYOUTID";
+                                OracleParameter[] paras1 = new OracleParameter[]{
+                                    new OracleParameter(":LAYOUTID",OracleDbType.Int16, layoutID,ParameterDirection.Input)
+                                };
+                                itemstyle = oracleTrConn.GetSqlResultToStr(sqlString, paras1);
+                            }
+                            if (itemstyle != "6")
+                            {
+                                printData.Rows[0]["OUTONLYCODE"] = printData.Rows[0]["OUTONLYCODE"].ToString().Substring(45);
+                            }
+
                             //生成电子票据;
                             //生成电子票据;
                             InvoiceLayoutPrinter.Print(printerName, 1, bytes, printData.Rows[0], printData);
                             InvoiceLayoutPrinter.Print(printerName, 1, bytes, printData.Rows[0], printData);
                             // 打印记录
                             // 打印记录

+ 22 - 0
DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -11392,6 +11392,28 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                             int layoutID = Convert.ToInt32(layoutData.Rows[0]["LayoutID"]);
                             int layoutID = Convert.ToInt32(layoutData.Rows[0]["LayoutID"]);
                             byte[] bytes = layoutData.Rows[0]["LayoutData"] as byte[];
                             byte[] bytes = layoutData.Rows[0]["LayoutData"] as byte[];
 
 
+                            string itemstyle = string.Empty;
+                            if (layoutID > 0)
+                            {
+                                string sqlString = @"SELECT
+	                                                        B.ITEMSTYLE
+                                                        FROM
+	                                                        TP_MST_BARCODEPRINTLAYOUT P
+	                                                        LEFT JOIN TP_MST_BARCODEPRINTITEM T ON P.LAYOUTID = T.LAYOUTID 
+	                                                        INNER JOIN TP_SYS_BARCODEPRINTITEM B ON T.ITEMCODE = B.ITEMCODE
+	                                                        AND B.ITEMCODE = 'OUTONLYCODE2'
+                                                        WHERE
+	                                                        P.LAYOUTID = :LAYOUTID";
+                                OracleParameter[] paras1 = new OracleParameter[]{
+                                    new OracleParameter(":LAYOUTID",OracleDbType.Int16, layoutID,ParameterDirection.Input)
+                                };
+                                itemstyle = oracleTrConn.GetSqlResultToStr(sqlString, paras1);
+                            }
+                            if (itemstyle != "6")
+                            {
+                                printData.Rows[0]["OUTONLYCODE"] = printData.Rows[0]["OUTONLYCODE"].ToString().Substring(45);
+                            }
+
                             //生成电子票据
                             //生成电子票据
                             InvoiceLayoutPrinter.Print(printerName, Convert.ToInt16(1), bytes, printData.Rows[0], printData);
                             InvoiceLayoutPrinter.Print(printerName, Convert.ToInt16(1), bytes, printData.Rows[0], printData);