luminghui
/
sdny-order
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 去掉红票相关校验

Browse Source
release
liufeilong 2 years ago
parent 983b32ccf9
commit 4d725ea5fa
3 changed files with 18 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java
  2. 18
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java
  3. 3
      order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

12
order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java
Unescape View File

@ -694,10 +694,10 @@ public enum OrderInfoContentEnum {
CHECK_ISS7PRI_107048("107048", "订单主体信息中复核人", 0, 16, 16, true, false),
CHECK_ISS7PRI_107049("107049", "订单主体信息中红票的原发票代码", 10, 12, true, true),
CHECK_ISS7PRI_107049("107049", "订单主体信息中红票的原发票代码", 10, 12, true, false),
CHECK_ISS7PRI_107050("107050", "订单主体信息中红票的原发票号码", 8, 8, true, true),
QD_CHECK_ISS7PRI_107050("107050", "订单主体信息中红票的原发票号码", 0, 20, true, true),
CHECK_ISS7PRI_107050("107050", "订单主体信息中红票的原发票号码", 8, 8, true, false),
QD_CHECK_ISS7PRI_107050("107050", "订单主体信息中红票的原发票号码", 0, 20, true, false),
CHECK_ISS7PRI_107050A("107051", "原蓝字发票在本系统中不存在，请按特殊冲红业务处理"),
@ -2109,9 +2109,9 @@ public enum OrderInfoContentEnum {
INVOICE_HEAD_INFO_KPR_ERROR_144024A("144024", "开票人", 1, 300, true, true),
INVOICE_HEAD_INFO_KPR_ERROR_144024B("144024", "开票人证件号码", 1, 30, true, false),
INVOICE_HEAD_INFO_KPR_ERROR_144024C("144024", "开票人证件类型", 1, 4, true, false),
INVOICE_HEAD_INFO_YFPDM_ERROR_144025("144025", "红票的原发票代码", 10, 12, true, true),
INVOICE_HEAD_INFO_YFPHM_ERROR_144026("144026", "红票的原发票号码", 8, 8, true, true),
INVOICE_HEAD_INFO_YFPHM_ERROR_144026A("144026", "红票的原发票号码", 0, 20, true, true),
INVOICE_HEAD_INFO_YFPDM_ERROR_144025("144025", "红票的原发票代码", 10, 12, true, false),
INVOICE_HEAD_INFO_YFPHM_ERROR_144026("144026", "红票的原发票号码", 8, 8, true, false),
INVOICE_HEAD_INFO_YFPHM_ERROR_144026A("144026", "红票的原发票号码", 0, 20, true, false),
INVOICE_HEAD_INFO_QDBZ_ERROR_144027("144027", "清单标志", 1, 1, true, true),
INVOICE_HEAD_INFO_QDBZ_ERROR_144028("144028", "清单标志只能为0:普通发票,1:普通发票（清单）,2:收购发票,3:收购发票（清单）,4:成品油发票,5:机动车专票,6:机动车专票(清单)！"),
INVOICE_HEAD_INFO_QDXMMC_ERROR_144029("144029", "清单标志为1或3时,清单发票项目名称不能为空！"),

18
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java
Unescape View File

@ -584,12 +584,12 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
String hzxxbbh = CommonUtils.getHzxxbbh(orderInfo.getBz(), terminalCode);
//发票类别为专票时并且红字信息表编号未传递,备注不能为空.
if (StringUtils.isEmpty(orderInfo.getBz()) && StringUtils.isEmpty(orderInfo.getHzxxbbh())) {
/*if (StringUtils.isEmpty(orderInfo.getBz()) && StringUtils.isEmpty(orderInfo.getHzxxbbh())) {
resultMapList.add(generateErrorMap(OrderInfoContentEnum.CHECK_ISS7PRI_107127));
}
}*/
if (StringUtils.isEmpty(hzxxbbh) && StringUtils.isEmpty(orderInfo.getHzxxbbh())) {
resultMapList.add(generateErrorMap(OrderInfoContentEnum.CHECK_ISS7PRI_107129));
//resultMapList.add(generateErrorMap(OrderInfoContentEnum.CHECK_ISS7PRI_107129));
} else {
//校验备注中读取的编号与头信息中编号是否一致
@ -4454,9 +4454,9 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
if(!CommonUtils.judgeIsQdfp("", ddfpxx.getFPLXDM())){
if (StringUtils.isBlank(ddfpxx.getBZ())) {
//增值税发票红字发票（专票）
if (OrderInfoEnum.ORDER_INVOICE_TYPE_004.getKey().equals(ddfpxx.getFPLXDM())) {
/*if (OrderInfoEnum.ORDER_INVOICE_TYPE_004.getKey().equals(ddfpxx.getFPLXDM())) {
return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_BZ_ERROR_144040);
}
}*/
} else {
checkResultMap = CheckParamUtil.checkParam(OrderInfoContentEnum.INVOICE_MX_INFO_BZ_ERROR_144135, ddfpxx.getBZ());
if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
@ -4467,7 +4467,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
String xxbbh = CommonUtils.getHzxxbbh(ddfpxx.getBZ(), terminalCode);
if (StringUtils.isEmpty(xxbbh)) {
return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_BZ_ERROR_144041);
//return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_BZ_ERROR_144041);
} else {
if (!ValidateUtil.isNumeric(xxbbh)) {
return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_BZ_ERROR_144041);
@ -5084,9 +5084,9 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
if (OrderInfoEnum.ORDER_BILLING_INVOICE_TYPE_1.getKey().equals(ddfpxx.getKPLX())) {
if (StringUtils.isBlank(ddfpxx.getBZ())) {
//增值税发票红字发票（专票）
if (OrderInfoEnum.ORDER_INVOICE_TYPE_004.getKey().equals(ddfpxx.getFPLXDM())) {
/*if (OrderInfoEnum.ORDER_INVOICE_TYPE_004.getKey().equals(ddfpxx.getFPLXDM())) {
return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_BZ_ERROR_144040);
}
}*/
} else {
checkResultMap = CheckParamUtil.checkParam(OrderInfoContentEnum.INVOICE_MX_INFO_BZ_ERROR_144135, ddfpxx.getBZ());
if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
@ -5097,7 +5097,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
String xxbbh = CommonUtils.getHzxxbbh(ddfpxx.getBZ(), terminalCode);
if (StringUtils.isEmpty(xxbbh)) {
return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_BZ_ERROR_144041);
//return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_BZ_ERROR_144041);
} else {
if (!ValidateUtil.isNumeric(xxbbh)) {
return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_BZ_ERROR_144041);

3
order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
Unescape View File

@ -3502,6 +3502,9 @@ public class BeanTransitionUtils {
ddtxxBO.setKB(req.getITITEM().get(0).getKTYPE());
//TODO lfl 清单标志怎么处理？
ddtxxBO.setQDBZ("0");
if(ConfigureConstant.STRING_1.equals(req.getZSFHZ())){
ddtxxBO.setTSCHBZ(ConfigureConstant.STRING_0);
}
//明细信息
List<FpkjMxSap> ititem = req.getITITEM();
for (int i = 0; i < ititem.size(); i++) {

Write Preview
Loading…
Cancel
Save