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

order-management-base-service/pom.xml

@@ -344,7 +344,7 @@
         <dependency>
             <groupId>com.dxhy.base</groupId>
             <artifactId>sims-base-file-operate</artifactId>
-            <version>6.1.4.0-BASE</version>
+            <version>6.1.4.1-BASE</version>
             <scope>compile</scope>
         </dependency>
 

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),
+    CHECK_ISS7PRI_107050("107050", "订单主体信息中红票的原发票号码", 8, 8, true, false),
-    QD_CHECK_ISS7PRI_107050("107050", "订单主体信息中红票的原发票号码", 0, 20, true, true),
+    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_YFPDM_ERROR_144025("144025", "红票的原发票代码", 10, 12, true, false),
-    INVOICE_HEAD_INFO_YFPHM_ERROR_144026("144026", "红票的原发票号码", 8, 8, true, true),
+    INVOICE_HEAD_INFO_YFPHM_ERROR_144026("144026", "红票的原发票号码", 8, 8, true, false),
-    INVOICE_HEAD_INFO_YFPHM_ERROR_144026A("144026", "红票的原发票号码", 0, 20, true, true),
+    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时,清单发票项目名称不能为空！"),

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;
     /**
      * 打印状态
      */

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())) {

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);

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java

@@ -595,25 +595,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
                         // 如果找到记录，进行赋值匹配
                         // 判断是否推送了物料的名称、单位、规格型号信息
                         //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全
-                        String spmc = item.getXmmc();
+                        completeCommodityMessageBySpid(item,commodityCodeEntity);
-                        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());
-
                     }
 
                 } else if (StringUtils.isBlank(item.getSpbm())) {

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<FpkjMxSap> ititem = req.getITITEM();
             for (int i = 0; i < ititem.size(); i++) {
@@ -3519,11 +3522,18 @@ public class BeanTransitionUtils {
                 }
                 ddmxxxBO.setZXBM(detail.getMATNR());
                 ddmxxxBO.setXMMC(detail.getZCPMC());
-                ddmxxxBO.setGGXH(detail.getCHARG());
+                if(ConfigureConstant.STRING_1.equals(ddmxxxBO.getFPHXZ())){
-                ddmxxxBO.setDW(detail.getZSLDW());
+                    ddmxxxBO.setGGXH("");
-                ddmxxxBO.setSPSL(detail.getZZSL());
+                    ddmxxxBO.setDW("");
+                    ddmxxxBO.setSPSL("");
+                    ddmxxxBO.setDJ("");
+                }else {
+                    ddmxxxBO.setGGXH("");
+                    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());

order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml

@@ -53,7 +53,7 @@
         <result column="origin_ddh" property="originDdh" jdbcType="VARCHAR"/>
         <result column="origin_order_id" property="originOrderId" jdbcType="VARCHAR"/>
         <result column="kb" property="kb" jdbcType="VARCHAR"/>
-        <result column="qd_bz" property="qdBz" jdbcType="VARCHAR"/>
+        <result column="qd_bz" property="qdbz" jdbcType="VARCHAR"/>
         <result column="dyzt" property="dyzt" jdbcType="VARCHAR"/>
         <result column="kplx" property="kplx" jdbcType="VARCHAR"/>
         <result column="dyztms" property="dyztms" jdbcType="VARCHAR"/>

pom.xml

@@ -57,7 +57,7 @@
         <filestore.version>1.0.8</filestore.version>
 
         <!-- 销项基础服务-文件操作 -->
-        <sims.base.file.operate.version>6.1.4.0-BASE</sims.base.file.operate.version>
+        <sims.base.file.operate.version>6.1.4.1-BASE</sims.base.file.operate.version>
 
         <sims.base.common.version>1.0.0-sdenergy</sims.base.common.version>