Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -15,6 +15,7 @@ import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.AddrUtil;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.ResponseJson;
+import com.iamberry.wechat.tools.UUIDGenerator;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -252,8 +253,9 @@ public class AwaitSendController {
                 colorIsWeight += temp.getColorIsWeight();
             }
         }
+        String uuid = UUIDGenerator.getUUID();
         Map<String, Object> product1 = new HashMap<String, Object>();
-        product1.put("GoodsName", goodName);
+        product1.put("GoodsName", uuid);
         // 计算产品重量
         product1.put("GoodsWeight", colorIsWeight/1000);
         Commodity.add(product1);
@@ -268,6 +270,8 @@ public class AwaitSendController {
             JSONObject jsonObject = JSONObject.parseObject(json);
             boolean flag = jsonObject.getBoolean("Success");
             if (flag) {
+                // 替换产品名称
+                json = json.replace(uuid, goodName);
                 // 获取电子面单成功
                 String code = jsonObject.getJSONObject("Order").getString("LogisticCode");
                 // 订单发货

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

@@ -202,7 +202,7 @@
                     var html = res.PrintTemplate;
                     LODOP.PRINT_INIT('打印订单');
                     LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
-                    LODOP.ADD_PRINT_HTM("2mm","2mm","100%","100%", html);
+                    LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", html);
                     var flag = LODOP.PRINT();
                     if (flag) {
                         layer.msg("打印成功",{icon: 6,time:3000});

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/print_order.ftl

@@ -160,7 +160,7 @@
                         var html = res.PrintTemplate;
                         LODOP.PRINT_INIT('打印订单');
                         LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
-                        LODOP.ADD_PRINT_HTM("2mm","2mm","100%","100%", html);
+                        LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", html);
                         var flag = LODOP.PRINT();
                         $(order.find("td")[0]).html("<span style='color: blue'>打印完成</span>");
                         if (flag) {