md

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<ids.length;i++){
+                try {
+                    long id=ids[i];
+                    EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
+                    emisSettleSubBill.setId(id);
+
+                    emisBaseService.setBillErrorBySite(emisSettleSubBill);
+
+                }catch (Exception ex){
+                    ex.printStackTrace();
+                    // 返回子定义异常
+                    if(ex instanceof EmisBizError){
+                        return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
+                    }
+
+                    return AjaxResult.error("异常，联系客服");
+                }
+            }
+        }
+        return AjaxResult.success("确认成功");
+    }
+
 }

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java

@@ -122,6 +122,8 @@ public interface EmisSettleSubBillMapper extends BaseMapper<EmisSettleSubBill>
     public int confirmNoBillBySite(EmisSettleSubBill emisSettleSubBill);
     public int setBillErrorBySite(EmisSettleSubBill emisSettleSubBill);
 
+    public int setNoNeedOpenBill(EmisSettleSubBill emisSettleSubBill);
+
 
     public int updatePayedStatus(EmisSettleSubBill emisSettleSubBill);
 

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<EmisSettleSubBill> selectSubBillListBySettleBillNo(String settleBillNo){
          return emisSettleSubBillMapper.selectSubBillListBySettleBillNo(settleBillNo);

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"));
+
+    }
+
 }

emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml

@@ -964,6 +964,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
 
+    <update id="setNoNeedOpenBill" parameterType="EmisSettleSubBill">
+        update emis_settle_sub_bill
+        set open_bill_status='3'
+        where id=#{id}
+    </update>
+
     <update id="updateOpenBillStatus" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill
         set open_bill_status=#{openBillStatus},invoiced_money=#{invoicedMoney}