From 4d725ea5fa78e213e4149a870993fa4eeb6537ea Mon Sep 17 00:00:00 2001 From: liufeilong Date: Thu, 13 Apr 2023 09:21:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E7=BA=A2=E7=A5=A8?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/constant/OrderInfoContentEnum.java | 12 ++++++------ .../ValidateInterfaceOrderServiceImpl.java | 18 +++++++++--------- .../consumer/utils/BeanTransitionUtils.java | 3 +++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java index 8ef09d42..2ed2af36 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java @@ -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时,清单发票项目名称不能为空！"), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java index 5c6d71d5..4943483f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java @@ -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); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index a53f3c87..242872a9 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -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 ititem = req.getITITEM(); for (int i = 0; i < ititem.size(); i++) { From 2b84bcd0ed69ff328450fb41093898c38731211f Mon Sep 17 00:00:00 2001 From: liufeilong Date: Thu, 13 Apr 2023 09:56:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E6=8A=98=E6=89=A3=E8=A1=8C=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CommonInterfaceServiceImpl.java | 1 + .../order/consumer/utils/BeanTransitionUtils.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index 7fa2ef99..b9a74058 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -613,6 +613,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { } item.setTswl(StrUtil.isBlank(commodityCodeEntity.getTswl())?"0":commodityCodeEntity.getTswl()); + item.setSpbm(commodityCodeEntity.getSpbm()); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 242872a9..71bdae1d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3522,11 +3522,18 @@ public class BeanTransitionUtils { } ddmxxxBO.setZXBM(detail.getMATNR()); ddmxxxBO.setXMMC(detail.getZCPMC()); - ddmxxxBO.setGGXH(detail.getCHARG()); - ddmxxxBO.setDW(detail.getZSLDW()); - ddmxxxBO.setSPSL(detail.getZZSL()); + if(ConfigureConstant.STRING_1.equals(ddmxxxBO.getFPHXZ())){ + ddmxxxBO.setGGXH(""); + ddmxxxBO.setDW(""); + ddmxxxBO.setSPSL(""); + ddmxxxBO.setDJ(""); + }else { + ddmxxxBO.setGGXH(detail.getCHARG()); + ddmxxxBO.setDW(detail.getZSLDW()); + ddmxxxBO.setSPSL(detail.getZZSL()); + ddmxxxBO.setDJ(detail.getZZDJ()); + } ddmxxxBO.setSL(new BigDecimal(detail.getZTAX()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP).toString()); - ddmxxxBO.setDJ(detail.getZZDJ()); ddmxxxBO.setJE(detail.getZHSJE()); ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1); ddmxxxBO.setSE(detail.getZZSE()); From 540d50261546bdef482573c063442bac0ef1f0a7 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Thu, 13 Apr 2023 15:09:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=B8=85=E5=8D=95=E6=A0=87=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/order/model/OrderProcessInfo.java | 2 +- .../modules/order/service/impl/OrderProcessServiceImpl.java | 2 +- .../main/resources/mybatis/mapper/OrderProcessInfoMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java index 5a441b55..db6391b0 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java @@ -228,7 +228,7 @@ public class OrderProcessInfo implements Serializable { /** * 清单标志 */ - private String qdBz; + private String qdbz; /** * 打印状态 */ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java index 463e86ee..ccc2ea6b 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java @@ -73,7 +73,7 @@ public class OrderProcessServiceImpl implements OrderProcessService { list.forEach(op -> { //如果是红票，将清单标志改为0，（红票没有清单） if (OrderInfoEnum.ORDER_BILLING_INVOICE_TYPE_1.getKey().equals(op.getKplx())) { - op.setQdBz("0"); + op.setQdbz("0"); } //如果打印状态描述为null，赋值为空字符串 if (Objects.isNull(op.getDyztms())) { diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index acffbb35..aa339e4f 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -53,7 +53,7 @@ - + From 7aed66b9f35713d8bf2d6085985548f45573ad68 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Thu, 13 Apr 2023 17:26:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A5=E5=85=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CommonInterfaceServiceImpl.java | 21 +------------------ .../consumer/utils/BeanTransitionUtils.java | 2 +- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index b9a74058..67c414fe 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -595,26 +595,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { // 如果找到记录，进行赋值匹配 // 判断是否推送了物料的名称、单位、规格型号信息 //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全 - String spmc = item.getXmmc(); - StringBuilder stringBuilder = new StringBuilder(); - if (StringUtils.isBlank(spmc)) { - spmc = stringBuilder.append("*").append(commodityCodeEntity.getSpjc()).append("*").append(commodityCodeEntity.getXmmc()).toString(); - } else if (StringUtil.checkStr(spmc, commodityCodeEntity.getSpjc())) { - spmc = stringBuilder.append("*").append(commodityCodeEntity.getSpjc()).append("*").append(spmc).toString(); - } - item.setXmmc(spmc); - - if (StringUtils.isEmpty(item.getXmdw())) { - item.setXmdw(commodityCodeEntity.getXmdw()); - } - - if (StringUtils.isEmpty(item.getGgxh())) { - item.setGgxh(commodityCodeEntity.getGgxh()); - } - - item.setTswl(StrUtil.isBlank(commodityCodeEntity.getTswl())?"0":commodityCodeEntity.getTswl()); - item.setSpbm(commodityCodeEntity.getSpbm()); - + completeCommodityMessageBySpid(item,commodityCodeEntity); } } else if (StringUtils.isBlank(item.getSpbm())) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 71bdae1d..bca62bb8 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3528,7 +3528,7 @@ public class BeanTransitionUtils { ddmxxxBO.setSPSL(""); ddmxxxBO.setDJ(""); }else { - ddmxxxBO.setGGXH(detail.getCHARG()); + ddmxxxBO.setGGXH(""); ddmxxxBO.setDW(detail.getZSLDW()); ddmxxxBO.setSPSL(detail.getZZSL()); ddmxxxBO.setDJ(detail.getZZDJ()); From a83f2b4ea573ff7e8494ceaf6c13b286cdafbdc3 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Thu, 13 Apr 2023 19:30:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20sims-base-file-operate=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-base-service/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-base-service/pom.xml b/order-management-base-service/pom.xml index 89937092..1eee81f2 100644 --- a/order-management-base-service/pom.xml +++ b/order-management-base-service/pom.xml @@ -344,7 +344,7 @@ com.dxhy.base sims-base-file-operate - 6.1.4.0-BASE + 6.1.4.1-BASE compile diff --git a/pom.xml b/pom.xml index 61a61c1c..7dc847dc 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.0.8 - 6.1.4.0-BASE + 6.1.4.1-BASE 1.0.0-sdenergy