Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -213,4 +213,10 @@ public class AppBusSalesOrderVo implements Vo {
     private boolean showContractBtn2;
 
     private String nowCarUnknownVinNum;
+
+
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -66,7 +66,9 @@
         bo.procDefId,
         bo.procInstId,
         bo.nowCarUnknownVinNum,
-        if(length(bo.nodeState)>0,true,false) as showRePublishBtn
+        if(length(bo.nodeState)>0,true,false) as showRePublishBtn,
+        bo.companyInvoicingSid,
+        bo.companyInvoicingName
         FROM bus_sales_order bo
         left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
         left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1841,7 +1841,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             vo.setUserSid(busSalesOrder.getCreateBySid());
             vo.setProcInsId(busSalesOrder.getProcInstId());
             vo.setTaskId(busSalesOrder.getTaskId());
-            vo.setOrderInfoState(1);
+            if(StringUtils.isBlank(busSalesOrder.getCompanyInvoicingSid())){
+                vo.setOrderInfoState(0);
+            }else{
+                vo.setOrderInfoState(1);
+            }
             //车型状态
             BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(saleOrderSid);
             if (busSalesOrderModelDetailsVo != null) {
@@ -3211,6 +3215,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (busSalesOrder == null) {
             return rb.setMsg("该销售订单单据不存在");
         }
+        if(StringUtils.isBlank(busSalesOrder.getCompanyInvoicingSid())){
+            return rb.setMsg("请完善单据信息");
+        }
         //车型信息、价格信息、订金信息是否全部完善
         boolean isModel = isModel(sid);
         if (!isModel) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java

@@ -127,4 +127,9 @@ public class BusOrderSalesVo implements Vo {
     private String contractPath;
     @ApiModelProperty("是否显示生成合同按钮")
     private boolean showContractBtn2;
+
+    @ApiModelProperty("开票单位名称")
+    private String companyInvoicingName;
+    @ApiModelProperty("开票单位sid")
+    private String companyInvoicingSid;
 }