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-27 06:55:04 +08:00
parent b33f42f840
commit 793b101e04
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.file.FileUtils;
import com.xdadan.erp.common.utils.idgen.UUID; import com.xdadan.erp.common.utils.idgen.UUID;
import com.xdadan.erp.emis.domain.EmisBrand; 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.EmisTmsScanRecord;
import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.enumtype.ScanType;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
@ -361,15 +362,13 @@ public class EmisWaybillController extends BaseController
@JacksonFilter(include= { @JacksonFilter(include= {
"billCode","scanDate" "billCode","scanDate"
},value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE) },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/queryScanWaybillList") @RequestMapping("/queryScanWaybillList")
public TableDataInfo queryScanWaybillList(String scanStatType,String beginScanDate,String endScanDate,String billCode ) 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("scanStatType",scanStatType);
scanRecord.getParams().put("beginScanDate",beginScanDate); scanRecord.getParams().put("beginScanDate",beginScanDate);
scanRecord.getParams().put("endScanDate",endScanDate); scanRecord.getParams().put("endScanDate",endScanDate);
scanRecord.setBillCode(billCode);
// 1-发件清单 2-到件清单 3-派件清单 // 1-发件清单 2-到件清单 3-派件清单
// String scanStatType=(String)scanRecord.getParams().get("scanStatType"); // String scanStatType=(String)scanRecord.getParams().get("scanStatType");
if("1".equals(scanStatType)){ if("1".equals(scanStatType)){