task:4173

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java

@@ -41,4 +41,6 @@ public interface GroupManagementMapper {
      * 删除组织信息
      */
     int deleteGroup(@Param(value = "id") String id);
+
+    int countEntIdNumByXfnsrsbh(@Param("xfnsrsbh") String xfnsrsbh);
 }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java

@@ -53,4 +53,12 @@ public interface GroupManagementService {
      * 根据组织id集合查询组织信息
      */
     List<GroupManagementEntity> queryByGroupIdList(List<String> groupIdList);
+
+    /**
+     * 判断是不是内部关联交易且是一个税号对应多个公司代码的填上备注
+     * @param entId
+     * @param ghfId
+     * @return
+     */
+    Boolean checkInvoiceRemarksFlag(String entId,String ghfId);
 }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java

@@ -206,6 +206,27 @@ public class GroupManagementServiceImpl implements GroupManagementService {
         return groupManagementMapper.queryByGroupIdList(groupIdList, OrderInfoEnum.ORDER_KPZZGL_CXLX_1.getKey());
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public Boolean checkInvoiceRemarksFlag(String xfnsrsbh, String ghfId) {
+        if (StringUtils.isBlank(xfnsrsbh)) {
+            return Boolean.FALSE;
+        }
+        if (StringUtils.isBlank(ghfId)) {
+            return Boolean.FALSE;
+        }
+        if (groupManagementMapper.countEntIdNumByXfnsrsbh(xfnsrsbh) <= 1) {
+            return Boolean.FALSE;
+        }
+        if (ghfId.length()<=6) {
+            return Boolean.FALSE;
+        }
+        if (!"000006".equals(ghfId.substring(0,6))) {
+            return Boolean.FALSE;
+        }
+        return Boolean.TRUE;
+    }
+
     /**
      * 构建组织树集合
      */

order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml

@@ -82,6 +82,11 @@
         </if>
         ORDER BY update_time DESC
     </select>
+    <select id="countEntIdNumByXfnsrsbh" resultType="java.lang.Integer">
+
+        select count(distinct group_id) from sys_group_management where del_flag='0' and xhf_nsrsbh=#{xfnsrsbh}
+
+    </select>
 
     <insert id="insertGroup" parameterType="com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity">
         INSERT INTO

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java

@@ -368,5 +368,10 @@ public class DdtxxBO implements Serializable {
      */
     private String KB;
 
+    /**
+     * 销方公司编码
+     */
+    private String XHFBM;
+
     
 }

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

@@ -885,6 +885,13 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
                     }
                 }
             }
+            // 拼接公司代码备注信息
+            insertOrder.stream().forEach(item->{
+                if (groupManagementService.checkInvoiceRemarksFlag(item.getEntId(), item.getGhfId())) {
+                    item.setBz(item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";");
+                }
+            });
+
 
             /*
              * 手动导入判断

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -3508,6 +3508,8 @@ public class BeanTransitionUtils {
             if(ConfigureConstant.STRING_1.equals(req.getZSFHZ())){
                 ddtxxBO.setTSCHBZ(ConfigureConstant.STRING_0);
             }
+            // 销方公司代码
+            ddtxxBO.setXHFBM(deptEntity.getEnterpriseNumbers());
             //明细信息
             List<FpkjMxSap> ititem = req.getITITEM();
             for (int i = 0; i < ititem.size(); i++) {