ariesy 更新影响号

release
yefei 2 years ago
parent 17ef8188f5
commit 8dbfe9877e
  1. 20
      dxhy-core/src/main/resources/bootstrap-dev.yaml
  2. 17
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
  3. 20
      dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml

@ -4,22 +4,24 @@ spring:
nacos: nacos:
config: config:
# Nacos config 地址 # Nacos config 地址
server-addr: 10.1.2.202:8848 server-addr: 172.31.36.147:33000
# Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace) # Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace)
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
# Nacos config 分组 # Nacos config 分组
group: dxhy-core-group group: dxhy-core-group
# Nacos config 登录用户名 # Nacos config 登录用户名
username: dxhy-jxpt username: nacos
# Nacos config 登录密码 # Nacos config 登录密码
password: dxhy-jxpt password: Invoice.nacos.!1
# Nacos config 配置文件前缀 # Nacos config 配置文件前缀
prefix: dxhy-core prefix: dxhy-erp
# Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
file-extension: yaml file-extension: yaml
# Nacos discovery 配置 # Nacos discovery 配置
discovery: discovery:
server-addr: 10.1.2.202:8848 server-addr: 172.31.36.147:33000
username: dxhy-jxpt # Nacos config 登录用户名
password: dxhy-jxpt username: nacos
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 登录密码
password: Invoice.nacos.!1
namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6

@ -16,10 +16,7 @@ import com.dxhy.common.utils.Base64Encoding;
import com.dxhy.common.utils.R; import com.dxhy.common.utils.R;
import com.dxhy.common.vo.Tax; import com.dxhy.common.vo.Tax;
import com.dxhy.common.vo.TaxOrgCode; import com.dxhy.common.vo.TaxOrgCode;
import com.dxhy.erp.dao.CustomsRecordDao; import com.dxhy.erp.dao.*;
import com.dxhy.erp.dao.GsClientMapper;
import com.dxhy.erp.dao.RecordInvoiceDao;
import com.dxhy.erp.dao.TdxSaleRecordInvoiceDao;
import com.dxhy.erp.entity.*; import com.dxhy.erp.entity.*;
import com.dxhy.erp.entity.sdny.*; import com.dxhy.erp.entity.sdny.*;
import com.dxhy.erp.service.*; import com.dxhy.erp.service.*;
@ -84,6 +81,9 @@ public class SDNYMainProcessController extends AbstractController {
@Resource @Resource
private CustomsRecordDao customsRecordDao; private CustomsRecordDao customsRecordDao;
@Resource
private BaseTDxRecordInvoiceDao baseTDxRecordInvoiceDao;
@Resource @Resource
private RecordInvoiceDao recordInvoiceDao; private RecordInvoiceDao recordInvoiceDao;
@ -480,6 +480,15 @@ public class SDNYMainProcessController extends AbstractController {
return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY))); return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY)));
} }
} else { } else {
DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE);
//删除对应的影像号
QueryWrapper<BaseTDxRecordInvoice> recordWrapper = new QueryWrapper<>();
recordWrapper.eq("image_id", imageId);
BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice();
recordInvoice.setImageId("");
recordInvoice.setCompCode("");
baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper);
R data = new R(1000, "default success"); R data = new R(1000, "default success");
data.put("data", result); data.put("data", result);
return ResponseEntity.ok(JSONObject.toJSONString(data)); return ResponseEntity.ok(JSONObject.toJSONString(data));

@ -4,22 +4,24 @@ spring:
nacos: nacos:
config: config:
# Nacos config 地址 # Nacos config 地址
server-addr: 10.1.2.202:8848 server-addr: 172.31.36.147:33000
# Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace) # Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace)
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
# Nacos config 分组 # Nacos config 分组
group: dxhy-flow-group group: dxhy-flow-group
# Nacos config 登录用户名 # Nacos config 登录用户名
username: dxhy-jxpt username: nacos
# Nacos config 登录密码 # Nacos config 登录密码
password: dxhy-jxpt password: Invoice.nacos.!1
# Nacos config 配置文件前缀 # Nacos config 配置文件前缀
prefix: dxhy-flow prefix: dxhy-erp
# Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
file-extension: yaml file-extension: yaml
# Nacos discovery 配置 # Nacos discovery 配置
discovery: discovery:
server-addr: 10.1.2.202:8848 server-addr: 172.31.36.147:33000
username: dxhy-jxpt # Nacos config 登录用户名
password: dxhy-jxpt username: nacos
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 登录密码
password: Invoice.nacos.!1
namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
Loading…
Cancel
Save