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-23 19:01:16 +08:00
parent 7594a2d0e8
commit 3b0fa0be59
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,8 @@ 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.EmisTmsScanRecord;
import com.xdadan.erp.emis.domain.enumtype.ScanType;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.vo.*; import com.xdadan.erp.emis.domain.vo.*;
import com.xdadan.erp.emis.service.*; import com.xdadan.erp.emis.service.*;
@ -82,6 +84,9 @@ public class EmisWaybillController extends BaseController
@Autowired @Autowired
private IEmisElectronicPagService emisElectronicPagService; private IEmisElectronicPagService emisElectronicPagService;
@Autowired
private IEmisTmsScanRecordService emisTmsScanRecordService;
/** /**
* 获取电子运单信息 * 获取电子运单信息
*/ */
@ -347,39 +352,36 @@ public class EmisWaybillController extends BaseController
/** /**
* 查询扫描统计数据 * 查询扫描统计数据
* @param emisWaybill * 1-发件清单 2-到件清单 3-派件清单
* @param scanRecord
* @return * @return
*/ */
@JacksonFilter(include= { @JacksonFilter(include= {
"id","orderSn","billCode","orderStatus","waybillStatus", "billCode","scanDate"
"orderType","sendDate","customerCode","customerName", },value= EmisTmsScanRecord.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
"receiveName",
"receiveCountry","receiveCountryName",
"receiveProvince","receiveProvinceName",
"receiveCity", "receiveCityName",
"sendName",
"sendCountry","sendCountryName",
"sendProvince","sendProvinceName",
"sendCity","sendCityName",
"transLineType","transLineName",
"productType","productName"
},value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/queryScanWaybillList") @RequestMapping("/queryScanWaybillList")
public TableDataInfo queryScanWaybillList(EmisWaybill emisWaybill) public TableDataInfo queryScanWaybillList(EmisTmsScanRecord scanRecord)
{ {
startPage(); startPage();
emisWaybill.getParams().put("queryScanWaybillListtatSiteCode",getLoginUser().getUser().getOwnerSiteCode()); if(!scanRecord.getParams().containsKey("scanStatType")){
emisWaybill.getParams().put("statEmpCode",getLoginUser().getUser().getEmpCode()); return getDataTable(null);
if(!getLoginUser().getUser().isTopSite()){
emisWaybill.getParams().put("innerQuery","1");
emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode());
emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
} }
// 1-发件清单 2-到件清单 3-派件清单
String scanStatType=(String)scanRecord.getParams().get("scanStatType");
if("1".equals(scanStatType)){
scanRecord.setScanType(ScanType.DEPARTURE.opCode);
}else if("2".equals(scanStatType)){
scanRecord.setScanType(ScanType.ARRIVAL.opCode);
}
else if("3".equals(scanStatType)){
scanRecord.setScanType(ScanType.SENT.opCode);
}else{
return getDataTable(null);
}
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill); scanRecord.setScanSiteCode(getLoginUser().getUser().getOwnerSiteCode());
List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(scanRecord);
return getDataTable(list); return getDataTable(list);
} }