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-04-29 10:53:01 +08:00
parent f054be3367
commit b359e6cd50
4 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java
View File

@ -57,7 +57,7 @@ public class EmisCustomerAddressController extends BaseController
}
// @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:list')")
@JacksonFilter(include= {"id","name","phone","country","province","city","county","countryName","provinceName","cityName","countyName","address","postCode","email","company","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@JacksonFilter(include= {"id","name","phone","country","province","city","county","countryName","provinceName","cityName","countyName","town","townName","address","postCode","email","company","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/listSimple")
public TableDataInfo listSimple(EmisCustomerAddress emisCustomerAddress)
{
@ -73,7 +73,7 @@ public class EmisCustomerAddressController extends BaseController
}
@JacksonFilter(include= {"id","name","phone","country","province","city","county","address","postCode","email","company","countryName","provinceName","cityName","countyName","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@JacksonFilter(include= {"id","name","phone","country","province","city","county","address","postCode","email","company","countryName","provinceName","cityName","countyName","town","townName","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/getAddressById")
public AjaxResult getAddressById(@RequestParam("id") Long id)
{

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

@ -18,10 +18,7 @@ package com.xdadan.erp.emis.service;
import com.xdadan.erp.common.utils.SecurityUtils;
import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.vo.WaybillOrder;
import com.xdadan.erp.emis.mapper.EmisNotCalcAgingMapper;
import com.xdadan.erp.emis.mapper.EmisTransLineMapper;
import com.xdadan.erp.emis.mapper.EmisTransProductMapper;
import com.xdadan.erp.emis.mapper.EmisWaybillMapper;
import com.xdadan.erp.emis.mapper.*;
import com.xdadan.erp.emis.service.IEmisWaybillAttachmentService;
import com.xdadan.erp.emis.service.IEmisWaybillCargoService;
import com.xdadan.erp.emis.service.IEmisWaybillFeeitemService;
@ -70,13 +67,29 @@ public class EmisBaseService {
@Autowired
private EmisNotCalcAgingMapper emisNotCalcAgingMapper;
@Autowired
private EmisQuotePriceMapper emisQuotePriceMapper;
@Autowired
private EmisQuoteExpressionMapper emisQuoteExpressionMapper;
/**
* 获取线路
* @param code
* @return
*/
public EmisTransLine getTransLineByCode(String code) {
QueryWrapper<EmisTransLine> queryWrapper = new QueryWrapper();
queryWrapper.eq("line_code", code);
return emisTransLineMapper.selectOne(queryWrapper);
}
/**
* 获取产品
* @param code
* @return
*/
public EmisTransProduct getTransProductByCode(String code) {
QueryWrapper<EmisTransProduct> queryWrapper = new QueryWrapper();
queryWrapper.eq("prod_code", code);
@ -85,12 +98,20 @@ public class EmisBaseService {
/**
* 计算预估到达时间
* @param emisWaybill
* 获取产品报价
* @param code
* @return
*/
public List<EmisQuotePrice> getQuotePriceList(String code) {
QueryWrapper<EmisTransProduct> queryWrapper = new QueryWrapper();
queryWrapper.eq("prod_code", code);
return emisTransProductMapper.selectOne(queryWrapper);
}
/**
*
* 计算预估到达时间
* @param startDate
* @param prodCode
* @param receiveCountry
@ -100,8 +121,6 @@ public class EmisBaseService {
public Date getEstimateDate(Date startDate,String prodCode,String receiveCountry,String sendCountry) {
Date estDate = null;
// EmisWaybill emisWaybill
// Date startDate = emisWaybill.getSendDate();
// 获取产品最大时效
EmisTransProduct emisTransProduct = getTransProductByCode(prodCode);
@ -117,12 +136,13 @@ public class EmisBaseService {
int totalDays=emisTransProduct.getMaxAging()+weekDays+notCaclDays;
log.info("计算预估到达时间:[maxAging="+emisTransProduct.getMaxAging()+",weekDays="+weekDays+",notCaclDays="+notCaclDays);
// 预估达到时间
estDate = DateUtils.addDays(startDate, totalDays);
return estDate;
return DateUtils.addDays(startDate, totalDays);
}
public static int computeWeekDays(Date t1,Date t2,boolean isSingleDayoff){
Calendar cal1 = Calendar.getInstance();
Calendar cal2 = Calendar.getInstance();

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
View File

@ -108,4 +108,8 @@ public interface IEmisWaybillService
public int calcWaybillFee(EmisWaybill emisWaybill) throws Exception;
// 计算结算重量
public int calcSettledWeight(EmisWaybill emisWaybill) throws Exception;
}

22
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -357,19 +357,21 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 获取结算重量
// emisWaybill.getSettlementWeight().floatValue();
111
return 1;
}
// @Override
// public int calcSettledWeight(EmisWaybill emisWaybill) throws Exception {
//
// // 获取资费列表
// // 获取结算重量
//// emisWaybill.getSettlementWeight().floatValue();
//
//
// return 1;
// }
@Override
public int calcSettledWeight(EmisWaybill emisWaybill) throws Exception {
// 获取资费列表
// 获取结算重量
// emisWaybill.getSettlementWeight().floatValue();
return 1;
}