记得上下班打卡 | git大法好,push需谨慎

Commit 272c0920 authored by jiangxiulong's avatar jiangxiulong

打印

parent 445a7d6f
...@@ -18,6 +18,7 @@ public class PerformanceExpressSearchAdminParam { ...@@ -18,6 +18,7 @@ public class PerformanceExpressSearchAdminParam {
// 订单搜索 // 订单搜索
private String orderCode; private String orderCode;
private String orderTicketsId; private String orderTicketsId;
private String orderExpressId;
private String orderStatus; private String orderStatus;
private String userMobile; private String userMobile;
......
...@@ -234,12 +234,14 @@ public class PerformancesExpressController extends BaseController { ...@@ -234,12 +234,14 @@ public class PerformancesExpressController extends BaseController {
@RequiresPermissions("kylin:performancesExpress:print") @RequiresPermissions("kylin:performancesExpress:print")
@PostMapping("/print") @PostMapping("/print")
@ResponseBody @ResponseBody
// public AjaxResult print(@RequestParam("ids") String performanceId) { public AjaxResult print(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
public AjaxResult print() { ResponseDto res = performancesExpressServiceImpl.print(performanceExpressSearchAdminParam);
try { try {
// performancesExpressServiceImpl.batchCancelOrder(performanceId); if (res.isSuccess()) {
performancesExpressServiceImpl.print();
return success(); return success();
} else {
return error(res.getMessage());
}
} catch (Exception e) { } catch (Exception e) {
return error(e.getMessage()); return error(e.getMessage());
} }
......
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
var getFreightFlag = [[${@permission.hasPermi('kylin:performancesExpress:getFreight')}]]; var getFreightFlag = [[${@permission.hasPermi('kylin:performancesExpress:getFreight')}]];
var getListFreightFlag = [[${@permission.hasPermi('kylin:performancesExpress:getListFreight')}]]; var getListFreightFlag = [[${@permission.hasPermi('kylin:performancesExpress:getListFreight')}]];
var listOrderRouteFlag = [[${@permission.hasPermi('kylin:performancesExpress:listOrderRoute')}]]; var listOrderRouteFlag = [[${@permission.hasPermi('kylin:performancesExpress:listOrderRoute')}]];
var printFlag = [[${@permission.hasPermi('kylin:performancesExpress:print')}]];
var prefix = ctx + "kylin/performancesExpress"; var prefix = ctx + "kylin/performancesExpress";
...@@ -89,6 +90,7 @@ ...@@ -89,6 +90,7 @@
getListFreightUrl: prefix + "/getListFreight", getListFreightUrl: prefix + "/getListFreight",
getResultUrl: prefix + "/getResult", getResultUrl: prefix + "/getResult",
listOrderRouteUrl: prefix + "/listOrderRoute", listOrderRouteUrl: prefix + "/listOrderRoute",
printUrl: prefix + "/print",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
...@@ -188,6 +190,7 @@ ...@@ -188,6 +190,7 @@
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + placeOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定下单吗?\', table.options.placeOrderUrl)"></i>下单</a> '); actions.push('<a class="btn btn-success btn-xs ' + placeOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定下单吗?\', table.options.placeOrderUrl)"></i>下单</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + cancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定取消快递单吗?\', table.options.cancelOrderUrl)"></i>取消</a> '); actions.push('<a class="btn btn-danger btn-xs ' + cancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定取消快递单吗?\', table.options.cancelOrderUrl)"></i>取消</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + printFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定批量打印吗?\', table.options.printUrl)"></i>打印</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗?\', table.options.getResultUrl)"></i>主动获取下单信息</a> '); // actions.push('<a class="btn btn-success btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗?\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取估算运费吗?\', table.options.getFreightUrl)"></i>运费估算</a> '); // actions.push('<a class="btn btn-success btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取估算运费吗?\', table.options.getFreightUrl)"></i>运费估算</a> ');
// actions.push('<a class="btn btn-success btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取运费信息吗?\', table.options.getListFreightUrl)"></i>主动获取运费</a> '); // actions.push('<a class="btn btn-success btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取运费信息吗?\', table.options.getListFreightUrl)"></i>主动获取运费</a> ');
......
...@@ -8,6 +8,8 @@ import com.google.zxing.common.BitMatrix; ...@@ -8,6 +8,8 @@ import com.google.zxing.common.BitMatrix;
import com.google.zxing.oned.Code128Writer; import com.google.zxing.oned.Code128Writer;
import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.liquidnet.service.kylin.entity.KylinOrderExpress;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import gui.ava.html.Html2Image; import gui.ava.html.Html2Image;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -185,11 +187,10 @@ public class CodeUtil { ...@@ -185,11 +187,10 @@ public class CodeUtil {
return returnVal; return returnVal;
} }
// public static void html2img(String htmlstr) public static String html2img(KylinOrderExpress kylinOrderExpress,String jContact, String jAddress, String jTel, KylinOrderTickets orderInfo)
public static String html2img()
{ {
String barCode = getBarCode(kylinOrderExpress.getMailno(), 90, 13);
String qrCode = getQRCode("2453657424", 25, 25); String qrCode = getQRCode("2453657424", 25, 25);
String barCode = getBarCode("2453657424", 90, 13);
String html = tmpHtml(); String html = tmpHtml();
...@@ -200,7 +201,25 @@ public class CodeUtil { ...@@ -200,7 +201,25 @@ public class CodeUtil {
String replace2 = replace1.replace("images/iconJi.png", pathName.concat("images/iconJi.png")) String replace2 = replace1.replace("images/iconJi.png", pathName.concat("images/iconJi.png"))
.replace("images/iconShou.png", pathName.concat("images/iconShou.png")); .replace("images/iconShou.png", pathName.concat("images/iconShou.png"));
Html2Image html2Image = Html2Image.fromHtml(replace2); String replace3 = replace2.replace("SF1010874393776", kylinOrderExpress.getMailno())
.replace("755W-BA-0123456789", kylinOrderExpress.getDestRouteLabel())
.replace("收货姓名", orderInfo.getExpressContacts())
.replace("18510988888", orderInfo.getExpressPhone())
.replace("收货地址北京市朝阳区摩登天空测试地址", orderInfo.getExpressAddress())
.replace("22元", kylinOrderExpress.getFreightPrice().toString().concat("元"))
.replace("KC24", kylinOrderExpress.getProName())
.replace("A22", kylinOrderExpress.getCargoTypeCode())
.replace("1A", kylinOrderExpress.getExpressTypeCode())
.replace("寄件人姓名", jContact)
.replace("18510989999", jTel)
.replace("寄件地址北京市朝阳区摩登天空测试地址", jAddress)
;
Html2Image html2Image = Html2Image.fromHtml(replace3);
String imgPath = pathName.concat("qrcode/img.png"); String imgPath = pathName.concat("qrcode/img.png");
...@@ -210,9 +229,9 @@ public class CodeUtil { ...@@ -210,9 +229,9 @@ public class CodeUtil {
} }
public static void main(String[] args) { public static void main(String[] args) {
String imgPath = html2img(); // String imgPath = html2img();
// 打印图片 // 打印图片
drawImage(imgPath, 1); // drawImage(imgPath, 1);
} }
public static String tmpHtml() public static String tmpHtml()
...@@ -328,7 +347,7 @@ public class CodeUtil { ...@@ -328,7 +347,7 @@ public class CodeUtil {
" >\n" + " >\n" +
" <div>\n" + " <div>\n" +
" <span>收货姓名</span>\n" + " <span>收货姓名</span>\n" +
" <span>18510980989</span>\n" + " <span>18510988888</span>\n" +
" </div>\n" + " </div>\n" +
" <div>\n" + " <div>\n" +
" <span>收货地址北京市朝阳区摩登天空测试地址</span>\n" + " <span>收货地址北京市朝阳区摩登天空测试地址</span>\n" +
...@@ -405,7 +424,7 @@ public class CodeUtil { ...@@ -405,7 +424,7 @@ public class CodeUtil {
" >\n" + " >\n" +
" <div>\n" + " <div>\n" +
" <span>寄件人姓名</span>\n" + " <span>寄件人姓名</span>\n" +
" <span>18510980989</span>\n" + " <span>18510989999</span>\n" +
" </div>\n" + " </div>\n" +
" <div>\n" + " <div>\n" +
" <span>寄件地址北京市朝阳区摩登天空测试地址</span>\n" + " <span>寄件地址北京市朝阳区摩登天空测试地址</span>\n" +
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
> >
<div> <div>
<span>收货姓名</span> <span>收货姓名</span>
<span>18510980989</span> <span>18510988888</span>
</div> </div>
<div> <div>
<span>收货地址北京市朝阳区摩登天空测试地址</span> <span>收货地址北京市朝阳区摩登天空测试地址</span>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
> >
<div> <div>
<span>寄件人姓名</span> <span>寄件人姓名</span>
<span>18510980989</span> <span>18510989999</span>
</div> </div>
<div> <div>
<span>寄件地址北京市朝阳区摩登天空测试地址</span> <span>寄件地址北京市朝阳区摩登天空测试地址</span>
......
...@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl; ...@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.utils.StringUtils; import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.CodeUtil; import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.CodeUtil;
...@@ -21,7 +22,6 @@ import lombok.extern.slf4j.Slf4j; ...@@ -21,7 +22,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.jms.JmsProperties;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
...@@ -563,9 +563,22 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres ...@@ -563,9 +563,22 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
} while (count >= limitNum); } while (count >= limitNum);
} }
public void print() { public ResponseDto print(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
List<String> ids = performanceExpressSearchAdminParam.getIds();
for (String orderExpressId : ids) {
KylinOrderExpress kylinOrderExpress = kylinOrderExpressMapper.selectOne(
Wrappers.lambdaQuery(KylinOrderExpress.class)
.eq(KylinOrderExpress::getOrderExpressId, orderExpressId)
);
KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
Wrappers.lambdaQuery(KylinOrderTickets.class)
.eq(KylinOrderTickets::getOrderTicketsId, kylinOrderExpress.getOrderTicketsId())
);
// codeUtil.html2img(html); String imgPath = codeUtil.html2img(kylinOrderExpress, jContact, jProvince.concat(jCity).concat(jAddress), jTel, orderInfo);
codeUtil.drawImage(imgPath, 1);
}
return ResponseDto.success();
} }
} }
...@@ -22,6 +22,7 @@ public class PerformanceExpressPerformanceOrderListAdminDao { ...@@ -22,6 +22,7 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
Integer expressType; Integer expressType;
String orderExpressId;
String mailno; String mailno;
Integer expressStatus; Integer expressStatus;
Integer freightPrice; Integer freightPrice;
......
...@@ -282,6 +282,7 @@ ...@@ -282,6 +282,7 @@
kots.status, kots.status,
kots.express_type, kots.express_type,
oe.order_express_id,
oe.mailno, oe.mailno,
oe.freight_price, oe.freight_price,
oe.express_status oe.express_status
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment