Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -670,6 +670,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         scmEntryVehicleExamineDto.setVinNo("");
         scmEntryVehicleExamineDto.setPrice("");
         scmEntryVehicleExamineDto.setInspectionResult("1");
+        //外采申请分公司sid及分公司名称
+        scmEntryVehicleExamineDto.setUseOrgSid(booad.getUseOrgSid());
+        scmEntryVehicleExamineDto.setUseOrgName(booad.getUseOrgName());
         ResultBean<String> resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
         return resultBean1;
     }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehiclePageVo.java

@@ -35,4 +35,6 @@ public class AppArrearsCarryVehiclePageVo implements Vo {
     private boolean showUpdateBtn;
     @ApiModelProperty("是否显示删除")
     private boolean showDeleteBtn;
+    @ApiModelProperty("车辆")
+    private String vinNo;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -60,24 +60,24 @@
 
     <select id="getAdvanceInvoiceList"
             resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehiclePageVo">
-        SELECT sid,
-        if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
-        if(length(nodeState) > 0, false, true ) as showUpdateBtn,
-        if(length(nodeState) > 0, false, true ) as showDeleteBtn,
-        contractNo,
-        modelName,
-        customerName,
-        arrearsMoney,
-        commitmentMoneyDate,
-        applyName,
-        DATE_FORMAT(createTime,'%Y-%m-%d') as applyDate
-        FROM bus_arrears_carry_vehicle_apply
+        SELECT ba.sid,
+        if(length(ba.nodeState) > 0, nodeState, '待提交') as nodeState,
+        if(length(ba.nodeState) > 0, false, true ) as showUpdateBtn,
+        if(length(ba.nodeState) > 0, false, true ) as showDeleteBtn,
+        ba.contractNo,
+        ba.modelName,
+        ba.customerName,
+        ba.arrearsMoney,
+        ba.commitmentMoneyDate,
+        ba.applyName,
+        DATE_FORMAT(ba.createTime,'%Y-%m-%d') as applyDate
+        FROM bus_arrears_carry_vehicle_apply ba
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
-                and concat(IFNULL(contractNo
+                and concat(IFNULL(ba.contractNo
                 , '')
-                , ifnull(customerName
+                , ifnull(ba.customerName
                 , '')) LIKE concat('%'
                 , #{name}
                 , '%')

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -505,7 +505,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         AppArrearsCarryVehicleQuery params = pagerQuery.getParams();
         QueryWrapper<AppArrearsCarryVehicleQuery> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(params.getUserSid())) {
-            qw.eq("createBySid", params.getUserSid());
+            qw.eq("ba.createBySid", params.getUserSid());
         }
         /*if (StringUtils.isNotBlank(params.getType())) {
             qw.eq("type", params.getType());
@@ -513,15 +513,25 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         if (StringUtils.isNotBlank(params.getType())) {
             //待办理
             if ("1".equals(params.getType())) {
-                qw.isNull("nodeState");
+                qw.isNull("ba.nodeState");
             }
             //已办理
             if ("2".equals(params.getType())) {
-                qw.isNotNull("nodeState");
+                qw.isNotNull("ba.nodeState");
             }
         }
         IPage<AppArrearsCarryVehicleQuery> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppArrearsCarryVehiclePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
+        List<AppArrearsCarryVehiclePageVo> records = iPage.getRecords();
+        records.removeAll(Collections.singleton(null));
+        if(!records.isEmpty()){
+            for(AppArrearsCarryVehiclePageVo v : records){
+                //根据sid查找车辆信息
+                List<String> stringList = busArrearsCarryVehicleDetailsService.selectByApplySidOne(v.getSid());
+                v.setVinNo(String.join(",",stringList));
+            }
+        }
+        iPage.setRecords(records);
         return iPage;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java

@@ -65,4 +65,6 @@ public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper<BusArrea
      * @return
      */
     List<BusArrearsCarryVehicleDetails> selectDetailsByApplySid(String sid);
+
+    List<String> selectByApplySidOne(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml

@@ -33,4 +33,8 @@
         from bus_arrears_carry_vehicle_details
         where applySid = #{sid}
     </select>
+
+    <select id="selectByApplySidOne" resultType="java.lang.String">
+        select vinNo from bus_arrears_carry_vehicle_details where applySid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java

@@ -131,4 +131,8 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService<Bus
     public List<BusArrearsCarryVehicleDetails> selectDetailsByApplySid(String sid) {
         return baseMapper.selectDetailsByApplySid(sid);
     }
+
+    public List<String> selectByApplySidOne(String sid) {
+        return baseMapper.selectByApplySidOne(sid);
+    }
 }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue

@@ -46,11 +46,11 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">是否领票</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.isTakeTicket }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">发票状态</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.isTakeTicket }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.billingState }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementInfo.vue

@@ -42,11 +42,11 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">是否领票</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.isTakeTicket }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">发票状态</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.isTakeTicket }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.billingState }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -2220,6 +2220,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             } else {
                 record.setIsExistQKLP(false);
             }
