Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -370,6 +370,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                         String customerNumber = "";
                         //判断财务系统是否有客户
                         Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                        String linkNo = "";
                         if (!aBoolean) {
                             //  List<BdCustomer> bdCustomers = new ArrayList<>();
                             BdCustomer bdCustomer = new BdCustomer();
@@ -378,7 +379,6 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                             BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
                             bdCustomer.setTOrgIds(data.getOrgCode());
                             if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                                String linkNo = "";
                                 if (busSalesOrderVehicle.getLinkNo().length() > 8) {
                                     linkNo = busSalesOrderVehicle.getLinkNo().substring(linkNo.length() - 8);
                                 } else {
@@ -396,6 +396,13 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                         } else {
                             customerNumber = busSalesOrderVehicle.getTemporaryNo();
                         }
+                        String loanContractSid = busSalesOrderVehicle.getLoanContractSid();
+                        if (StringUtils.isNotBlank(loanContractSid)) {
+                            BusSalesOrderLoancontract loancontract = fetchBySid(loanContractSid);
+                            if (null != loancontract) {
+                                creditResult.setBillNo(loancontract.getLoanContractNo() + linkNo);
+                            }
+                        }
                         creditResult.setCommUnit(customerNumber);
                         SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(salesOrder.getUseOrgSid()).getData();
                         creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java

@@ -32,7 +32,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
 //        if (creditResult.getBillNo() == null) {
 //            return rb.setMsg("单据编号不能为空");
 //        }
-//        map_fEntityModel_.put("FBillNo", creditResult.getBillNo());
+        map_fEntityModel_.put("FBillNo", creditResult.getBillNo());
         //业务日期
         if (creditResult.getBussDate() == null) {
             return rb.setMsg("业务日期不能为空");
@@ -40,6 +40,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
         map_fEntityModel_.put("FDATE", creditResult.getBussDate());
         //到期日期
         map_fEntityModel_.put("FENDDATE_H", creditResult.getBussDate());
+        map_fEntityModel_.put("FACCNTTIMEJUDGETIME", creditResult.getBussDate());
         //客户
         if (creditResult.getCommUnit() == null) {
             return rb.setMsg("客户编码不能为空");

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json

@@ -3,7 +3,7 @@
   "FBillTypeID": {
     "FNUMBER": "QTYSD01_SYS"
   },
-  "FBillNo": "",
+  "FBillNo": "@KD_FBillNo",
   "FDATE": "@KD_FDATE",
   "FENDDATE_H": "@KD_FENDDATE_H",
   "FISINIT": "false",
@@ -36,7 +36,7 @@
   "FSALEERID": {
     "FNumber": ""
   },
-  "FACCNTTIMEJUDGETIME": "1900-01-01",
+  "FACCNTTIMEJUDGETIME": "@KD_FACCNTTIMEJUDGETIME",
   "FSettleTypeID": {
     "FNumber": ""
   },

anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationAdd.vue

@@ -32,7 +32,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <div class="span-sty">车牌号</div>
+            <div class="span-sty"><span class="icon">*</span>车牌号</div>
             <el-form-item>
               <el-input v-model="formobj.vehicleMark" class="addinputInfo addinputw" clearable placeholder=""/>
             </el-form-item>
@@ -158,6 +158,10 @@ export default {
       })
     },
     saveOrUpdate() {
+      if (this.formobj.vehicleMark === '') {
+        this.$message({ showClose: true, type: 'error', message: '车牌号不能为空' })
+        return
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -172,6 +176,10 @@ export default {
       })
     },
     submit() {
+      if (this.formobj.vehicleMark === '') {
+        this.$message({ showClose: true, type: 'error', message: '车牌号不能为空' })
+        return
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealMapper.xml

@@ -7,7 +7,7 @@
         SELECT
         li.`sid`,
         li.state,
-        bo.createDate,
+        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
         li.`resHomeVisDate`,
         li.`homeVisAddress`,
         bo.`useOrgName`,

anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue

@@ -356,6 +356,7 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      this.init()
       this.dialogStatus = 'edit'
       this.isShow = row.isShow
       req.fetchBySid(row.sid).then(resp => {