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-29 04:32:44 +08:00
parent f2f6880d67
commit c8360a2459
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java
View File

@ -16,6 +16,9 @@ import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
import com.xdadan.erp.emis.domain.EmisCountry; 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.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; 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.domain.AjaxResult;
import com.xdadan.erp.common.core.page.TableDataInfo; import com.xdadan.erp.common.core.page.TableDataInfo;
import com.xdadan.erp.common.enums.BusinessType; 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.common.utils.poi.ExcelUtil;
import com.xdadan.erp.emis.domain.EmisTransLine; import com.xdadan.erp.emis.domain.EmisTransLine;
@ -51,6 +53,9 @@ public class EmisTransLineController extends BaseController
@Autowired @Autowired
private IEmisTransLineService emisTransLineService; private IEmisTransLineService emisTransLineService;
@Autowired
private EmisBaseService emisBaseService;
/** /**
* 查询线路列表 * 查询线路列表
*/ */
@ -72,6 +77,12 @@ public class EmisTransLineController extends BaseController
public TableDataInfo listSimple(EmisTransLine emisTransLine) public TableDataInfo listSimple(EmisTransLine emisTransLine)
{ {
emisTransLine.setStatus(1); emisTransLine.setStatus(1);
// 总部不限制
if(!getLoginUser().getUser().isTopSite()){
EmisSite site=emisBaseService.getSiteByCode(getLoginUser().getUser().getOwnerSiteCode());
emisTransLine.setLogoType(site.getLogoType());
emisTransLine.getParams().put("needFilterLogoTyoe","1");
}
startPage(); startPage();
List<EmisTransLine> list = emisTransLineService.selectEmisTransLineList(emisTransLine); List<EmisTransLine> list = emisTransLineService.selectEmisTransLineList(emisTransLine);

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

@ -627,7 +627,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
List<EmisQuotePrice> emisQuotePriceList=getValidQuotePriceList(emisWaybill.getTransLineType(),emisWaybill.getProductType(), List<EmisQuotePrice> emisQuotePriceList=getValidQuotePriceList(emisWaybill.getTransLineType(),emisWaybill.getProductType(),
emisWaybill.getSendSiteCode(),emisWaybill.getDispatchUnderlingSiteCode(), emisWaybill.getSendSiteCode(),emisWaybill.getDispatchUnderlingSiteCode(),
emisWaybill.getCalcFeeType()); emisWaybill.getCalcFeeType(),emisWaybill.getCustomerCode(),emisWaybill.getCustNo()
);
if(CollectionUtils.isEmpty(emisQuotePriceList)){ if(CollectionUtils.isEmpty(emisQuotePriceList)){