Merge remote-tracking branch 'origin/master'

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -317,8 +317,8 @@
         '1'
         ELSE '1'
         END as isFilingIndate,
-            (SELECT COUNT(*) FROM yxt_4sas.as_customer_vehicle as v WHERE v.customerSid = a.sid) as vehCount,
-        (SELECT COUNT(*) FROM crm_docking_people as d WHERE d.customerSid = a.sid) as personCount
+            (SELECT COUNT(*) FROM yxt_4sas.as_customer_vehicle as v WHERE v.customerSid = a.sid and v.isDelete = 0) as vehCount,
+        (SELECT COUNT(*) FROM crm_docking_people as d WHERE d.customerSid = a.sid and d.isDelete = 0) as personCount
         FROM
             crm_customer_temp AS a
                 LEFT JOIN anrui_portal.sys_organization as s on a.useOrgSid = s.sid

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue

@@ -270,22 +270,22 @@ export default {
         if (parseFloat(money) > 0) {
           this.isAdjustment = '是'
           val.adjustmentMoney = parseFloat(money)
-          val.adjustOrNot = true
+          this.adjustOrNot = true
         } else if (parseFloat(money) === 0) {
           this.isAdjustment = '无需调整'
           val.adjustmentMoney = parseFloat(money)
-          val.adjustOrNot = false
+          this.adjustOrNot = true
         } else {
           this.isAdjustment = '否'
           val.adjustmentMoney = '0'
           val.adjustmentRemarks = ''
-          val.adjustOrNot = true
+          this.adjustOrNot = false
         }
       } else {
         this.isAdjustment = '否'
         val.adjustmentMoney = '0'
         val.adjustmentRemarks = ''
-        val.adjustOrNot = false
+        this.adjustOrNot = true
       }
       if (parseFloat(this.formobj.secondaryUploadMoney) > 0) {
         this.checked = true

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue

@@ -32,7 +32,8 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@@ -50,6 +51,7 @@
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@@ -185,6 +187,7 @@ export default {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
             v = 1
             break
@@ -204,6 +207,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -222,6 +226,7 @@ export default {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
             k = 1
             break
@@ -239,6 +244,7 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''
@@ -278,6 +284,7 @@ export default {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
             v = 1
             break
@@ -297,6 +304,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -315,6 +323,7 @@ export default {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
             k = 1
             break
@@ -332,6 +341,7 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue

@@ -25,9 +25,10 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -43,8 +44,9 @@
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue

@@ -268,22 +268,22 @@ export default {
         if (parseFloat(money) > 0) {
           this.isAdjustment = '是'
           val.adjustmentMoney = parseFloat(money)
-          val.adjustOrNot = true
+          this.adjustOrNot = true
         } else if (parseFloat(money) === 0) {
           this.isAdjustment = '无需调整'
           val.adjustmentMoney = parseFloat(money)
-          val.adjustOrNot = false
+          this.adjustOrNot = true
         } else {
           this.isAdjustment = '否'
           val.adjustmentMoney = '0'
           val.adjustmentRemarks = ''
-          val.adjustOrNot = true
+          this.adjustOrNot = false
         }
       } else {
         this.isAdjustment = '否'
         val.adjustmentMoney = '0'
         val.adjustmentRemarks = ''
-        val.adjustOrNot = false
+        this.adjustOrNot = true
       }
       if (parseFloat(this.formobj.secondaryUploadMoney) > 0) {
         this.checked = true

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementInfo.vue

@@ -154,7 +154,7 @@
           <div class="title">调整说明</div>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">差异金额</div>
+              <div class="span-sty">返利差异金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.diffAmount }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
@@ -162,10 +162,24 @@
               <el-form-item><span class="addinputInfo">{{ formobj.isAdjustment }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">调整金额</div>
+              <div class="span-sty">返利调整金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.adjustmentMoney }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">支出费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.itureAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">待支付费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.treatAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">抵顶费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.suppAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">调整说明</div>
@@ -219,10 +233,10 @@ export default {
 </script>
 <style scoped>
 .span-sty {
-  width: 130px !important;
+  width: 140px !important;
 }
 .addinputInfo {
-  margin-left: 120px !important;
+  margin-left: 130px !important;
 }
 </style>
 

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialInfo.vue

@@ -154,7 +154,7 @@
           <div class="title">调整说明</div>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">差异金额</div>
+              <div class="span-sty">返利差异金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.diffAmount }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
@@ -162,10 +162,24 @@
               <el-form-item><span class="addinputInfo">{{ formobj.isAdjustment }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">调整金额</div>
+              <div class="span-sty">返利调整金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.adjustmentMoney }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">支出费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.itureAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">待支付费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.treatAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">抵顶费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.suppAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">调整说明</div>
@@ -219,10 +233,10 @@ export default {
 </script>
 <style scoped>
 .span-sty {
-  width: 130px !important;
+  width: 140px !important;
 }
 .addinputInfo {
-  margin-left: 120px !important;
+  margin-left: 130px !important;
 }
 </style>
 

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue

@@ -28,8 +28,9 @@
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -44,9 +45,10 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue

@@ -32,8 +32,9 @@
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -48,9 +49,10 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -170,6 +172,7 @@ export default {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
             v = 1
             break
@@ -189,6 +192,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -207,6 +211,7 @@ export default {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
             k = 1
             break
@@ -224,6 +229,7 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''
@@ -263,6 +269,7 @@ export default {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
             v = 1
             break
@@ -282,6 +289,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -300,6 +308,7 @@ export default {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
             k = 1
             break
@@ -317,6 +326,7 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue

@@ -26,8 +26,9 @@
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
             <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -42,9 +43,10 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>

yxt-as-ui/src/views/client/filing/maintenanceEnterprise.vue

@@ -333,7 +333,7 @@ export default {
           userSid: ''
         }
       }
-      this.init()
+      this.getList()
     },
     toAdd() {
       if (this.sids.length === 1) {

yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@@ -344,7 +344,7 @@
                         <el-table-column prop="hours" label="工时数" align="center" />
                         <el-table-column prop="price" label="销售价" align="center" />
                       </el-table>
-                      <pagination v-show="serviceData.length > 0" :total="serviceQuery.total" :page.sync="serviceQuery.current" :limit.sync="serviceQuery.size" class="pagination" @pagination="serviceInput(scope.row.serviceItem)" />
+                      <el-pagination @current-change="currentChangeService($event, scope.row.serviceItem)" :current-page.sync="serviceQuery.current" :page-size="serviceQuery.size" layout="total, prev, pager, next" :total="serviceQuery.total" />
                     </div>
                     <el-input slot="reference" v-model="scope.row.serviceItem" @input="serviceInput(scope.row.serviceItem)" clearable placeholder="项目名称、拼音"/>
                   </el-popover>
@@ -502,7 +502,7 @@
                       <el-table-column prop="aitemCode" label="项目编码" align="center" min-width="150" />
                       <el-table-column prop="price" label="销售金额" align="center" min-width="150" />
                     </el-table>
-                    <pagination v-show="subjoinData.length > 0" :total="subjoinQuery.total" :page.sync="subjoinQuery.current" :limit.sync="subjoinQuery.size" class="pagination" @pagination="subjoinInput(scope.row.aitemName)" />
+                    <el-pagination @current-change="currentChangeSubjoin($event, scope.row.aitemName)" :current-page.sync="subjoinQuery.current" :page-size="subjoinQuery.size" layout="total, prev, pager, next" :total="subjoinQuery.total" />
                   </div>
                   <el-input slot="reference" v-model="scope.row.aitemName" @input="subjoinInput(scope.row.aitemName)" clearable placeholder="项目名称、拼音"/>
                 </el-popover>
@@ -624,7 +624,6 @@
 </template>
 
 <script>
-import Pagination from '@/components/pagination'
 import req from '@/api/operation/repairbill'
 import additionitem from '@/api/basicinformation/additionitem'
 import { selAllByOrgSidPath, selSubjectInfo, getGroupList, typeValues, getListByUseOrgSid, getServiceItemListPage, getInvoicingList } from '@/api/Common/dictcommons'
@@ -634,7 +633,6 @@ import { getStorage } from '@/utils/auth'
 export default {
   name: 'RepairBillAdd',
   components: {
-    Pagination,
     selectCustomer
   },
   data() {
@@ -681,7 +679,7 @@ export default {
       serviceLoading: false,
       serviceQuery: {
         current: 1,
-        size: 5,
+        size: 10,
         total: 0,
         params: {
           sitemName: '',
@@ -695,7 +693,7 @@ export default {
       subjoinLoading: false,
       subjoinQuery: {
         current: 1,
-        size: 5,
+        size: 10,
         total: 0,
         params: {
           aitemName: '',
@@ -1322,6 +1320,10 @@ export default {
         staffNameList: []
       })
     },
+    currentChangeService(val, value) {
+      this.serviceQuery.current = val
+      this.serviceInput(value)
+    },
     serviceInput(value) {
       this.serviceQuery.params.useOrgSid = this.formobj.deptSid
       this.serviceQuery.params.sitemName = value
@@ -1474,6 +1476,10 @@ export default {
         }
       })
     },
+    currentChangeSubjoin(val, value) {
+      this.subjoinQuery.current = val
+      this.subjoinInput(value)
+    },
     subjoinDelete(index) {
       this.formobj.aitemVos.splice(index, 1)
     },

yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue

@@ -119,7 +119,7 @@
                       <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
                       <el-table-column prop="unit" label="单位" align="center" />
                     </el-table>
-                    <pagination v-show="commodityData.length > 0" :total="commodityQuery.total" :page.sync="commodityQuery.current" :limit.sync="commodityQuery.size" class="pagination" @pagination="commodityInput(scope.row.goodsSpuName)" />
+                    <el-pagination @current-change="currentChangeCommodity($event, scope.row.goodsSpuName)" :current-page.sync="commodityQuery.current" :page-size="commodityQuery.size" layout="total, prev, pager, next" :total="commodityQuery.total" />
                   </div>
                   <el-input slot="reference" v-model="scope.row.goodsSpuName" @input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称"/>
                 </el-popover>
@@ -172,7 +172,7 @@
                       <el-table-column prop="aitemCode" label="项目编码" align="center" />
                       <el-table-column prop="price" label="销售金额" align="center" />
                     </el-table>
-                    <pagination v-show="subjoinData.length > 0" :total="subjoinQuery.total" :page.sync="subjoinQuery.current" :limit.sync="subjoinQuery.size" class="pagination" @pagination="subjoinInput(scope.row.aitemName)" />
+                    <el-pagination @current-change="currentChangeSubjoin($event, scope.row.aitemName)" :current-page.sync="subjoinQuery.current" :page-size="subjoinQuery.size" layout="total, prev, pager, next" :total="subjoinQuery.total" />
                   </div>
                   <el-input slot="reference" v-model="scope.row.aitemName" @input="subjoinInput(scope.row.aitemName)" clearable placeholder="项目名称、拼音"/>
                 </el-popover>
@@ -271,7 +271,6 @@
 </template>
 
 <script>
-import Pagination from '@/components/pagination'
 import req from '@/api/operation/salesticket'
 import additionitem from '@/api/basicinformation/additionitem'
 import { selAllByOrgSidPath, selSubjectInfo, typeValues, listPageSales, getOrgSidByPath, getInvoicingList } from '@/api/Common/dictcommons'
@@ -281,7 +280,6 @@ import { getStorage } from '@/utils/auth'
 export default {
   name: 'SalesTicketAdd',
   components: {
-    Pagination,
     selectCustomer
   },
   data() {
@@ -303,7 +301,7 @@ export default {
       commodityLoading: false,
       commodityQuery: {
         current: 1,
-        size: 5,
+        size: 10,
         total: 0,
         params: {
           goodsName: '',
@@ -316,7 +314,7 @@ export default {
       subjoinLoading: false,
       subjoinQuery: {
         current: 1,
-        size: 5,
+        size: 10,
         total: 0,
         params: {
           aitemName: '',
@@ -638,6 +636,10 @@ export default {
         goodsID: '' // 商品ID
       })
     },
+    currentChangeCommodity(val, value) {
+      this.commodityQuery.current = val
+      this.commodityInput(value)
+    },
     commodityInput(value) {
       this.commodityQuery.params.useOrgSid = this.formobj.deptSid
       this.commodityQuery.params.goodsName = value
@@ -719,6 +721,10 @@ export default {
         price: ''
       })
     },
+    currentChangeSubjoin(val, value) {
+      this.subjoinQuery.current = val
+      this.subjoinInput(value)
+    },
     subjoinInput(value) {
       this.subjoinQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.subjoinQuery.params.aitemName = value

yxt-as-ui/src/views/operation/topFitting/topFittingAdd.vue

@@ -59,10 +59,8 @@
                       <el-table-column prop="goodsSkuCode" label="图号" align="center" min-width="120" />
                       <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" min-width="100" />
                       <el-table-column prop="unit" label="单位" align="center" min-width="80" />
-                      <el-table-column prop="cost" label="入库单价" align="center" min-width="130" />
-                      <el-table-column prop="count" label="库存数量" align="center" min-width="120" />
                     </el-table>
-                    <pagination v-show="commodityData.length > 0" :total="commodityQuery.total" :page.sync="commodityQuery.current" :limit.sync="commodityQuery.size" class="pagination" @pagination="commodityInput(scope.row.goodsSpuName)" />
+                    <el-pagination @current-change="currentChangeCommodity($event, scope.row.goodsSpuName)" :current-page.sync="commodityQuery.current" :page-size="commodityQuery.size" layout="total, prev, pager, next" :total="commodityQuery.total" />
                   </div>
                   <el-input slot="reference" v-model="scope.row.goodsSpuName" @input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称"/>
                 </el-popover>
@@ -100,7 +98,7 @@
                       <el-table-column prop="examineHourPrice" label="工时提成" align="center" />
                       <el-table-column prop="salePrice" label="销售价" align="center" />
                     </el-table>
-                    <pagination v-show="serviceData.length > 0" :total="serviceQuery.total" :page.sync="serviceQuery.current" :limit.sync="serviceQuery.size" class="pagination" @pagination="serviceInput(scope.row.sitem)" />
+                    <el-pagination @current-change="currentChangeService($event, scope.row.sitem)" :current-page.sync="serviceQuery.current" :page-size="serviceQuery.size" layout="total, prev, pager, next" :total="serviceQuery.total" />
                   </div>
                   <el-input slot="reference" v-model="scope.row.sitem" @input="serviceInput(scope.row.sitem)" clearable placeholder="项目名称、维修单号"/>
                 </el-popover>
@@ -137,15 +135,11 @@
 </template>
 
 <script>
-import Pagination from '@/components/pagination'
 import { selInvenGoodsByUseOrgSid, tranFive } from '@/api/Common/dictcommons'
 import req from '@/api/operation/topFitting'
 
 export default {
   name: 'TopFittingAdd',
-  components: {
-    Pagination
-  },
   computed: {
     spTotal() {
       let sp = '0'
@@ -178,7 +172,7 @@ export default {
       commodityLoading: false,
       commodityQuery: {
         current: 1,
-        size: 5,
+        size: 10,
         total: 0,
         params: {
           goodsName: '',
@@ -191,7 +185,7 @@ export default {
       serviceLoading: false,
       serviceQuery: {
         current: 1,
-        size: 5,
+        size: 10,
         total: 0,
         params: {
           name: '',
@@ -313,6 +307,10 @@ export default {
         count: '' // 库存数量
       })
     },
+    currentChangeCommodity(val, value) {
+      this.commodityQuery.current = val
+      this.commodityInput(value)
+    },
     commodityInput(value) {
       this.commodityQuery.params.useOrgSid = this.formobj.deptSid
       this.commodityQuery.params.goodsName = value
@@ -364,6 +362,10 @@ export default {
         suppAmout: ''
       })
     },
+    currentChangeService(val, value) {
+      this.serviceQuery.current = val
+      this.serviceInput(value)
+    },
     serviceInput(value) {
       this.serviceQuery.params.useOrgSid = this.formobj.deptSid
       this.serviceQuery.params.name = value

yxt-as-ui/src/views/workFlow/didingpeijianFlow/topFittingEdit.vue

@@ -61,7 +61,7 @@
                       <el-table-column prop="cost" label="入库单价" align="center" min-width="130" />
                       <el-table-column prop="count" label="库存数量" align="center" min-width="120" />
                     </el-table>
-                    <pagination v-show="commodityData.length > 0" :total="commodityQuery.total" :page.sync="commodityQuery.current" :limit.sync="commodityQuery.size" class="pagination" @pagination="commodityInput(scope.row.goodsSpuName)" />
+                    <el-pagination @current-change="currentChangeCommodity($event, scope.row.goodsSpuName)" :current-page.sync="commodityQuery.current" :page-size="commodityQuery.size" layout="total, prev, pager, next" :total="commodityQuery.total" />
                   </div>
                   <el-input slot="reference" v-model="scope.row.goodsSpuName" @input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称"/>
                 </el-popover>
@@ -99,8 +99,7 @@
                       <el-table-column prop="examineHourPrice" label="工时提成" align="center" />
                       <el-table-column prop="salePrice" label="销售价" align="center" />
                     </el-table>
-                    <pagination v-show="serviceData.length > 0" :total="serviceQuery.total" :page.sync="serviceQuery.current" :limit.sync="serviceQuery.size" class="pagination" @pagination="serviceInput(scope.row.sitem)" />
-                  </div>
+                    <el-pagination @current-change="currentChangeService($event, scope.row.sitem)" :current-page.sync="serviceQuery.current" :page-size="serviceQuery.size" layout="total, prev, pager, next" :total="serviceQuery.total" /></div>
                   <el-input slot="reference" v-model="scope.row.sitem" @input="serviceInput(scope.row.sitem)" clearable placeholder="项目名称、维修单号"/>
                 </el-popover>
               </template>
@@ -136,15 +135,11 @@
 </template>
 
 <script>
-import Pagination from '@/components/pagination'
 import { selInvenGoodsByUseOrgSid, tranFive } from '@/api/Common/dictcommons'
 import req from '@/api/operation/topFitting'
 
 export default {
   name: 'TopFittingEdit',
-  components: {
-    Pagination
-  },
   computed: {
     spTotal() {
       let sp = '0'
@@ -177,7 +172,7 @@ export default {
       commodityLoading: false,
       commodityQuery: {
         current: 1,
-        size: 2,
+        size: 10,
         total: 0,
         params: {
           goodsName: '',
@@ -190,7 +185,7 @@ export default {
       serviceLoading: false,
       serviceQuery: {
         current: 1,
-        size: 2,
+        size: 10,
         total: 0,
         params: {
           name: '',
@@ -305,6 +300,10 @@ export default {
         count: '' // 库存数量
       })
     },
+    currentChangeCommodity(val, value) {
+      this.commodityQuery.current = val
+      this.commodityInput(value)
+    },
     commodityInput(value) {
       this.commodityQuery.params.useOrgSid = this.formobj.deptSid
       this.commodityQuery.params.goodsName = value
@@ -356,6 +355,10 @@ export default {
         suppAmout: ''
       })
     },
+    currentChangeService(val, value) {
+      this.serviceQuery.current = val
+      this.serviceInput(value)
+    },
     serviceInput(value) {
       this.serviceQuery.params.useOrgSid = this.formobj.deptSid
       this.serviceQuery.params.name = value

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@@ -429,7 +429,9 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
                     if (StringUtils.isNotBlank(sitemVo.getPrice())) {
                         sitem.setPrice(sitemVo.getPrice());
                         sitem.setSitemPrice(sitemVo.getPrice());
+                        sitem.setAmount(sitemVo.getPrice());
                     }
+                    sitem.setDiscountAmount("0");
                     sitem.setDiscount("10");
                     sitemVos.add(sitem);
                 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml

@@ -22,7 +22,7 @@
 		FROM
 			as_customer_vehicle
 		WHERE
-			customerSid = #{sid}
+			customerSid = #{sid} and isDelete = 0
 	</select>
     <select id="customerList" resultType="com.yxt.anrui.as.api.ascustomervehicle.AsCustomerCrmVehVo">
 		SELECT

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.java

@@ -64,6 +64,6 @@ public interface AsCustomervehMaintenanceMapper extends BaseMapper<AsCustomerveh
 	@Select("select * from as_customerveh_maintenance where vehSid =#{vehSid}")
     AsCustomervehMaintenance fetchByVehSid(@Param("vehSid") String vehSid);
 
-	@Update("update as_customerveh_maintenance set isDelete = '1' where vehSid =#{vehSid}")
+	@Delete("delete from as_customerveh_maintenance where vehSid =#{vehSid}")
 	void delByVehSid(@Param("vehSid") String vehSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml

@@ -101,7 +101,7 @@
                DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime,
                wir.busTypeValue,
                wir.batchNumber,
-               wir.billObjName,
+               wir.manufacturerName billObjName,
                wir.currentCount,
                wir.count,
                wir.unit,

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java

@@ -251,7 +251,7 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
         }
         //客户/供应商名称
         if (StringUtils.isNotBlank(query.getBillObjName())) {
-            qw.like("wir.billObjName", query.getBillObjName());
+            qw.like("wir.manufacturerName", query.getBillObjName());
         }
         //批次号
         if (StringUtils.isNotBlank(query.getBatchNumber())) {
@@ -276,8 +276,10 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
         IPage<WmsInventoryRecord> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsInventoryRecordsVo> pagging = baseMapper.listPage(page, qw);
         for (WmsInventoryRecordsVo record : pagging.getRecords()) {
-            SysUserVo sysUserVo = sysUserFeign.fetchBySid(record.getCreateBySid()).getData();
-            record.setCreateByName(sysUserVo.getName());
+            if (StringUtils.isNotBlank(record.getCreateBySid())) {
+                SysUserVo sysUserVo = sysUserFeign.fetchBySid(record.getCreateBySid()).getData();
+                record.setCreateByName(sysUserVo.getName());
+            }
         }
         PagerVo<WmsInventoryRecordsVo> p = PagerUtil.pageToVo(pagging, null);
         return p;