diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java index 77c33b713..79ef9a9c6 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java @@ -16,6 +16,9 @@ import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.emis.domain.EmisCountry; +import com.xdadan.erp.emis.domain.EmisSite; +import com.xdadan.erp.emis.service.EmisBaseService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -32,7 +35,6 @@ import com.xdadan.erp.common.core.controller.BaseController; import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.common.core.page.TableDataInfo; import com.xdadan.erp.common.enums.BusinessType; -import com.xdadan.erp.common.utils.StringUtils; import com.xdadan.erp.common.utils.poi.ExcelUtil; import com.xdadan.erp.emis.domain.EmisTransLine; @@ -51,6 +53,9 @@ public class EmisTransLineController extends BaseController @Autowired private IEmisTransLineService emisTransLineService; + @Autowired + private EmisBaseService emisBaseService; + /** * 查询线路列表 */ @@ -72,6 +77,12 @@ public class EmisTransLineController extends BaseController public TableDataInfo listSimple(EmisTransLine emisTransLine) { emisTransLine.setStatus(1); + // 总部不限制 + if(!getLoginUser().getUser().isTopSite()){ + EmisSite site=emisBaseService.getSiteByCode(getLoginUser().getUser().getOwnerSiteCode()); + emisTransLine.setLogoType(site.getLogoType()); + emisTransLine.getParams().put("needFilterLogoTyoe","1"); + } startPage(); List list = emisTransLineService.selectEmisTransLineList(emisTransLine); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index a36166b58..a909cb0c4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -627,7 +627,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb List emisQuotePriceList=getValidQuotePriceList(emisWaybill.getTransLineType(),emisWaybill.getProductType(), emisWaybill.getSendSiteCode(),emisWaybill.getDispatchUnderlingSiteCode(), - emisWaybill.getCalcFeeType()); + emisWaybill.getCalcFeeType(),emisWaybill.getCustomerCode(),emisWaybill.getCustNo() + + ); if(CollectionUtils.isEmpty(emisQuotePriceList)){