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-05-30 11:26:04 +08:00
parent 589d304945
commit 25089d2558
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -253,13 +253,12 @@ public class EmisCommonController extends BaseController
printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
printItem.put("result","success");
printItem.put("message","success");
return AjaxResult.success("获取成功",printItem);
}else{
printItem.put("result","fail");
printItem.put("message","未获取到数据");
return AjaxResult.error("单号不存在:"+billCode);
}
return AjaxResult.success("获取成功",printItem);
}catch (Exception ex){
ex.printStackTrace();
return AjaxResult.error("获取失败");

10
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -410,6 +410,11 @@ public class EmisBaseService {
return null;
}
String parcelQty="0";
if(waybill.getParcelQty()!=null){
parcelQty=waybill.getParcelQty().toString();
}
if(isSubBill) {
if (Integer.valueOf(subBillSuffix) > waybill.getParcelQty()) {
// 子单尾数超过总件数,查不到信息
@ -417,10 +422,7 @@ public class EmisBaseService {
}
}
String parcelQty="0";
if(waybill.getParcelQty()!=null){
parcelQty=waybill.getParcelQty().toString();
}
Map<String, Object> order = new HashMap<>();
order.put("orderSn", waybill.getOrderSn());