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-06-18 17:15:42 +08:00
parent 5465153a65
commit c699016b99
4 changed files with 7 additions and 7 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/EmisWaybillController.java
View File

@ -334,7 +334,7 @@ public class EmisWaybillController extends EmisBaseController
* 查询运单列表列表 * 查询运单列表列表
*/ */
@PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')") @PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')")
@RequestMapping("/list") @GetMapping("/list")
public TableDataInfo list(EmisWaybill emisWaybill) public TableDataInfo list(EmisWaybill emisWaybill)
{ {
// 非总部只能查看自己的或者与自己相关的订单 // 非总部只能查看自己的或者与自己相关的订单
@ -367,7 +367,7 @@ public class EmisWaybillController extends EmisBaseController
* 查询签收运单列表列表 * 查询签收运单列表列表
*/ */
@PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')") @PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')")
@RequestMapping("/querySignlist") @GetMapping("/querySignlist")
public TableDataInfo querySignlist(EmisWaybill emisWaybill) public TableDataInfo querySignlist(EmisWaybill emisWaybill)
{ {
// 非总部只能查看自己的或者与自己相关的订单 // 非总部只能查看自己的或者与自己相关的订单

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

@ -1758,8 +1758,6 @@ public class EmisBaseService {
queryEmisQuotePrice.setSendAreaSiteCode(sendSiteCode); queryEmisQuotePrice.setSendAreaSiteCode(sendSiteCode);
queryEmisQuotePrice.setDispAreaSiteCode(destSiteCode); queryEmisQuotePrice.setDispAreaSiteCode(destSiteCode);
Map existsMap = new HashMap(); Map existsMap = new HashMap();
List<EmisQuotePrice> listQuoteValid = new ArrayList<>(); List<EmisQuotePrice> listQuoteValid = new ArrayList<>();

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

@ -1027,7 +1027,6 @@ 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.getCustomerCode(),emisWaybill.getCustNo() emisWaybill.getCalcFeeType(),emisWaybill.getCustomerCode(),emisWaybill.getCustNo()
); );
@ -1168,6 +1167,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybill.setFeeitemList(feeList); emisWaybill.setFeeitemList(feeList);
emisWaybill.setFreight(BigDecimal.valueOf(totalFee)); emisWaybill.setFreight(BigDecimal.valueOf(totalFee));
if(emisWaybill.getFreight().compareTo(BigDecimal.ZERO)==0){
throw new EmisBizError(EmisBizErrorType.CALC_QUOTE_ERROR, "报价未配置");
}
} }
/** /**

3
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -407,7 +407,7 @@
<if test="receiveCompany != null and receiveCompany != ''"> and receive_company like concat('%', #{receiveCompany}, '%')</if> <if test="receiveCompany != null and receiveCompany != ''"> and receive_company like concat('%', #{receiveCompany}, '%')</if>
<if test="receiveMobile != null and receiveMobile != ''"> and receive_mobile like concat('%', #{receiveMobile}, '%')</if> <if test="receiveMobile != null and receiveMobile != ''"> and receive_mobile like concat('%', #{receiveMobile}, '%')</if>
<if test="receiveTel != null and receiveTel != ''"> and receive_tel like concat('%', #{receiveTel}, '%')</if> <if test="receiveTel != null and receiveTel != ''"> and receive_tel like concat('%', #{receiveTel}, '%')</if>
<if test="receiveCountry != null and receiveCountry != ''"> and receive_country=#{receiveCountry}</if> <if test="receiveCountry != null and receiveCountry != ''"> and receive_country=#{receiveCountry}</if>
<if test="receiveProvince != null and receiveProvince != ''"> and receive_province=#{receiveProvince}</if> <if test="receiveProvince != null and receiveProvince != ''"> and receive_province=#{receiveProvince}</if>
<if test="receiveCity != null and receiveCity != ''"> and receive_city=#{receiveCity}</if> <if test="receiveCity != null and receiveCity != ''"> and receive_city=#{receiveCity}</if>
<if test="receiveCounty != null and receiveCounty != ''"> and receive_county=#{receiveCounty}</if> <if test="receiveCounty != null and receiveCounty != ''"> and receive_county=#{receiveCounty}</if>
@ -593,7 +593,6 @@
and a.trans_line_type in( and a.trans_line_type in(
select line_code from emis_trans_line etl where etl.trans_type=1 select line_code from emis_trans_line etl where etl.trans_type=1
) )
and a.bl_is_question = '0'
</if> </if>