diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index 5d926545a..8cf4b7048 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -816,7 +816,6 @@ public class EmisWaybillController extends EmisBaseController // 忽略错误 } - return null; }catch (Exception ex){ ex.printStackTrace(); @@ -825,9 +824,6 @@ public class EmisWaybillController extends EmisBaseController } - - - @RequestMapping("/updatePrintStatus") public AjaxResult updatePrintStatus(String billCode) { diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index c20489d5c..cd4325ae2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -864,7 +864,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if("1".equals(emisWaybillSave.getBlGenSubbill()) ){ // 子单号拼接 StringBuilder sb = new StringBuilder(); - for(int i=1;i<=emisWaybillSave.getParcelQty().intValue() && i<15;i++){ + for(int i=1;i<=emisWaybillSave.getParcelQty().intValue();i++){ sb.append(emisWaybillSave.getBillCode()+ StringUtils.leftPad(String.valueOf(i),4,"0")+","); } emisWaybillSave.setBillCodeSub(sb.toString()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/PrintUtils.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/PrintUtils.java index c74d1d262..6cd2a897e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/PrintUtils.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/PrintUtils.java @@ -165,22 +165,22 @@ public class PrintUtils return arrayOfByte; } - public static void main1(String[] args) { -// String jObj = null; -// try { -//// T1232432432432&tplCode=TAN-GM-130&_t=123 -// for(int i=0;i<1;i++) { -// JSONArray jsonArray = PrintUtils.getImageByBillCode("T1232432432432", "TAN-GM-130","1"); -// System.out.println(jsonArray.toJSONString()); -// } -// } catch (Exception e) { -// e.printStackTrace(); -// } + public static void main(String[] args) { + String jObj = null; + try { +// T1232432432432&tplCode=TAN-GM-130&_t=123 + for(int i=0;i<1;i++) { + JSONArray jsonArray = PrintUtils.getImageByBillCode("T7080300003651", "TAN-GM-130","1"); + System.out.println(jsonArray.toJSONString()); + } + } catch (Exception e) { + e.printStackTrace(); + } } - public static void main(String[] args) { + public static void main1(String[] args) { //String target = "/Users/zhiyu/Desktop/test/aaa_bin.bmp"; String target = "/Users/alan/Downloads/T1232432432432.jpg"; File file = new File(target);