From 034de84f3f3466d5a2bbd1c8abc0981cf101d7b8 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 6 Feb 2023 10:07:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E5=A2=9E=E5=8A=A0=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kehuguanli/kehuchaxun/kehuchaxun.vue      | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue
index 8dc988ffb4..6157c804aa 100644
--- 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)

From 467e3587ba807a28a8d814cb152501674612734d Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 6 Feb 2023 10:28:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue b/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue
index ec71136237..27ded21c26 100644
--- 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">

From def0c440067c3db8d6121c1d0a71c7da805558f7 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 6 Feb 2023 10:39:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=85=A8=E6=AC=BE?=
 =?UTF-8?q?=E5=A4=96=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basevehicleout/BaseVehicleOutService.java | 71 ++++++++++++++-----
 .../commoncontract/CommonContractService.java |  3 +
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git 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
index ae694054be..7cb0e4efdd 100644
--- 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<>();
diff --git 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
index c130cbcd76..46f59cbb10 100644
--- 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);
     }