From 793b101e048e2ec04910e20c48d67835fd1306f9 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 27 May 2024 06:55:04 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/web/emis/EmisWaybillController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 085782001..643a070f2 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 @@ -29,6 +29,7 @@ import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.common.utils.file.FileUtils; import com.xdadan.erp.common.utils.idgen.UUID; import com.xdadan.erp.emis.domain.EmisBrand; +import com.xdadan.erp.emis.domain.EmisCountry; import com.xdadan.erp.emis.domain.EmisTmsScanRecord; import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.exception.EmisBizError; @@ -361,15 +362,13 @@ public class EmisWaybillController extends BaseController @JacksonFilter(include= { "billCode","scanDate" },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - @GetMapping("/queryScanWaybillList") - public TableDataInfo queryScanWaybillList(String scanStatType,String beginScanDate,String endScanDate,String billCode ) + @RequestMapping("/queryScanWaybillList") + public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord,String scanStatType, String beginScanDate, String endScanDate, String billCode ) { - EmisTmsScanRecord scanRecord=new EmisTmsScanRecord(); scanRecord.getParams().put("scanStatType",scanStatType); scanRecord.getParams().put("beginScanDate",beginScanDate); scanRecord.getParams().put("endScanDate",endScanDate); - scanRecord.setBillCode(billCode); // 1-发件清单 2-到件清单 3-派件清单 // String scanStatType=(String)scanRecord.getParams().get("scanStatType"); if("1".equals(scanStatType)){