diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java index 759019df..4d82f972 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java @@ -172,11 +172,11 @@ public enum ExcelErrorMessageEnum { /** * 项目数量小数点后超过8位 */ - ORDERINFO_XMSL_OVERLENGTHEIGHT("9636", "数量超出最大位数25位,小数点后8位,全电票小数点后15位"), + ORDERINFO_XMSL_OVERLENGTHEIGHT("9636", "数量超出最大位数25位,小数点后8位,全电票小数点后13位"), /** * 项目单价小数点后超过8位 */ - ORDERINFO_XMDJ_OVERLENGTHEIGHT("9637", "单价超出最大长度25位,小数点后8位,全电票小数点后15位"), + ORDERINFO_XMDJ_OVERLENGTHEIGHT("9637", "单价超出最大长度25位,小数点后8位,全电票小数点后13位"), /** * 备注超过200位 */ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java index 5729f8ee..39703904 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java @@ -315,6 +315,9 @@ public class ReceiveOrderController { excel.setGhfDh(excel.getXhfDh()); excel.setGhfQylx(OrderInfoEnum.GHF_QYLX_04.getValue()); } + if(StringUtils.equals(OrderInfoEnum.TSPZ_2.getValue(), excel.getTspz())){ + excel.setXmdw(ConfigureConstant.STRING_LINAG); + } /** * 处理税率开具理由,将内容转为code * 参考:{@link OrderInfoEnum#ORDER_SLKJLY_0}、{@link OrderInfoEnum#ORDER_SLKJLY_2}、{@link OrderInfoEnum#ORDER_SLKJLY_3}