+            String sid = record.getSid();
+            List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(sid);
+            String vinNos = "";
+            for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                String vinNo = finBillVehicleVo.getVinNo();
+                vinNos = vinNos + vinNo + ",";
+            }
+            record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
         }
         PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
@@ -2276,6 +2284,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             } else {
                 record.setIsExistQKLP(false);
             }
+            String sid = record.getSid();
+            List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(sid);
+            String vinNos = "";
+            for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                String vinNo = finBillVehicleVo.getVinNo();
+                vinNos = vinNos + vinNo + ",";
+            }
+            record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
         }
         PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -469,13 +469,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         ResultBean rb = ResultBean.fireFail();
         ScmVehicleExamine scmVehicleExamine = new ScmVehicleExamine();
         BeanUtil.copyProperties(scmEntryVehicleExamineDto, scmVehicleExamine, "sid");
-        if (StringUtils.isBlank(scmEntryVehicleExamineDto.getUseOrgSid()) && StringUtils.isBlank(scmEntryVehicleExamineDto.getUseOrgName())) {
-            String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(scmEntryVehicleExamineDto.getUserSid()).getData();
-            SysOrganizationVo data = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
-            scmVehicleExamine.setCreateBySid(scmEntryVehicleExamineDto.getUserSid());
-            scmVehicleExamine.setUseOrgSid(useOrgSid);
-            scmVehicleExamine.setUseOrgName(data.getName());
-        }
+        scmVehicleExamine.setCreateBySid(scmEntryVehicleExamineDto.getUserSid());
         save(scmVehicleExamine);
         return rb.success().setData(scmVehicleExamine.getSid());
     }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java

@@ -39,5 +39,6 @@ public class AdvanceInvoicePageVo implements Vo {
     private String model;
     @ApiModelProperty("销售类型")
     private String type;
-
+    @ApiModelProperty("车架号（拼接）")
+    private String vinNo;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java

@@ -38,5 +38,7 @@ public class ArrearsCarryVehiclePageVo implements Vo {
     private boolean showUpdateBtn;
     @ApiModelProperty("是否显示删除")
     private boolean showDeleteBtn;
+    @ApiModelProperty("车架号")
+    private String vinNo;
 
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -129,6 +129,7 @@ public class AppBusAdvanceGinvoiceapplyService {
             advanceInvoicePageVo.setModel(record.getModelName());
             advanceInvoicePageVo.setType(record.getSaleTypeValue());
             advanceInvoicePageVo.setContractType(record.getNodeState());
+            advanceInvoicePageVo.setVinNo(record.getVinNo());
             if (record.getNodeState().equals("待提交")) {
                 advanceInvoicePageVo.setShowUpdateBtn(true);
                 advanceInvoicePageVo.setShowDeleteBtn(true);
@@ -181,6 +182,7 @@ public class AppBusAdvanceGinvoiceapplyService {
             advanceInvoicePageVo.setModel(record.getModelName());
             advanceInvoicePageVo.setType(record.getSaleTypeValue());
             advanceInvoicePageVo.setContractType(record.getNodeState());
+            advanceInvoicePageVo.setVinNo(record.getVinNo());
             if (record.getNodeState().equals("待提交")) {
                 advanceInvoicePageVo.setShowUpdateBtn(true);
                 advanceInvoicePageVo.setShowDeleteBtn(true);