Merge remote-tracking branch 'origin/dev-xwt'

src/main/java/com/sqx/modules/printInfo/controller/PrintInfoController.java

@@ -265,7 +265,7 @@ public class PrintInfoController {
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
                     typeData.setId(nowInfo.getId());
                     typeData.setIsBlod(0);
-                    typeData.setWordSize(0);
+                    typeData.setWordSize(1);
                     typeData.setPrintField(nowInfo.getPrintField());
                     typeData.setPrintName(nowInfo.getPrintName());
                     types.add(typeData);
@@ -302,7 +302,7 @@ public class PrintInfoController {
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
                     typeData.setId(nowInfo.getId());
                     typeData.setIsBlod(0);
-                    typeData.setWordSize(0);
+                    typeData.setWordSize(1);
                     typeData.setPrintField(nowInfo.getPrintField());
                     typeData.setPrintName(nowInfo.getPrintName());
                     types.add(typeData);
@@ -334,7 +334,7 @@ public class PrintInfoController {
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
                     typeData.setId(nowInfo.getId());
                     typeData.setIsBlod(0);
-                    typeData.setWordSize(0);
+                    typeData.setWordSize(1);
                     typeData.setPrintField(nowInfo.getPrintField());
                     typeData.setPrintName(nowInfo.getPrintName());
                     data.getTypes().add(typeData);
@@ -363,7 +363,7 @@ public class PrintInfoController {
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
                     typeData.setId(nowInfo.getId());
                     typeData.setIsBlod(0);
-                    typeData.setWordSize(0);
+                    typeData.setWordSize(1);
                     typeData.setPrintField(nowInfo.getPrintField());
                     typeData.setPrintName(nowInfo.getPrintName());
                     types.add(typeData);
@@ -394,7 +394,7 @@ public class PrintInfoController {
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
                     typeData.setId(nowInfo.getId());
                     typeData.setIsBlod(0);
-                    typeData.setWordSize(0);
+                    typeData.setWordSize(1);
                     typeData.setPrintField(nowInfo.getPrintField());
                     typeData.setPrintName(nowInfo.getPrintName());
                     data.getTypes().add(typeData);
@@ -423,7 +423,7 @@ public class PrintInfoController {
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
                     typeData.setId(nowInfo.getId());
                     typeData.setIsBlod(0);
-                    typeData.setWordSize(0);
+                    typeData.setWordSize(1);
                     typeData.setPrintField(nowInfo.getPrintField());
                     typeData.setPrintName(nowInfo.getPrintName());
                     types.add(typeData);
@@ -454,7 +454,7 @@ public class PrintInfoController {
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
                     typeData.setId(nowInfo.getId());
                     typeData.setIsBlod(0);
-                    typeData.setWordSize(0);
+                    typeData.setWordSize(1);
                     typeData.setPrintField(nowInfo.getPrintField());
                     typeData.setPrintName(nowInfo.getPrintName());
                     data.getTypes().add(typeData);
@@ -482,7 +482,7 @@ public class PrintInfoController {
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
                     typeData.setId(nowInfo.getId());
                     typeData.setIsBlod(0);
-                    typeData.setWordSize(0);
+                    typeData.setWordSize(1);
                     typeData.setPrintField(nowInfo.getPrintField());
                     typeData.setPrintName(nowInfo.getPrintName());
                     types.add(typeData);
@@ -513,7 +513,7 @@ public class PrintInfoController {
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
                     typeData.setId(nowInfo.getId());
                     typeData.setIsBlod(0);
-                    typeData.setWordSize(0);
+                    typeData.setWordSize(1);
                     typeData.setPrintField(nowInfo.getPrintField());
                     typeData.setPrintName(nowInfo.getPrintName());
                     data.getTypes().add(typeData);

src/main/java/com/sqx/modules/printInfo/entity/PrintModelTypeResult.java

@@ -25,7 +25,6 @@ public class PrintModelTypeResult {
 
     /**
      * 打印字号
-     * 都没选：0
      * 正常：1
      * 放大：2
      */

src/main/java/com/sqx/modules/utils/fieYun/FeiYunUtils.java

@@ -557,7 +557,7 @@ public class FeiYunUtils {
                         start.append("<B>");
                         end.append("</B>");
                     }
-                    if (baseType.getWordSize().intValue() == eWordSize.Amplify.getValue()) {
+                    if (baseType.getIsBlod().intValue() == eWordSize.Normal.getValue()) {//这里normal表示加粗
                         start.append("<BOLD>");
                         end.append("</BOLD>");
                     }
@@ -771,7 +771,7 @@ public class FeiYunUtils {
                         start.append("<B>");
                         end.append("</B>");
                     }
-                    if (type.getWordSize().intValue() == eWordSize.Amplify.getValue()) {
+                    if (type.getIsBlod().intValue() == eWordSize.Normal.getValue()) {//这里normal表示加粗
                         start.append("<BOLD>");
                         end.append("</BOLD>");
                     }
@@ -955,12 +955,24 @@ public class FeiYunUtils {
                     }
                 }
                 //endregion
+                if(goods_name_start != null){
+                    stringBuilder.append(goods_name_start).append("名称").append(goods_name_end).append("　　　  ");
+                }
+
+                if(goods_price_start != null){
+                    stringBuilder.append(goods_price_start).append("单价").append(goods_price_end).append("　 ");
+                }
+
+                if(goods_num_start != null){
+                    stringBuilder.append(goods_num_start).append("数量").append(goods_num_end).append("　 ");
+                }
+
                 if (sum_money_start != null) {
-                    stringBuilder.append("名称　　　  单价　 数量　 金额　<BR>");
-                } else {
-                    stringBuilder.append("名称　　　  单价　       数量<BR>");
+                    stringBuilder.append(sum_money_start).append("金额").append(sum_money_end);
                 }
 
+                stringBuilder.append("<BR>");
+
                 stringBuilder.append("--------------------------------<BR>");
                 BigDecimal packMoney = BigDecimal.ZERO;
                 BigDecimal goodsMoney = BigDecimal.ZERO;
@@ -985,7 +997,7 @@ public class FeiYunUtils {
                     } else {
                         stringBuilder.append("　 ");
                     }
-                    stringBuilder.append(goods_num_start).append(orderGoods.getGoodsNum()).append(goods_num_end);
+                    stringBuilder.append(goods_num_start).append("x"+orderGoods.getGoodsNum()).append(goods_num_end);
                     stringBuilder.append("　  ");
                     if (sum_money_start != null) {
                         stringBuilder.append(sum_money_start).append(sumMoney).append(sum_money_end);
@@ -1044,7 +1056,7 @@ public class FeiYunUtils {
                         start.append("<B>");
                         end.append("</B>");
                     }
-                    if (type.getWordSize().intValue() == eWordSize.Amplify.getValue()) {
+                    if (type.getIsBlod().intValue() == eWordSize.Normal.getValue()) {//这里normal表示加粗
                         start.append("<BOLD>");
                         end.append("</BOLD>");
                     }
@@ -1275,7 +1287,7 @@ public class FeiYunUtils {
                         start.append("<B>");
                         end.append("</B>");
                     }
-                    if (type.getWordSize().intValue() == eWordSize.Amplify.getValue()) {
+                    if (type.getIsBlod().intValue() == eWordSize.Normal.getValue()) {//这里normal表示加粗
                         start.append("<BOLD>");
                         end.append("</BOLD>");
                     }