Merge remote-tracking branch 'origin/master'

2 years ago · 1bb3a1a666
4 changed files with 92 additions and 32 deletions
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@ -16,6 +16,7 @@ import com.yxt.anrui.base.api.basevehicleout.*;
 import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
 import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
 import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.anrui.base.biz.basemiddleman.BaseMiddlemanService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
@ -24,11 +25,10 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService;
 import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
+import com.yxt.anrui.base.biz.commoncontract.CommonContractService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@ -97,6 +97,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
    @Autowired
    private BaseVehicleBrandService baseVehicleBrandService;
+    @Autowired
+    private CommonContractService commonContractService;

    public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
        log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto));
@ -139,17 +141,53 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
            String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
            Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
            if (!aBoolean) {
-                //查询合同编号和车辆sid客户的临时编码
-                ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getCustomerNo(),dto.getVinSid());
-                if(!stringResultBean.getSuccess()){
-                    return rb.setMsg("请检查合同是否审核");
-                }
-                String temporaryNo = stringResultBean.getData();
+                //查询合同是否存在
+                ResultBean<CommonContract> commonContract = commonContractService.selectByNo(dto.getConcatNo());
+                if(commonContract.getSuccess()){
+                    //查询合同编号和车辆sid客户的临时编码
+                    ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getCustomerNo(),dto.getVinSid());
+                    if(!stringResultBean.getSuccess()){
+                        return rb.setMsg("请检查合同是否审核");
+                    }
+                    String temporaryNo = stringResultBean.getData();
 //                Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
