Merge remote-tracking branch 'origin/master'

7 months ago · d39e5e9aff
11 changed files with 557 additions and 12 deletions
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java
@ -68,6 +68,7 @@ public class AppOldPartsService {
        List<AsBusrepairPageVo> records = pagerVoResultBean.getData().getRecords();
        for (AsBusrepairPageVo record : records) {
            AppOldPartsVo appOldPartsVo = new AppOldPartsVo();
+            appOldPartsVo.setSid(record.getBillNo());
            appOldPartsVo.setBillId(record.getBillNo());
            appOldPartsVo.setVehMark(record.getVehMark());
            appOldPartsVo.setVinNo(record.getVinNo());
--- a/yxt-as-ui/src/api/statement/mountings.js
+++ b/yxt-as-ui/src/api/statement/mountings.js
@ -0,0 +1,22 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表 -- 业务汇总表
+  fittingsSummaryRecord: function(params) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventory/fittingsSummaryRecord',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 查询分页列表 -- 业务明细表
+  fittingsStorageRecord: function(params) {
+    return request({
+      url: '/as/v1/AsBusrepairBill/fittingsStorageRecord',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  }
+}
--- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
+++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
@ -330,7 +330,7 @@ export default {
      // 定义样式变量
      let cell = ''
      if (!row.isUnanimous) {
-        cell = 'background: #ff6961;'
+        cell = 'color: #ff6961;'
        return cell
      }
    },
--- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue
+++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue
@ -129,7 +129,7 @@ export default {
      // 定义样式变量
      let cell = ''
      if (!row.isUnanimous) {
-        cell = 'background: #ff6961;'
+        cell = 'color: #ff6961;'
        return cell
      }
    },
--- a/yxt-as-ui/src/views/statement/mountings/accessoryDetail.vue
+++ b/yxt-as-ui/src/views/statement/mountings/accessoryDetail.vue
@ -0,0 +1,293 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="配件出入库明细查询" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
+              <el-form-item label="所属公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="所属门店">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="图号">
+                <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="业务类型">
+                <el-input v-model="listQuery.params.busTypeValue" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="采购类别">
+                <el-input v-model="listQuery.params.purchaseTypeValue" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="配件所属品牌">
+                <el-input v-model="listQuery.params.brand" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="仓库">
+                <el-input v-model="listQuery.params.warehouseName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="仓库">
+                <el-input v-model="listQuery.params.warehouseArea" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="库位">
+                <el-input v-model="listQuery.params.warehouseRackCode" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="供应商">
+                <el-input v-model="listQuery.params.supplierName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="生产厂家">
+                <el-input v-model="listQuery.params.manufacturerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="服务顾问">
+                <el-input v-model="listQuery.params.waitorName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="领料人">
+                <el-input v-model="listQuery.params.operName" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleToday">本日</el-button>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleCurrentMonth">本月</el-button>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleCurrentYear">本年</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">配件出入库明细表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column fixed type="selection" align="center" width="50"/>
+            <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column prop="useOrgName" label="所属公司" align="center" min-width="130" />
+            <el-table-column prop="deptName" label="所属门店" align="center" min-width="100" />
+            <el-table-column prop="goodsID" label="商品ID" align="center" width="100" />
+            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="100" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" min-width="100" />
+            <el-table-column prop="supplierName" label="供应商" align="center" width="100" />
+            <el-table-column prop="manufacturerName" label="生产厂家" align="center" width="100" />
+            <el-table-column prop="busTypeValue" label="业务类型" align="center" min-width="100" />
+            <el-table-column prop="purchaseTypeValue" label="采购方式" align="center" width="100" />
+            <el-table-column prop="purchaseSubject" label="采购类别" align="center" width="100" />
+            <el-table-column prop="purchaseBillNo" label="采购单号" align="center" width="100" />
+            <el-table-column prop="brand" label="配件所属品牌" align="center" width="100" />
+            <el-table-column prop="manufacturersOrderTypeValue" label="厂家订单类型" align="center" width="100" />
+            <el-table-column prop="manufactorBillNo" label="厂家订单编号" align="center" width="100" />
+            <el-table-column prop="unit" label="单位" align="center" width="100" />
+            <el-table-column prop="purchaseFinishTime" label="采购审核日期" align="center" width="100" />
+            <el-table-column prop="warehouseName" label="仓库" align="center" width="100" />
+            <el-table-column prop="wareAreaName" label="库区" align="center" width="100" />
+            <el-table-column prop="warehouseRackCode" label="库位" align="center" width="100" />
+            <el-table-column prop="shClaimTypeValue" label="索赔类型" align="center" width="100" />
+            <el-table-column prop="billNo" label="单据编号" align="center" width="100" />
+            <el-table-column prop="settleTime" label="结算时间" align="center" width="100" />
+            <el-table-column prop="cost" label="入库单价" align="center" width="100" />
+            <el-table-column prop="outPrice" label="出库单价" align="center" width="100" />
+            <el-table-column prop="taxRate" label="税率" align="center" width="100" />
+            <el-table-column prop="price" label="销售单价" align="center" width="100" />
+            <el-table-column prop="InOutTime" label="出入库时间" align="center" width="100" />
+            <el-table-column prop="InOutCount" label="出入库数量" align="center" width="100" />
+            <el-table-column prop="costTotal" label="成本合计" align="center" width="100" />
+            <el-table-column prop="incomeTotal" label="收入合计" align="center" width="100" />
+            <el-table-column prop="profitsTotal" label="利润合计" align="center" width="100" />
+            <el-table-column prop="waitorName" label="服务顾问" align="center" width="100" />
+            <el-table-column prop="operName" label="领料人" align="center" width="100" />
+            <el-table-column prop="nowCount" label="当前库存数量" align="center" width="100" />
+            <el-table-column prop="nowMoney" label="当前库存金额" align="center" width="100" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/statement/mountings'
+
+export default {
+  name: 'AccessoryDetail',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          useOrgName: '',
+          deptName: '',
+          billState: '',
+          dateType: '',
+          goodsSkuCode: '',
+          busTypeValue: '',
+          purchaseTypeValue: '',
+          brand: '',
+          warehouseName: '',
+          warehouseArea: '',
+          warehouseRackCode: '',
+          manufacturerName: '',
+          supplierName: '',
+          waitorName: '',
+          operName: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
+      req.fittingsStorageRecord(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleToday() {
+      this.listQuery.params.dateType = '1'
+      this.handleFilter()
+    },
+    handleCurrentMonth() {
+      this.listQuery.params.dateType = '2'
+      this.handleFilter()
+    },
+    handleCurrentYear() {
+      this.listQuery.params.dateType = '3'
+      this.handleFilter()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          useOrgName: '',
+          deptName: '',
+          billState: '',
+          dateType: '',
+          goodsSkuCode: '',
+          busTypeValue: '',
+          purchaseTypeValue: '',
+          brand: '',
+          warehouseName: '',
+          warehouseArea: '',
+          warehouseRackCode: '',
+          manufacturerName: '',
+          supplierName: '',
+          waitorName: '',
+          operName: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
+        }
+      }
+      this.getList()
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
--- a/yxt-as-ui/src/views/statement/mountings/partsSummary.vue
+++ b/yxt-as-ui/src/views/statement/mountings/partsSummary.vue
@ -0,0 +1,229 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="配件出入库汇总查询" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="业务类型">
+                <el-input v-model="listQuery.params.busTypeValue" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="商品类型">
+                <el-input v-model="listQuery.params.goodsType" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="图号">
+                <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="仓库">
+                <el-input v-model="listQuery.params.warehouseName" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleToday">本日</el-button>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleCurrentMonth">本月</el-button>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleCurrentYear">本年</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">配件出入库汇总表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column fixed type="selection" align="center" width="50"/>
+            <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column prop="useOrgName" label="所属公司" align="center" min-width="130" />
+            <el-table-column prop="deptName" label="所属门店" align="center" min-width="100" />
+            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="100" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" min-width="100" />
+            <el-table-column prop="supplierName" label="供应商" align="center" width="100" />
+            <el-table-column prop="manufacturerName" label="生产厂家" align="center" width="100" />
+            <el-table-column prop="goodsType" label="商品类型" align="center" min-width="100" />
+            <el-table-column prop="warehouseName" label="仓库" align="center" width="100" />
+            <el-table-column prop="wareAreaName" label="库区" align="center" width="100" />
+            <el-table-column prop="warehouseRackCode" label="库位" align="center" width="100" />
+            <el-table-column prop="unit" label="单位" align="center" width="100" />
+            <el-table-column prop="busTypeValue" label="业务类型" align="center" width="100" />
+            <el-table-column prop="inCount" label="入库数量" align="center" width="100" />
+            <el-table-column prop="inCostMoney" label="入库成本金额" align="center" width="100" />
+            <el-table-column prop="outCount" label="出库数量" align="center" width="100" />
+            <el-table-column prop="outCostMoney" label="出库成本金额" align="center" width="100" />
+            <el-table-column prop="nowCount" label="当前库存数量" align="center" width="100" />
+            <el-table-column prop="nowMoney" label="当前库存金额" align="center" width="100" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/statement/mountings'
+
+export default {
+  name: 'PartsSummary',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          dateType: '',
+          goodsType: '',
+          busTypeValue: '',
+          goodsSkuCode: '',
+          warehouseName: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
+      req.fittingsSummaryRecord(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleToday() {
+      this.listQuery.params.dateType = '1'
+      this.handleFilter()
+    },
+    handleCurrentMonth() {
+      this.listQuery.params.dateType = '2'
+      this.handleFilter()
+    },
+    handleCurrentYear() {
+      this.listQuery.params.dateType = '3'
+      this.handleFilter()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          dateType: '',
+          goodsType: '',
+          busTypeValue: '',
+          goodsSkuCode: '',
+          warehouseName: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
+        }
+      }
+      this.getList()
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
--- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue
@ -240,7 +240,7 @@ export default {
      // 定义样式变量
      let cell = ''
      if (!row.isUnanimous) {
-        cell = 'background: #ff6961;'
+        cell = 'color: #ff6961;'
        return cell
      }
    },
--- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
@ -311,7 +311,7 @@ export default {
      // 定义样式变量
      let cell = ''
      if (!row.isUnanimous) {
-        cell = 'background: #ff6961;'
+        cell = 'color: #ff6961;'
        return cell
      }
    },
--- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue
@ -164,7 +164,7 @@ export default {
      // 定义样式变量
      let cell = ''
      if (!row.isUnanimous) {
-        cell = 'background: #ff6961;'
+        cell = 'color: #ff6961;'
        return cell
      }
    },
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java
@ -234,20 +234,20 @@ public class AsBusclaimBillRest {
            asBusclaimBillExcelInfoList.add(asBusclaimBillExcelInfo);
            if (!asBusclaimBillExcelInfoList.isEmpty()) {
                for (AsBusclaimBillExcelInfo excelInfo : asBusclaimBillExcelInfoList) {
+                    if (StringUtils.isBlank(excelInfo.getVinNo())) {
+                        checkWord.add("车架号不能为空");
+                        break;
+                    }
                    if (StringUtils.isBlank(excelInfo.getBillNo())) {
                        checkWord.add("索赔单编号不能为空");
                        break;
                    }else {
-                        AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(excelInfo.getBillNo());
+                        AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNoAndVinNo(asBusclaimBillExcelInfo.getBillNo(),asBusclaimBillExcelInfo.getVinNo());
                        if (asBusclaimBill == null){
-                            checkWord.add("索赔单号" + excelInfo.getBillNo() + "不存在");
+                            checkWord.add("索赔单号" + excelInfo.getBillNo() + "不存在或车架号" + asBusclaimBillExcelInfo.getVinNo() + "填写不正确");
                            break;
                        }
                    }
-                    if (StringUtils.isBlank(excelInfo.getVinNo())) {
-                        checkWord.add("车架号不能为空");
-                        break;
-                    }
                    if (StringUtils.isBlank(excelInfo.getState())) {
                        checkWord.add("状态不能为空");
                        break;
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
@ -76,7 +76,7 @@
        yxt_wms.wms_old_register wor
        LEFT JOIN as_busrepair_bill a
        ON a.billNo = wor.billNo
-        LEFT JOIN as_busrepair_bill_vech av av
+        LEFT JOIN as_busrepair_bill_vech av
        ON a.sid = av.billSid
        LEFT JOIN as_busrepair_inventorybill ai
        ON ai.sourceBillSid = a.sid