临时体检

order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GroupCommodityCodeMapper.java

@@ -31,6 +31,8 @@ public interface GroupCommodityCodeMapper {
      */
     CommodityCodeEntity queryCommodityCodeByZxbmAndXhfNsrsbh(@Param("zxbm") String zxbm, @Param("xhfNsrsbh") String xhfNsrsbh);
 
+    CommodityCodeEntity queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(@Param("zxbm") String zxbm, @Param("xhfNsrsbh") String xhfNsrsbh,@Param("entId") String entId );
+
 
     int insertCommodityCode(CommodityCodeEntity entity);
 

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

@@ -52,6 +52,7 @@ public interface CommonInterfaceService {
 
     /**
      * V6版本外层报文校验
+     *
      * @param interfaceVersion 接口版本号
      * @param interfaceName    接口名称
      * @param secretId         加密ID
@@ -116,6 +117,9 @@ public interface CommonInterfaceService {
     void dealOrderItem(List<OrderItemInfo> orderItemInfo, String xhfNsrsbh, String qdbz, String fpzldm,
                        String terminal, String idType) throws OrderReceiveException;
 
+    void dealOrderItem(List<OrderItemInfo> orderItemInfo, String xhfNsrsbh, String qdbz, String fpzldm,
+                       String terminal, String idType, String entId) throws OrderReceiveException;
+
     /**
      * 处理受理点
      * 获取sldid,当sldid为-1时,先调用querySld接口,获取所有受理点列表
@@ -170,9 +174,10 @@ public interface CommonInterfaceService {
 
     /**
      * 处理原发票种类、原发票开票日期、冲红原因
+     *
+     * @param orderInfo 订单信息
      * @author <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a>
      * @date 2022-05-18
-     * @param orderInfo 订单信息
      */
     void dealWithYfpxxAndChyy(OrderInfo orderInfo);
 

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

@@ -562,7 +562,6 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
                         insertProcessInfo.add(orderProcessInfo);
 
 
-
                         //原始数据放入插入数组中
                         insertOrder.add(orderInfo);
 
@@ -967,6 +966,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
 
     /**
      * 接口开票请求参数非空校验
+     *
      * @param ddpcxxReq 请求参数
      * @return 非空校验结果
      */
@@ -1057,6 +1057,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
 
     /**
      * 补全订单批次信息
+     *
      * @param orderBatchRequest 订单批次信息
      */
     private void completeOrderBatchRequest(OrderBatchRequest orderBatchRequest) {
@@ -1072,6 +1073,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
 
     /**
      * 补全订单业务数据
+     *
      * @param commonOrderInfo 订单信息
      */
     private void completeCommonOrderInfo(OrderBatchRequest orderBatchRequest, CommonOrderInfo commonOrderInfo, TaxEquipmentInfo taxEquipmentInfo) throws OrderReceiveException {
@@ -1157,7 +1159,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
 
         //补全商品信息
         commonInterfaceService.dealOrderItem(commonOrderInfo.getOrderItemInfo(), nsrsbh, commonOrderInfo.getOrderInfo().getQdBz(),
-                commonOrderInfo.getOrderInfo().getFpzlDm(), terminalCode, ConfigureConstant.STRING_1);
+                commonOrderInfo.getOrderInfo().getFpzlDm(), terminalCode, ConfigureConstant.STRING_1, commonOrderInfo.getEntId());
     }
 
     public PageKpzzglRsp queryKpzzgl(PageKpzzglReq pageKpzzglReq) {
@@ -1192,6 +1194,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
 
     /**
      * 价税分离后订单信息补全处理
+     *
      * @param orderInfo    订单信息
      * @param fpzldm       发票种类代码
      * @param kpjh         开票机号

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

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.dxhy.order.baseservice.config.BaseServiceConfig;
 import com.dxhy.order.baseservice.module.base.model.DrawerInfoEntity;
@@ -505,6 +506,12 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
     @Override
     public void dealOrderItem(List<OrderItemInfo> orderItemInfo, String xhfNsrsbh, String qdbz, String fpzldm,
                               String terminal, String idType) throws OrderReceiveException {
+        dealOrderItem(orderItemInfo, xhfNsrsbh, qdbz, fpzldm, terminal, idType, null);
+    }
+
+    @Override
+    public void dealOrderItem(List<OrderItemInfo> orderItemInfo, String xhfNsrsbh, String qdbz, String fpzldm,
+                              String terminal, String idType, String entId) throws OrderReceiveException {
         long start = System.currentTimeMillis();
         List<String> shList = new ArrayList<>();
         shList.add(xhfNsrsbh);
@@ -524,7 +531,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
              *   2.1 商品编码不为空，使用商品编码补全
              *   2.2 商品编码为空，项目名称不为空，使用商品名称补全
              */
-            item.setZnfm("0");
+            item.setZnfm("1");
             if (StringUtils.isNotBlank(item.getSpId())) {
                 R r = commodityService.queryCommodityById(item.getSpId(), shList);
                 if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) {
@@ -543,7 +550,14 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
                     // 自行编码为mdm的物料编码，通过这个去匹配
                     // 4.2.1.11
                     // 先从公司物料库匹配
-                    CommodityCodeEntity commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbh(item.getZxbm(), xhfNsrsbh);
+                    CommodityCodeEntity commodityCodeEntity = null;
+                    if (StringUtils.isNotEmpty(entId)) {
+                        commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(item.getZxbm(), xhfNsrsbh, entId);
+                    } else {
+                        commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbh(item.getZxbm(), xhfNsrsbh);
+                    }
+
+                    // 如果公司物料库匹配失败，从集团物料库匹配
                     if (commodityCodeEntity == null) {
                         // 如果匹配不到，则去集团物料库匹配
                         commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbh(item.getZxbm(), "-1");
@@ -559,7 +573,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
                                 item.setSpbm(taxClassCodeEntity.getSpbm());
                                 // item.setYhzcbs(taxClassCodeEntity.getYhzcmc()); // TODO 优惠政策
                                 item.setZzstsgl(taxClassCodeEntity.getZzstsgl());
-                                item.setZnfm("1"); // 配置为智能赋码
+                                item.setZnfm("0"); // 配置为智能赋码
                             }
                         }
                     }
@@ -571,6 +585,10 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
                                 .append(ConfigureConstant.STRING_UNDERLINE)
                                 .append(OrderInfoContentEnum.INVOICE_SPBM_QUERY_NULL.getMessage())
                                 .append("\r\n");
+                    } else {
+                        // 如果找到记录，进行赋值匹配
+                        
+
                     }
 
                 } else if (StringUtils.isBlank(item.getSpbm())) {

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

@@ -128,6 +128,13 @@
         ORDER BY cc.create_time DESC limit 1
     </select>
 
+    <select id="queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId" resultMap="commodityCodeResultMap">
+        <bind name="dataType" value="${dataType}"/>
+        <include refid="baseSelect"/>
+        where cc.encoding = #{zxbm} AND cc.xhf_nsrsbh = #{xhfNsrsbh} AND cc.ent_id = #{entId}
+        ORDER BY cc.create_time DESC limit 1
+    </select>
+
     <insert id="insertCommodityCode"
             parameterType="com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity">
         <bind name="dataType" value="${dataType}"/>

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/vo/OrderInvoiceDetailVO.java

@@ -90,4 +90,15 @@ public class OrderInvoiceDetailVO implements Serializable {
      */
     private String sksbdm;
     private String entId;
+
+
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+
+    /**
+     * 矿别
+     */
+    private String kb;
 }