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 7ac578c44..fdbecb2b1 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 @@ -790,7 +790,7 @@ public class EmisWaybillController extends EmisBaseController @Log(title = "APP获取面单信息", businessType = BusinessType.OTHER) @GetMapping("/realGetPrintList") - public AjaxResult realGetPrintList(String billCode, String billCodeRange,String tplCode, String lang, String printType) + public AjaxResult realGetPrintList(String billCode, String subBillCodeRange,String tplCode, String lang, String printType) { /* , HttpServletRequest request, HttpServletResponse response @@ -831,15 +831,18 @@ public class EmisWaybillController extends EmisBaseController EmisWaybill emisWaybill = emisBaseService.getWaybillByBillCode(billCodeItem); // 获取所有子单号 - if(StringUtils.isEmpty(billCodeRange)) { + if(StringUtils.isEmpty(subBillCodeRange)) { billSubCodeAllStr = emisWaybill.getBillCodeSub() ; }else{ - String [] subRange=billCodeRange.split(","); + String [] subRange=subBillCodeRange.split(","); int start=Integer.valueOf(subRange[0]); int end=emisWaybill.getParcelQty(); int len=subRange.length; if(len>1){ end=Integer.valueOf(subRange[1]); + if((end-start)>50){ + end=start+50; + } } while (start<=end && start<=emisWaybill.getParcelQty()){ @@ -848,7 +851,7 @@ public class EmisWaybillController extends EmisBaseController } } - // 循环子单 + // 循环子单,最多60个早点 log.error("===>billSubCodeAllStr==>",billSubCodeAllStr); if(!StringUtils.isEmpty(billSubCodeAllStr)) { String[] subCodArr=billSubCodeAllStr.split(",");