Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml

@@ -80,8 +80,8 @@
 
     <select id="selectByVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.ReturnPushVo">
         SELECT ba.billNo,bo.materialCode
-        FROM base_vehicle_out bo
+        FROM anrui_base.base_vehicle_out bo
-                 left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
+                 left join anrui_base.base_vehicle_out_apply ba on ba.sid = bo.mainSid
         where bo.materialTypeKey = '001' and bo.isDelete = 0 and bo.vinSid = #{vehSid}
     </select>
 </mapper>

anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@@ -34,14 +34,6 @@ export function getListOrg(data) {
     params: data
   })
 }
-// 根据登陆人sid查询分公司sid（正确的）
-export function getPathSidByUserSid(data) {
-  return request({
-    url: '/portal/v1/sysstafforg/getPathSidByUserSid',
-    method: 'get',
-    params: data
-  })
-}
 
 // 根据当前登录人orgSidPath(全路径sid)查询分公司
 export function getOrgSidByPath(data) {
@@ -59,14 +51,7 @@ export function fetchBySid(sid) {
     method: 'get'
   })
 }
-// 获取厂商可搜索下拉列表
+
-export function changShang(data) {
-  return request({
-    url: '/base/v1/basemanufacturer/namesDown',
-    method: 'get',
-    params: data
-  })
-}
 // 根据当前登录用户的分公司Sid获取该分公司下的厂商
 export function selectByOrgSid(data) {
   return request({
@@ -75,14 +60,7 @@ export function selectByOrgSid(data) {
     params: data
   })
 }
-// 根据分公司sid获取该分公司下的所有供应商以及厂商
+
-export function getGysByOrgSid(data) {
-  return request({
-    url: '/base/v1/basemanufacturer/getGysByOrgSid',
-    method: 'post',
-    params: data
-  })
-}
 // 获取该分公司下的开户账号
 export function selectAccountByUseOrgSid(data) {
   return request({
@@ -242,3 +220,12 @@ export function getInvoicingList(data) {
   })
 }
 
+// 根据当前登录用户的分公司sid以及供应商分类获取供营商、开户行、银行账号(供应链下)
+export function getKhhByOrgSid(data) {
+  return request({
+    url: '/base/v1/basemanufacturer/getKhhByOrgSid',
+    method: 'post',
+    params: data
+  })
+}
+

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@@ -155,16 +155,23 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column label="厂家回款通路" align="center" width="200">
+              <el-table-column v-if="formobj.costTypeKey == '001'" label="厂家回款通路" align="center" width="200">
                 <template slot-scope="scope">
                   <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
                     <el-option v-for="item in actualPay_list" :key="item.actualPaySid" :label="item.actualPay" :value="item.actualPay"/>
                   </el-select>
                 </template>
               </el-table-column>
+              <el-table-column v-if="formobj.costTypeKey == '002' || formobj.costTypeKey == '003'" label="收款账号" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.receivingAccount" placeholder="请选择" filterable @change="changeReceivingAccount($event, scope.row)">
+                    <el-option v-for="item in receivingAccount_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="formobj.costTypeKey == '001'" prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
               <el-table-column prop="bank" label="开户行" align="center" width="140" />
-              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)" @keydown.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)"></el-input>
@@ -361,7 +368,7 @@
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import { typeValues, getOrgSidByPath, getInvoicingList, brandDown, selectNameByOrg, getTypeValueList } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, getOrgSidByPath, getInvoicingList, brandDown, selectNameByOrg, getTypeValueList, getKhhByOrgSid } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
 import trailerCar from './relation/trailerCar'
 import top from './relation/top'
@@ -400,6 +407,7 @@ export default {
       payCompany_list: [],
       payment_list: [],
       actualPay_list: [],
+      receivingAccount_list: [],
       formobj: {
         billNo: '', // 申请编号
         name: '', // 申请人姓名
@@ -481,11 +489,6 @@ export default {
           this.costType_list = res.data
         }
       })
-      getTypeValueList({ type: 'payCostType', groupNum: '001' }).then((res) => {
-        if (res.success) {
-          this.costTitle_list = res.data
-        }
-      })
       getInvoicingList({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.payCompany_list = res.data
@@ -542,6 +545,30 @@ export default {
               this.actualPay_list = res.data
             }
           })
