Merge remote-tracking branch 'origin/release' into release

2 years ago · 5e4cb74a70
parent c04d13ca44 1523d0e71d
commit 5e4cb74a70
10 changed files with 73 additions and 61 deletions
--- a/dxhy-admin/src/main/resources/bootstrap-std.yaml
+++ b/dxhy-admin/src/main/resources/bootstrap-std.yaml
@ -4,24 +4,24 @@ spring:
    nacos:
      config:
        # Nacos config 地址
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.143:33000
        # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
-        namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
        # Nacos config 分组
        group: dxhy-admin-group
        # Nacos config 登录用户名
-        username: nacos
+        username: admin
        # Nacos config 登录密码
-        password: FaP!a0_NacOs
+        password: Invoice.nacos.!1
        # Nacos config 配置文件前缀
        prefix: dxhy-admin
        # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
        file-extension: yaml
      # Nacos discovery 配置
      discovery:
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.143:33000
        # Nacos config 登录用户名
-        username: nacos
+        username: admin
        # Nacos config 登录密码
-        password: FaP!a0_NacOs
-        namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68
+        password: Invoice.nacos.!1
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
--- a/dxhy-common/src/main/java/com/dxhy/common/util/InvoiceUtil.java
+++ b/dxhy-common/src/main/java/com/dxhy/common/util/InvoiceUtil.java
@ -203,6 +203,17 @@ public class InvoiceUtil {
        return valid;
    }

