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 b402cfc93..d2c52cd37 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 @@ -360,6 +360,8 @@ public class EmisWaybillController extends BaseController emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode()); emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName()); } + + List list = emisWaybillService.selectEmisWaybillList(emisWaybill); return getDataTable(list); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 0dc3f3bcd..554e856d4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -403,14 +403,7 @@ public class EmisWaybill extends BaseEntity private String salesmenName; private String payeeName; - - - - - - - - - + // 最近一条扫描记录 + private EmisTmsScanRecord lastScanRecord; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 8eb630ce7..24f371764 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -369,12 +369,12 @@ public class EmisBaseService { } /** - * 获取问题件 + * 获取问题件类型 * @param problemType * @return */ public EmisProblemType getEmisProblemTypeByType(String problemType){ - return emisProblemTypeMapper.selectEmisProblemTypeById(Long.valueOf(problemType)) + return emisProblemTypeMapper.selectEmisProblemTypeById(Long.valueOf(problemType)); } /**