+          if (this.formobj.costTypeKey !== '' && this.formobj.costTypeKey !== '004') {
+            getTypeValueList({ type: 'payCostType', groupNum: this.formobj.costTypeKey }).then((res) => {
+              if (res.success) {
+                this.costTitle_list = res.data
+              }
+            })
+          } else {
+            this.costTitle_list = []
+          }
+          if (this.formobj.costTypeKey === '002' || this.formobj.costTypeKey === '003') {
+            let type = ''
+            if (this.formobj.costTypeKey === '002') {
+              type = '0002'
+            } else if (this.formobj.costTypeKey === '003') {
+              type = '0003'
+            }
+            getKhhByOrgSid({ orgSid: this.formobj.useOrgSid, supplierType: type }).then((resp) => {
+              if (resp.success) {
+                this.receivingAccount_list = resp.data
+              }
+            })
+          } else {
+            this.receivingAccount_list = []
+          }
         }
       }).catch((e) => {
         this.formobj = row
@@ -576,9 +603,35 @@ export default {
         if (this.formobj.costTypeKey !== '001') {
           this.formobj.isVeh = '0'
         }
+        this.formobj.detailsList = []
       } else {
         this.formobj.costTypeKey = ''
         this.formobj.isVeh = ''
+        this.formobj.detailsList = []
+      }
+      if (this.formobj.costTypeKey !== '' && this.formobj.costTypeKey !== '004') {
+        getTypeValueList({ type: 'payCostType', groupNum: this.formobj.costTypeKey }).then((res) => {
+          if (res.success) {
+            this.costTitle_list = res.data
+          }
+        })
+      } else {
+        this.costTitle_list = []
+      }
+      if (this.formobj.costTypeKey === '002' || this.formobj.costTypeKey === '003') {
+        let type = ''
+        if (this.formobj.costTypeKey === '002') {
+          type = '0002'
+        } else if (this.formobj.costTypeKey === '003') {
+          type = '0003'
+        }
+        getKhhByOrgSid({ orgSid: this.formobj.useOrgSid, supplierType: type }).then((resp) => {
+          if (resp.success) {
+            this.receivingAccount_list = resp.data
+          }
+        })
+      } else {
+        this.receivingAccount_list = []
       }
     },
     isVehChange(val) {
@@ -615,7 +668,6 @@ export default {
     backClosingPayment(value) {
       this.viewState = 1
       value = JSON.parse(JSON.stringify(value))
-      console.log(value, 77)
       value.forEach((e) => {
         this.formobj.eveList.push({
           sid: '', // sid
@@ -696,6 +748,17 @@ export default {
         row.receivingAccount = ''
       }
     },
+    changeReceivingAccount(value, row) {
+      const choose = this.receivingAccount_list.filter((item) => item.bankAccount === value)
+      if (choose.length > 0 && choose !== null) {
+        row.receiveCompany = choose[0].manufacturerName
+        row.bank = choose[0].depositBank
+        row.receivingAccount = choose[0].bankAccount
+      } else {
+        row.bank = ''
+        row.receivingAccount = ''
+      }
+    },
     handleAddPayment(row, index) {
       if (row.paymentType === '') {
         this.$message({ showClose: true, type: 'error', message: '付款方式不能为空' })
@@ -893,6 +956,19 @@ export default {
       }
     },
     saveOrUpdate() {
+      if (this.formobj.costTypeKey !== '004' && this.formobj.costTypeKey !== '') {
+        if (this.formobj.detailsList.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '付款明细列表不能为空' })
+          return
+        } else {
+          for (var i = 0; i < this.formobj.detailsList.length; i++) {
+            if (this.formobj.detailsList[i].payAccount === '') {
+              this.$message({ showClose: true, type: 'error', message: '付款明细列表中付款金额不能为空' })
+              return
+            }
+          }
+        }
+      }
       if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') {
         if (this.formobj.vehicleList.length === 0) {
           this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })
@@ -925,6 +1001,19 @@ export default {
       })
     },
     submitVehicleApply() {
+      if (this.formobj.costTypeKey !== '004' && this.formobj.costTypeKey !== '') {
+        if (this.formobj.detailsList.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '付款明细列表不能为空' })
+          return
+        } else {
+          for (var i = 0; i < this.formobj.detailsList.length; i++) {
+            if (this.formobj.detailsList[i].payAccount === '') {
+              this.$message({ showClose: true, type: 'error', message: '付款明细列表中付款金额不能为空' })
+              return
+            }
+          }
+        }
+      }
       if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') {
         if (this.formobj.vehicleList.length === 0) {
           this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue

@@ -87,10 +87,10 @@
               <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
               <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
               <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
-              <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column v-if="formobj.costTypeKey == '001'" prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
               <el-table-column prop="bank" label="开户行" align="center" width="140" />
-              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
               <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
               <el-table-column label="关联付款详情" align="center" width="120">

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue

@@ -89,10 +89,10 @@
               <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
               <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
               <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
-              <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column v-if="formobj.costTypeKey == '001'" prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
               <el-table-column prop="bank" label="开户行" align="center" width="140" />
-              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
               <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
               <el-table-column label="关联付款详情" align="center" width="120">

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@@ -154,16 +154,23 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column label="厂家回款通路" align="center" width="200">
+              <el-table-column v-if="formobj.costTypeKey == '001'" label="厂家回款通路" align="center" width="200">
                 <template slot-scope="scope">
                   <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
                     <el-option v-for="item in actualPay_list" :key="item.actualPaySid" :label="item.actualPay" :value="item.actualPay"/>
                   </el-select>
                 </template>
               </el-table-column>
+              <el-table-column v-if="formobj.costTypeKey == '002' || formobj.costTypeKey == '003'" label="收款账号" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.receivingAccount" placeholder="请选择" filterable @change="changeReceivingAccount($event, scope.row)">
+                    <el-option v-for="item in receivingAccount_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="formobj.costTypeKey == '001'" prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
               <el-table-column prop="bank" label="开户行" align="center" width="140" />
-              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)" @keydown.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)"></el-input>
@@ -360,7 +367,7 @@
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import { typeValues, brandDown, selectNameByOrg, getInvoicingList, getTypeValueList } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, brandDown, selectNameByOrg, getInvoicingList, getTypeValueList, getKhhByOrgSid } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
 import trailerCar from './relation/trailerCar'
 import top from './relation/top'
@@ -399,6 +406,7 @@ export default {
       payCompany_list: [],
       payment_list: [],
       actualPay_list: [],
+      receivingAccount_list: [],
       formobj: {
         billNo: '', // 申请编号
         name: '', // 申请人姓名
@@ -497,11 +505,6 @@ export default {
           this.costType_list = res.data
         }
       })
-      getTypeValueList({ type: 'payCostType', groupNum: '001' }).then((res) => {
-        if (res.success) {
-          this.costTitle_list = res.data
-        }
-      })
       typeValues({ type: 'paymentType' }).then((res) => {
         if (res.success) {
           this.payment_list = res.data
@@ -533,6 +536,30 @@ export default {
               this.carBrand_list = res.data
             }
           })
+          if (this.formobj.costTypeKey !== '' && this.formobj.costTypeKey !== '004') {
+            getTypeValueList({ type: 'payCostType', groupNum: this.formobj.costTypeKey }).then((res) => {
+              if (res.success) {
+                this.costTitle_list = res.data
+              }
+            })
+          } else {
+            this.costTitle_list = []
+          }
+          if (this.formobj.costTypeKey === '002' || this.formobj.costTypeKey === '003') {
+            let type = ''
+            if (this.formobj.costTypeKey === '002') {
+              type = '0002'
+            } else if (this.formobj.costTypeKey === '003') {
+              type = '0003'
+            }
+            getKhhByOrgSid({ orgSid: this.formobj.useOrgSid, supplierType: type }).then((resp) => {
+              if (resp.success) {
+                this.receivingAccount_list = resp.data
+              }
+            })
+          } else {
+            this.receivingAccount_list = []
+          }
         }
       }).catch((e) => {
         this.formobj = {}
@@ -567,9 +594,35 @@ export default {
         if (this.formobj.costTypeKey !== '001') {
           this.formobj.isVeh = '0'
         }
+        this.formobj.detailsList = []
       } else {
         this.formobj.costTypeKey = ''
         this.formobj.isVeh = ''
+        this.formobj.detailsList = []
+      }
+      if (this.formobj.costTypeKey !== '' && this.formobj.costTypeKey !== '004') {
+        getTypeValueList({ type: 'payCostType', groupNum: this.formobj.costTypeKey }).then((res) => {
+          if (res.success) {
+            this.costTitle_list = res.data
+          }
+        })
+      } else {
+        this.costTitle_list = []
+      }
+      if (this.formobj.costTypeKey === '002' || this.formobj.costTypeKey === '003') {
+        let type = ''
+        if (this.formobj.costTypeKey === '002') {
+          type = '0002'
+        } else if (this.formobj.costTypeKey === '003') {
+          type = '0003'
+        }
+        getKhhByOrgSid({ orgSid: this.formobj.useOrgSid, supplierType: type }).then((resp) => {
+          if (resp.success) {
+            this.receivingAccount_list = resp.data
+          }
+        })
+      } else {
+        this.receivingAccount_list = []
       }
     },
     isVehChange(val) {
@@ -606,7 +659,6 @@ export default {
     backClosingPayment(value) {
       this.viewState = 1
       value = JSON.parse(JSON.stringify(value))
-      console.log(value, 77)
       value.forEach((e) => {
         this.formobj.eveList.push({
           sid: '', // sid
@@ -687,6 +739,17 @@ export default {
         row.receivingAccount = ''
       }
     },
+    changeReceivingAccount(value, row) {
+      const choose = this.receivingAccount_list.filter((item) => item.bankAccount === value)
+      if (choose.length > 0 && choose !== null) {
+        row.receiveCompany = choose[0].manufacturerName
+        row.bank = choose[0].depositBank
+        row.receivingAccount = choose[0].bankAccount
+      } else {
+        row.bank = ''
+        row.receivingAccount = ''
+      }
+    },
     handleAddPayment(row, index) {
       if (row.paymentType === '') {
         this.$message({ showClose: true, type: 'error', message: '付款方式不能为空' })
@@ -884,6 +947,19 @@ export default {
       }
     },
     saveOrUpdate() {
+      if (this.formobj.costTypeKey !== '004' && this.formobj.costTypeKey !== '') {
+        if (this.formobj.detailsList.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '付款明细列表不能为空' })
+          return
+        } else {
+          for (var i = 0; i < this.formobj.detailsList.length; i++) {
+            if (this.formobj.detailsList[i].payAccount === '') {
+              this.$message({ showClose: true, type: 'error', message: '付款明细列表中付款金额不能为空' })
+              return
+            }
+          }
+        }
+      }
       if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') {
         if (this.formobj.vehicleList.length === 0) {
           this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })
@@ -923,6 +999,19 @@ export default {
       })
     },
     submitVehicleApply() {
+      if (this.formobj.costTypeKey !== '004' && this.formobj.costTypeKey !== '') {
+        if (this.formobj.detailsList.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '付款明细列表不能为空' })
+          return
+        } else {
+          for (var i = 0; i < this.formobj.detailsList.length; i++) {
+            if (this.formobj.detailsList[i].payAccount === '') {
+              this.$message({ showClose: true, type: 'error', message: '付款明细列表中付款金额不能为空' })
+              return
+            }
+          }
+        }
+      }
       if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') {
         if (this.formobj.vehicleList.length === 0) {
           this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue

@@ -87,10 +87,10 @@
               <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
               <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
               <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
-              <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column v-if="formobj.costTypeKey == '001'" prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
               <el-table-column prop="bank" label="开户行" align="center" width="140" />
-              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
               <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
               <el-table-column label="关联付款详情" align="center" width="120">

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -463,10 +463,16 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     sitem.setBillSid(sid);
                     AsServiceItem item = asServiceItemService.fetchBySid(sitemVo.getServiceItemSid());
                     if (null != item) {
+                        BigDecimal examineHourPrice = BigDecimal.ZERO;//工时提成
+                        BigDecimal cost = BigDecimal.ZERO;//外协成本
                         if (null != item.getCost()) {
-                            sitem.setCost(item.getCost());
+                            cost = item.getCost();
-                            sitem.setCostTotal(item.getCost());
                         }
+                        if (null != item.getExamineHourPrice()) {
+                            examineHourPrice = item.getExamineHourPrice();
+                        }
+                        sitem.setCost(cost.add(examineHourPrice));
+                        sitem.setCostTotal(cost.add(examineHourPrice));
                     }
                     sitem.setBillBusTypeKey("002");
                     sitem.setBillBusTypeValue("维修项目");

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml

@@ -9,6 +9,7 @@
         wsb.sourceBillNo,
         case wsb.billState
         when 0 then '新建'
+        when 2 then '部分上架'
         when 1 then '已完成' end as billState
         from wms_shelf_bill wsb
         LEFT JOIN anrui_portal.sys_organization as s ON wsb.deptSid = s.sid
@@ -27,6 +28,7 @@
                wsb.sourceBillSid,
                case wsb.billState
                    when 0 then '新建'
+                   when 2 then '部分上架'
                    when 1 then '已完成'
                    end                                 as billState,
                wsb.createOrgSid,