aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-24 08:54:13 +08:00
parent a7585cb038
commit 7d592845d3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

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