-                Boolean aBoolean1 = finKingDeeFeign.customerExistState(temporaryNo).getData();
-                if (!aBoolean1) {
-                    Boolean aBoolean2 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
-                    if(!aBoolean2){
+                    Boolean aBoolean1 = finKingDeeFeign.customerExistState(temporaryNo).getData();
+                    if (!aBoolean1) {
+                        Boolean aBoolean2 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+                        if(!aBoolean2){
+                            List<BdCustomer> bdCustomers = new ArrayList<>();
+                            BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+                            if (data != null){
+                                bdCustomer.setTOrgIds(data.getOrgCode());
+                            }else {
+                                bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+                            }
+                            bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
+                            String FNumber1 = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
+                            if (FNumber1.length() > 30) {
+                                FNumber1 = FNumber1.substring(0, 30);
+                                bdCustomer.setFNumber(FNumber1);
+                            } else {
+                                bdCustomer.setFNumber(FNumber1);
+                            }
+                            bdCustomer.setFShortName(dto.getConcatNo());
+                            bdCustomers.add(bdCustomer);
+                            finKingDeeFeign.draftBdCustomers(bdCustomers);
+                            dto.setCwCustomerNo(bdCustomer.getFNumber());
+                        }else{
+                            b = true;
+                            return rb.success().setData(b);
+                        }
+                    } else {
+                   /* b = true;
+                    return rb.success().setData(b);*/
+                        //查询已选择的收款单的车架号是否存在，若存在则修改，不存在则不用管
+                        //临时号截取最后两位
+                        ResultBean resultBean = finCollectionConfirmationFeign.updateVin(dto.getVinNo(),dto.getConcatNo(),temporaryNo.substring(temporaryNo.length()-2));
+                    }
+                }else{
+                    Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();
+                    if (!aBoolean1) {
                        List<BdCustomer> bdCustomers = new ArrayList<>();
                        BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
                        if (data != null){
@ -169,17 +207,12 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                        bdCustomers.add(bdCustomer);
                        finKingDeeFeign.draftBdCustomers(bdCustomers);
                        dto.setCwCustomerNo(bdCustomer.getFNumber());
-                    }else{
+                    } else {
                        b = true;
                        return rb.success().setData(b);
                    }
-                } else {
-                   /* b = true;
-                    return rb.success().setData(b);*/
-                    //查询已选择的收款单的车架号是否存在，若存在则修改，不存在则不用管
-                    //临时号截取最后两位
-                    ResultBean resultBean = finCollectionConfirmationFeign.updateVin(dto.getVinNo(),dto.getConcatNo(),temporaryNo.substring(temporaryNo.length()-2));
                }
+
            }
            //修改客户简称为合同编号
            List<BdCustomer> bdCustomers = new ArrayList<>();
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@ -2327,6 +2327,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
    public ResultBean<CommonContract> selectByNo(String contractNo) {
        ResultBean<CommonContract> rb = ResultBean.fireFail();
        CommonContract commonContract = baseMapper.selectByNo(contractNo);
+        if(commonContract == null){
+            return rb;
+        }
        return rb.success().setData(commonContract);
    }

--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue
@ -114,6 +114,19 @@
    <el-dialog :visible.sync="dialogVisible" width="40%" :close-on-click-modal="false" :show-close="false">
      <el-form class="formadd">
        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="8" class="tleftb">
+            <span>付款方式</span>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item>
+              <el-radio-group @input="handleIsPayment" v-model="isPayment">
+                <el-radio label="1">全款</el-radio>
+                <el-radio label="0">贷款</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="isPayment === '0'">
          <el-col :span="8" class="tleftb">
            <span>是否确定车架号</span>
          </el-col>
@ -126,7 +139,7 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row v-show="isTerminal === '0'">
+        <el-row v-show="(isPayment === '1') || (isPayment === '0' && isTerminal === '0')">
          <el-col :span="8" class="tleftb">
            <span>采购系统</span>
          </el-col>
@ -179,6 +192,7 @@ export default {
  data() {
    return {
      btndisabled: false,
+      isPayment: '',
      isTerminal: '',
      orgName: '',
      orgCode: '',
@ -337,18 +351,13 @@ export default {
      this.sids = aa
      this.multipleSelection = bb
    },
+    handleIsPayment() {
+      this.isTerminal = ''
+      this.orgCode = ''
+      this.orgName = ''
+    },
    handleIsTerminal(value) {
-      if (value === '0') {
-        getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
-          if (resp.success && resp.data !== null) {
-            fetchDetailsByUseOrgSid(resp.data).then((res) => {
-              if (res.success) {
-                this.org_list = res.data
-              }
-            })
-          }
-        })
-      } else {
+      if (value === '1') {
        this.orgCode = ''
        this.orgName = ''
      }
@ -358,6 +367,10 @@ export default {
      this.orgCode = choose[0].orgCode
    },
    handleConfirm() {
+      if (this.isPayment === '') {
+        this.$message({ showClose: true, type: 'error', message: '付款方式请选择是或否' })
+        return
+      }
      if (this.isTerminal === '') {
        this.$message({ showClose: true, type: 'error', message: '是否确定车架号请选择是或否' })
        return
@ -367,7 +380,7 @@ export default {
        this.handleColse()
        this.$refs['divVehicle'].showData(this.multipleSelection[0].name, this.multipleSelection[0].sid)
      }
-      if (this.isTerminal === '0') {
+      if ((this.isPayment === '1') || (this.isPayment === '0' && this.isTerminal === '0')) {
        if (this.orgCode === '') {
          this.$message({ showClose: true, type: 'error', message: '采购系统不能为空' })
          return
@ -390,6 +403,7 @@ export default {
    handleColse() {
      this.dialogVisible = false
      this.isTerminal = ''
+      this.isPayment = ''
      this.orgName = ''
      this.orgCode = ''
    },
@ -425,6 +439,15 @@ export default {
        return
      }
      this.dialogVisible = true
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+        if (resp.success && resp.data !== null) {
+          fetchDetailsByUseOrgSid(resp.data).then((res) => {
+            if (res.success) {
+              this.org_list = res.data
+            }
+          })
+        }
+      })
    },
    doClose() {
      this.$store.dispatch('tagsView/delView', this.$route)
--- a/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue
@ -47,6 +47,7 @@
        </div>
        <div class="">
          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column width="50" type="selection" align="center"/>
            <el-table-column fixed label="序号" width="60" type="index" :index="indexMethod" align="center"/>
            <el-table-column fixed label="操作" width="100" align="center">
              <template slot-scope="scope">