diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java index b2664b9a2..7460b7b34 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -600,4 +600,35 @@ public class EmisSettleSubBillController extends EmisBaseController return AjaxResult.success("确认成功"); } + /** + * 站点设置账单异常 + */ +// @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:setBillErrorBySite')") + @Log(title = "设置为不开票", businessType = BusinessType.UPDATE) + @PostMapping("/setNoNeedOpenBill/{ids}") + public AjaxResult setNoNeedOpenBill(@PathVariable Long[] ids) + { + if(ids!=null && ids.length>0){ + for(int i=0;i public int confirmNoBillBySite(EmisSettleSubBill emisSettleSubBill); public int setBillErrorBySite(EmisSettleSubBill emisSettleSubBill); + public int setNoNeedOpenBill(EmisSettleSubBill emisSettleSubBill); + public int updatePayedStatus(EmisSettleSubBill emisSettleSubBill); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index b83a3bf4e..e994d0dcd 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1504,6 +1504,17 @@ public class EmisBaseService { return emisSettleSubBillMapper.setBillErrorBySite(emisSettleSubBill); } + /** + * 确认不开票 + * @param emisSettleSubBill + * @return + */ + public int setNoNeedOpenBill(EmisSettleSubBill emisSettleSubBill){ + return emisSettleSubBillMapper.setNoNeedOpenBill(emisSettleSubBill); + } + + + public List selectSubBillListBySettleBillNo(String settleBillNo){ return emisSettleSubBillMapper.selectSubBillListBySettleBillNo(settleBillNo); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisRegionServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisRegionServiceImpl.java index f44a3a657..f09adcba2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisRegionServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisRegionServiceImpl.java @@ -11,6 +11,8 @@ package com.xdadan.erp.emis.service.impl; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import com.alibaba.fastjson.JSONObject; import com.xdadan.erp.emis.domain.exception.EmisBizError; @@ -126,6 +128,15 @@ public class EmisRegionServiceImpl extends EmisBaseService implements IEmisRegio */ @Override public AddressParseResult parseAddress(String content) throws EmisBizError { + + if(StringUtils.isEmpty(content)){ + return null; + } + + if(!isContainChinese(content)){ + return null; + } + AddressParseResult addressParseResult= null; JSONObject rst = WaybillHelper.parseChinaAddress(content); if(rst!=null){ @@ -166,4 +177,20 @@ public class EmisRegionServiceImpl extends EmisBaseService implements IEmisRegio return addressParseResult; } + public static boolean isContainChinese(String str) { + + Pattern p = Pattern.compile("[\u4e00-\u9fa5]"); + Matcher m = p.matcher(str); + if (m.find()) { + return true; + } + return false; + } + + public static void main(String[] args) { + + System.out.println(isContainChinese("中国abd12321")); + + } + } diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml index cf13349d6..dda183d27 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -964,6 +964,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update emis_settle_sub_bill + set open_bill_status='3' + where id=#{id} + + update emis_settle_sub_bill set open_bill_status=#{openBillStatus},invoiced_money=#{invoicedMoney}