feature：开票后自动将物料信息入库,交接单导出添加报账单号

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEntity.java

@@ -229,5 +229,7 @@ public class CommodityCodeEntity implements Serializable {
     @FieldName(name = "invoiceName",fileName = "开票名称")
     private String invoiceName;
 
+    private String status;
+
 
 }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java

@@ -618,6 +618,7 @@ public class CommodityServiceImpl implements CommodityService {
                 commodityCodeCheckQuery.setXmdw(receiveSpxxReq.getXmdw());
                 commodityCodeCheckQuery.setXmdj(receiveSpxxReq.getXmdj());
                 commodityCodeCheckQuery.setSl(receiveSpxxReq.getSl());
+                commodityCodeCheckQuery.setDeptId(receiveSpxxReq.getEntId());
                 R r = commodityService.checkRepeat(commodityCodeCheckQuery, NsrsbhUtils.transShListByNsrsbh(receiveSpxxReq.getXhfNsrsbh()), false);
                 if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) {
 
@@ -708,6 +709,9 @@ public class CommodityServiceImpl implements CommodityService {
         commodityCodeEntity.setJdc(taxClassCodeEntity.getJdc());
         commodityCodeEntity.setBmbBbh(taxClassCodeEntity.getBbh());
         commodityCodeEntity.setCzlx("");
+        commodityCodeEntity.setEntId(receiveSpxxReq.getEntId());
+        commodityCodeEntity.setStatus("1");
+        commodityCodeEntity.setInvoiceName(CommonUtils.subSpmc(receiveSpxxReq.getXmmc()));
 
         commodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_4.getKey());
         commodityCodeEntity.setMatchingState(TaxClassCodeEnum.MATCHING_STATE_0.getKey());

order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/protocol/spxx/ReceiveSpxxReq.java

@@ -20,6 +20,8 @@ public class ReceiveSpxxReq implements Serializable {
 
     private String xhfNsrsbh;
 
+    private String entId;
+
     private String xhfMc;
 
     /**

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

@@ -569,6 +569,9 @@
             <if test="invoiceName != null">
                 invoice_name,
             </if>
+            <if test="status != null">
+                status,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -690,6 +693,9 @@
             <if test="invoiceName != null">
                 #{invoiceName,jdbcType=VARCHAR},
             </if>
+            <if test="status != null">
+                #{status,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/config/rabbitmq/OrderSaveSpxxHandler.java

@@ -7,6 +7,7 @@ import com.dxhy.base.rabbitmq.rabbitplugin.listener.BaseListener;
 import com.dxhy.order.baseservice.module.commodity.service.CommodityService;
 import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity;
 import com.dxhy.order.baseservice.module.taxclass.service.TaxClassCodeService;
+import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService;
 import com.dxhy.order.baseservice.module.vehicles.model.VehiclesCodeEntity;
 import com.dxhy.order.baseservice.module.vehicles.service.VehiclesService;
 import com.dxhy.order.baseservice.openapi.protocol.spxx.ReceiveSpxxReq;
@@ -65,6 +66,9 @@ public class OrderSaveSpxxHandler implements BaseListener {
     @Resource
     private VehiclesService vehiclesService;
 
+    @Resource
+    private UserInfoService userInfoService;
+
     /**
      * 监听数据
      *
@@ -114,6 +118,7 @@ public class OrderSaveSpxxHandler implements BaseListener {
                             ReceiveSpxxReq receiveSpxxReq = new ReceiveSpxxReq();
                             BeanUtil.copyProperties(orderItemInfo,receiveSpxxReq,true);
                             receiveSpxxReq.setXhfMc(orderInvoiceInfo.getXhfMc());
+                            receiveSpxxReq.setEntId(userInfoService.getUser() != null ? userInfoService.getUser().getDeptId():orderInvoiceInfo.getEntId());
                             receiveSpxxReqList.add(receiveSpxxReq);
                         }
                         commodityService.saveCommodityCodeEntity(receiveSpxxReqList);

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java

@@ -1,6 +1,7 @@
 package com.dxhy.order.invoice.module.invoice.dao;
 
 import com.dxhy.order.model.OrderInfo;
+import com.dxhy.order.model.OrderProcessInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -74,4 +75,6 @@ public interface OrderInfoMapper {
      */
     int updateOrderInfo(@Param("orderInfo") OrderInfo orderInfo, @Param("shList") List<String> shList);
 
+    OrderProcessInfo selectProcessByFpqqlsh(@Param("fpqqlsh")String fpqqlsh, @Param("shList") List<String> shList);
+
 }

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceInfo.java

@@ -167,6 +167,7 @@ public class ExportInvoiceInfo implements Serializable {
     private String signDate;
     private String invoiceDate;
     private String sellerName;
+    private String bzdh;
     private List<ExportInvoiceItemInfo> exportInvoiceItemInfoList;
     
 }

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceInfoEnum.java

@@ -15,17 +15,18 @@ public enum ExportInvoiceInfoEnum {
      * Excel导出发票主信息
      * 必须按照顺序存放,否则会异常
      */
-    EXCEL_EXPORT_INVOICE_FPLX("0", "fpzlDm", "发票类型"),
-    EXCEL_EXPORT_INVOICE_FPDM("1", "fpdm", "发票代码"),
-    EXCEL_EXPORT_INVOICE_FPHM("2", "fphm", "发票号码"),
-    EXCEL_EXPORT_INVOICE_XHFMC("3", "xhfMc", "销方名称"),
-    EXCEL_EXPORT_INVOICE_XHFNSRSBH("4", "xhfNsrsbh", "销方税号"),
-    EXCEL_EXPORT_INVOICE_GHFMC("5", "ghfMc", "购方名称"),
-    EXCEL_EXPORT_INVOICE_GHFNSRSBH("6", "ghfNsrsbh", "购方税号"),
-    EXCEL_EXPORT_INVOICE_KPRQ("7", "kprq", "开票时间"),
-    EXCEL_EXPORT_INVOICE_JSHJ("8", "kphjje", "价税合计金额"),
-    EXCEL_EXPORT_INVOICE_HJJE("9", "hjbhsje", "合计金额"),
-    EXCEL_EXPORT_INVOICE_HJSE("10", "kpse", "合计税额");
+    EXCEL_EXPORT_INVOICE_BZDH("0", "bzdh", "报账单号"),
+    EXCEL_EXPORT_INVOICE_FPLX("1", "fpzlDm", "发票类型"),
+    EXCEL_EXPORT_INVOICE_FPDM("2", "fpdm", "发票代码"),
+    EXCEL_EXPORT_INVOICE_FPHM("3", "fphm", "发票号码"),
+    EXCEL_EXPORT_INVOICE_XHFMC("4", "xhfMc", "销方名称"),
+    EXCEL_EXPORT_INVOICE_XHFNSRSBH("5", "xhfNsrsbh", "销方税号"),
+    EXCEL_EXPORT_INVOICE_GHFMC("6", "ghfMc", "购方名称"),
+    EXCEL_EXPORT_INVOICE_GHFNSRSBH("7", "ghfNsrsbh", "购方税号"),
+    EXCEL_EXPORT_INVOICE_KPRQ("8", "kprq", "开票时间"),
+    EXCEL_EXPORT_INVOICE_JSHJ("9", "kphjje", "价税合计金额"),
+    EXCEL_EXPORT_INVOICE_HJJE("10", "hjbhsje", "合计金额"),
+    EXCEL_EXPORT_INVOICE_HJSE("11", "kpse", "合计税额");
     
     /**
      * key

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfoEnum.java

@@ -15,40 +15,41 @@ public enum ExportInvoiceItemInfoEnum {
      * Excel导出发票明细信息
      * 必须按照顺序存放,否则会异常
      */
-    EXCEL_EXPORT_INVOICE_DDH("0", "ddh", "订单号"),
-    EXCEL_EXPORT_INVOICE_FPDM("1", "fpdm", "发票代码"),
-    EXCEL_EXPORT_INVOICE_FPHM("2", "fphm", "发票号码"),
-    EXCEL_EXPORT_INVOICE_XHFMC("3", "xhfMc", "销方名称"),
-    EXCEL_EXPORT_INVOICE_XHFNSRSBH("4", "xhfNsrsbh", "销方税号"),
-    EXCEL_EXPORT_INVOICE_XHFYHZH("5", "xhfYhZh", "销方银行帐号"),
-    EXCEL_EXPORT_INVOICE_XHFDZDH("6", "xhfDzDh", "销方地址电话"),
-    EXCEL_EXPORT_INVOICE_GHFMC("7", "ghfMc", "购方名称"),
-    EXCEL_EXPORT_INVOICE_GHFNSRSBH("8", "ghfNsrsbh", "购方税号"),
-    EXCEL_EXPORT_INVOICE_GHFYHZH("9", "ghfYhZh", "银行账号"),
-    EXCEL_EXPORT_INVOICE_GHFDZDH("10", "ghfDzDh", "地址电话"),
-    EXCEL_EXPORT_INVOICE_GHFSJH("11", "ghfSjh", "购方手机号"),
-    EXCEL_EXPORT_INVOICE_FPLX("12", "fpzlDm", "发票类型"),
-    EXCEL_EXPORT_INVOICE_ZFBZ("13", "zfbz", "作废标志"),
-    EXCEL_EXPORT_INVOICE_KPRQ("14", "kprq", "开票时间"),
-    EXCEL_EXPORT_INVOICE_JSHJ("15", "kphjje", "合计金额(含税)"),
-    EXCEL_EXPORT_INVOICE_HJJE("16", "hjbhsje", "合计金额(不含税)"),
-    EXCEL_EXPORT_INVOICE_HJSE("17", "kpse", "合计税额"),
-    EXCEL_EXPORT_INVOICE_KPR("18", "kpr", "开票人"),
-    EXCEL_EXPORT_INVOICE_KPLX("19", "kplx", "开票类型"),
-    EXCEL_EXPORT_INVOICE_YWLX("20", "ywlx", "业务类型"),
-    EXCEL_EXPORT_INVOICE_FPBZ("21", "bz", "发票备注"),
-    EXCEL_EXPORT_INVOICE_DYHSPMC("22", "kpxm", "第一行商品名称"),
-    EXCEL_EXPORT_INVOICE_SPMC("23", "xmmc", "商品名称"),
-    EXCEL_EXPORT_INVOICE_SPGG("24", "ggxh", "规格"),
-    EXCEL_EXPORT_INVOICE_SPDW("25", "xmdw", "单位"),
-    EXCEL_EXPORT_INVOICE_SPSL("26", "xmsl", "数量"),
-    EXCEL_EXPORT_INVOICE_SPDJ("27", "xmdj", "单价"),
-    EXCEL_EXPORT_INVOICE_SPJE("28", "xmje", "金额"),
-    EXCEL_EXPORT_INVOICE_SL("29", "sl", "税率"),
-    EXCEL_EXPORT_INVOICE_SE("30", "se", "税额"),
-    EXCEL_EXPORT_INVOICE_SPBM("31", "spbm", "税收分类编码"),
-    EXCEL_EXPORT_INVOICE_BMBBBH("32", "bmbbbh", "编码表版本号"),
-    EXCEL_EXPORT_INVOICE_ITEM("33", "exportInvoiceItemInfoList", "数组");
+    EXCEL_EXPORT_INVOICE_BZDH("0", "bzdh", "报账单号"),
+    EXCEL_EXPORT_INVOICE_DDH("1", "ddh", "订单号"),
+    EXCEL_EXPORT_INVOICE_FPDM("2", "fpdm", "发票代码"),
+    EXCEL_EXPORT_INVOICE_FPHM("3", "fphm", "发票号码"),
+    EXCEL_EXPORT_INVOICE_XHFMC("4", "xhfMc", "销方名称"),
+    EXCEL_EXPORT_INVOICE_XHFNSRSBH("5", "xhfNsrsbh", "销方税号"),
+    EXCEL_EXPORT_INVOICE_XHFYHZH("6", "xhfYhZh", "销方银行帐号"),
+    EXCEL_EXPORT_INVOICE_XHFDZDH("7", "xhfDzDh", "销方地址电话"),
+    EXCEL_EXPORT_INVOICE_GHFMC("8", "ghfMc", "购方名称"),
+    EXCEL_EXPORT_INVOICE_GHFNSRSBH("9", "ghfNsrsbh", "购方税号"),
+    EXCEL_EXPORT_INVOICE_GHFYHZH("10", "ghfYhZh", "银行账号"),
+    EXCEL_EXPORT_INVOICE_GHFDZDH("11", "ghfDzDh", "地址电话"),
+    EXCEL_EXPORT_INVOICE_GHFSJH("12", "ghfSjh", "购方手机号"),
+    EXCEL_EXPORT_INVOICE_FPLX("13", "fpzlDm", "发票类型"),
+    EXCEL_EXPORT_INVOICE_ZFBZ("14", "zfbz", "作废标志"),
+    EXCEL_EXPORT_INVOICE_KPRQ("15", "kprq", "开票时间"),
+    EXCEL_EXPORT_INVOICE_JSHJ("16", "kphjje", "合计金额(含税)"),
+    EXCEL_EXPORT_INVOICE_HJJE("17", "hjbhsje", "合计金额(不含税)"),
+    EXCEL_EXPORT_INVOICE_HJSE("18", "kpse", "合计税额"),
+    EXCEL_EXPORT_INVOICE_KPR("19", "kpr", "开票人"),
+    EXCEL_EXPORT_INVOICE_KPLX("20", "kplx", "开票类型"),
+    EXCEL_EXPORT_INVOICE_YWLX("21", "ywlx", "业务类型"),
+    EXCEL_EXPORT_INVOICE_FPBZ("22", "bz", "发票备注"),
+    EXCEL_EXPORT_INVOICE_DYHSPMC("23", "kpxm", "第一行商品名称"),
+    EXCEL_EXPORT_INVOICE_SPMC("24", "xmmc", "商品名称"),
+    EXCEL_EXPORT_INVOICE_SPGG("25", "ggxh", "规格"),
+    EXCEL_EXPORT_INVOICE_SPDW("26", "xmdw", "单位"),
+    EXCEL_EXPORT_INVOICE_SPSL("27", "xmsl", "数量"),
+    EXCEL_EXPORT_INVOICE_SPDJ("28", "xmdj", "单价"),
+    EXCEL_EXPORT_INVOICE_SPJE("29", "xmje", "金额"),
+    EXCEL_EXPORT_INVOICE_SL("30", "sl", "税率"),
+    EXCEL_EXPORT_INVOICE_SE("31", "se", "税额"),
+    EXCEL_EXPORT_INVOICE_SPBM("32", "spbm", "税收分类编码"),
+    EXCEL_EXPORT_INVOICE_BMBBBH("33", "bmbbbh", "编码表版本号"),
+    EXCEL_EXPORT_INVOICE_ITEM("34", "exportInvoiceItemInfoList", "数组");
     
     /**
      * key

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java

@@ -577,6 +577,7 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
 
 
             //发票主信息补全
+            exportInvoiceInfo.setBzdh(StringUtils.isNotBlank(orderInvoiceDetail.getBzdh())?orderInvoiceDetail.getBzdh():"");
             exportInvoiceInfo.setXh(String.valueOf(xh));
             exportInvoiceInfo.setDdh(StringUtils.isNotBlank(orderInvoiceDetail.getDdh()) ? orderInvoiceDetail.getDdh() : "");
             exportInvoiceInfo.setFpdm(StringUtils.isNotBlank(orderInvoiceDetail.getFpdm()) ? orderInvoiceDetail.getFpdm() : "");

order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml

@@ -596,5 +596,29 @@
         </foreach>
     </if>
 </select>
+    <select id="selectProcessByFpqqlsh" resultType="com.dxhy.order.model.OrderProcessInfo">
+        select
+          *
+        from
+          order_process_info
+        where
+          fpqqlsh  = #{fpqqlsh,jdbcType=VARCHAR}
+        <if test="shList != null and shList.size() == 0">
+            and xhf_nsrsbh = ''
+        </if>
+        <if test="shList != null and shList.size() == 1">
+            and xhf_nsrsbh =
+            <foreach collection="shList" index="index" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="shList != null and shList.size() > 1">
+            and xhf_nsrsbh in
+            <foreach collection="shList" index="index" item="item"
+                     open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 
 </mapper>

order-management-invoice/src/main/resources/mybatis/mapper/OrderInvoiceInfoMapper.xml

@@ -141,6 +141,7 @@
         <result column="origin_ddh" jdbcType="VARCHAR" property="originDdh"/>
         <result column="origin_order_id" jdbcType="VARCHAR" property="originOrderId"/>
         <result column="kb" jdbcType="VARCHAR" property="kb"/>
+        <result column="bzdh" jdbcType="VARCHAR" property="bzdh"/>
     </resultMap>
 
 
@@ -1306,7 +1307,8 @@
         opi.yzfp,
         opi.origin_ddh,
         opi.origin_order_id,
-        opi.kb
+        opi.kb,
+        opi.bzdh
 
         FROM order_invoice_info oii
         LEFT JOIN order_info oi ON oii.order_info_id = oi.id