+    public static void main(String[] args) {
+        String fphm ="1033697";
+        boolean valid = false;
+        if (!StringHelper.isBlank(fphm)
+                && (FPHM8_PATTERN.matcher(fphm).matches() || FPHM10_PATTERN.matcher(fphm).matches())) {
+            valid = true;
+        }
+        System.out.println(valid);
+    }
+
+
    /**
     * 判断金额是否合法
     *
--- a/dxhy-core/src/main/java/com/dxhy/core/job/entity/TAcOrg.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/job/entity/TAcOrg.java
@ -88,7 +88,6 @@ public class TAcOrg implements Serializable {
    private String dataAceId;
    private String dataAceKey;
    private Date firstCollectDate;
-
    public Date getFirstCollectDate() {
        return firstCollectDate;
    }
--- a/dxhy-core/src/main/resources/mapper/ConfirmDao.xml
+++ b/dxhy-core/src/main/resources/mapper/ConfirmDao.xml
@ -19,7 +19,7 @@

    </select>
    <select id="getPullSapDataTaxNo" resultType="com.dxhy.core.job.entity.TAcOrg">
-        select g.taxno, g.db_name, g.company, g.taxname
+        select g.taxno, g.db_name, g.company, g.taxname,g.org_code orgcode
        from sys_dept g
        where g.org_type = '5'
        and g.upgrade_status = '1'
--- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
@ -414,12 +414,14 @@ public class SDNYMainProcessController extends AbstractController {
            object.setZFILED2("");
            object.setZFILED3("");
            object.setZFILED4("");
-            List<GsClient> gsClients = gsClientMapper.selectByGsdm(orgCode);
-            if(gsClients != null && gsClients.size() > 0) {
-                object.setZFILED5(gsClients.get(0).getClient());
-            }else{
-                object.setZFILED5(environment);
-            }
+//            List<GsClient> gsClients = gsClientMapper.selectByGsdm(orgCode);
+//            if(gsClients != null && gsClients.size() > 0) {
+//                object.setZFILED5(gsClients.get(0).getClient());
+//            }else{
+//                object.setZFILED5(environment);
+//            }
+
+            object.setZFILED5(environment);
            List<SAPInvoiceInfo> sapInvoiceInfos = new ArrayList<>();
            if (invoiceInfoList != null && invoiceInfoList.size() > 0) {
                for (SNInvoice invoice : invoiceInfoList) {
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
@ -12,10 +12,7 @@ import com.dxhy.common.enums.ReturnCodeEnum;
 import com.dxhy.common.service.impl.MpBaseServiceImpl;
 import com.dxhy.common.util.pojo.Authorize;
 import com.dxhy.common.util.pojo.GlobalInfo;
-import com.dxhy.erp.dao.AuthRecordDao;
-import com.dxhy.erp.dao.RecordInvoiceDao;
-import com.dxhy.erp.dao.SysDeptDao;
-import com.dxhy.erp.dao.TdxRecordInvoiceDao;
+import com.dxhy.erp.dao.*;
 import com.dxhy.erp.entity.*;
 import com.dxhy.erp.model.*;
 import com.dxhy.erp.model.auth.InterfaceCode;
@ -48,6 +45,8 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
    TdxRecordInvoiceDao tDxrecordInvoiceDao;
    @Resource
    TDxInvoiceReimburseService tDxInvoiceReimburseService;
+    @Resource
+    TdxSaleRecordInvoiceDao tdxSaleRecordInvoiceDao;

    @Override
    public String applyInvoiceAuth(GlobalInfo globalInfo, Map<String, String> map, HttpServletRequest request,
@ -342,22 +341,16 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
        for(ZDATA zdata1:zdata){
            String uuid = zdata1.getZFPDM()+zdata1.getZFPHM();
            zdata1.setZFPLX(convertFpzldm(zdata1.getZFPLX()));
-
-            if(fplxList.contains(zdata1.getZFPLX())){
-                TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
-                if(recordInvoiceByUuid==null){
-                    errorMsg.append("发票号码:"+zdata1.getZFPHM());
-                }
-            }else {
+            TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
                //查询票池
-                QueryWrapper<TDxInvoiceReimburse> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("uuid",uuid);
-                TDxInvoiceReimburse tDxInvoiceReimburse = tDxInvoiceReimburseService.getBaseMapper().selectOne(queryWrapper);
-                if(tDxInvoiceReimburse==null){
-                    errorMsg.append("发票号码"+zdata1.getZFPHM());
-                }
+            QueryWrapper<TDxInvoiceReimburse> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("uuid",uuid);
+            TDxInvoiceReimburse tDxInvoiceReimburse = tDxInvoiceReimburseService.getBaseMapper().selectOne(queryWrapper);
+            //没法区分来源是不是销项发票
+            TdxSaleRecordInvoice tdxSaleRecordInvoice = tdxSaleRecordInvoiceDao.selectByUuid(uuid);
+            if(recordInvoiceByUuid==null && tDxInvoiceReimburse==null && tdxSaleRecordInvoice==null){
+                errorMsg.append("发票号码:"+zdata1.getZFPHM());
            }
-
        }
        if(errorMsg.length()>1){
            es.setZMESSAGE(errorMsg.toString()+"不存在");
@ -402,8 +395,6 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                                tDxrecordInvoiceDao.updateRz(authState,"1","1",recordInvoiceByUuid.getUuid());
                            }
                        }
-                    }else {
-                        flag=true;
                    }
                }
            }else {
@ -420,7 +411,11 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
            }
-
+            UpdateWrapper updateWrapper = new UpdateWrapper();
+            updateWrapper.set("voucher_no",zdata1.getBELNR());
+            updateWrapper.set("document_number",zdata1.getZBZDH());
+            updateWrapper.eq("uuid",uuid);
+            tdxSaleRecordInvoiceDao.update(null,updateWrapper);
            if(!flag){
                promsg.append("票据号码:"+zdata1.getZFPHM()+"绑定成功!  ");
            }
--- a/dxhy-erp/src/main/resources/bootstrap-std.yaml
+++ b/dxhy-erp/src/main/resources/bootstrap-std.yaml
@ -4,24 +4,24 @@ spring:
    nacos:
      config:
        # Nacos config 地址
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.143:33000
        # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
-        namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
        # Nacos config 分组
        group: dxhy-erp-group
        # Nacos config 登录用户名
-        username: nacos
+        username: admin
        # Nacos config 登录密码
-        password: FaP!a0_NacOs
+        password: Invoice.nacos.!1
        # Nacos config 配置文件前缀
        prefix: dxhy-erp
        # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
        file-extension: yaml
      # Nacos discovery 配置
      discovery:
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.143:33000
        # Nacos config 登录用户名
-        username: nacos
+        username: admin
        # Nacos config 登录密码
-        password: FaP!a0_NacOs
-        namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68
+        password: Invoice.nacos.!1
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
--- a/dxhy-gateway/src/main/resources/bootstrap-std.yaml
+++ b/dxhy-gateway/src/main/resources/bootstrap-std.yaml
@ -4,24 +4,24 @@ spring:
    nacos:
      config:
        # Nacos config 地址
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.143:33000
        # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
-        namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
        # Nacos config 分组
        group: dxhy-gateway-group
        # Nacos config 登录用户名
-        username: nacos
+        username: admin
        # Nacos config 登录密码
-        password: FaP!a0_NacOs
+        password: Invoice.nacos.!1
        # Nacos config 配置文件前缀
        prefix: dxhy-gateway
        # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
        file-extension: yaml
      # Nacos discovery 配置
      discovery:
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.143:33000
        # Nacos config 登录用户名
-        username: nacos
+        username: admin
        # Nacos config 登录密码
-        password: FaP!a0_NacOs
-        namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68
+        password: Invoice.nacos.!1
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
--- a/dxhy-operation-flow/src/main/resources/bootstrap-std.yaml
+++ b/dxhy-operation-flow/src/main/resources/bootstrap-std.yaml
@ -4,24 +4,24 @@ spring:
    nacos:
      config:
        # Nacos config 地址
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.143:33000
        # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
-        namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
        # Nacos config 分组
        group: dxhy-flow-group
        # Nacos config 登录用户名
-        username: nacos
+        username: admin
        # Nacos config 登录密码
-        password: FaP!a0_NacOs
+        password: Invoice.nacos.!1
        # Nacos config 配置文件前缀
        prefix: dxhy-flow
        # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
        file-extension: yaml
      # Nacos discovery 配置
      discovery:
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.143:33000
        # Nacos config 登录用户名
-        username: nacos
+        username: admin
        # Nacos config 登录密码
-        password: FaP!a0_NacOs
-        namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68
+        password: Invoice.nacos.!1
+        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
--- a/dxhy-sign/src/main/java/com/dxhy/sign/util/InvoiceQueryUtil.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/util/InvoiceQueryUtil.java
@ -69,6 +69,8 @@ public class InvoiceQueryUtil {
    public String interfaceCode;
    @Value("${invioceCheck.enterprisePermissionFlag}")
    public boolean enterprisePermissionFlag;
+    @Value("${invioceCheck.checkTaxNo:}")
+    public String checkTaxNo;

    @Resource
    private SignCheckLogDao checkDao;
@ -91,6 +93,9 @@ public class InvoiceQueryUtil {
     */
    public JSONObject queryInvoice(String invoiceCode, String invoiceNo, String invoiceDate, String invoiceAmount,
        String checkCode, String taxNo,String invoiceType) {
+        if(checkTaxNo!=null && checkTaxNo!=""){
+            taxNo=checkTaxNo;
+        }

        JSONObject invoiceResult = new JSONObject();