Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java

@@ -68,7 +68,7 @@ public interface BaseVehicleCertificateFeign {
 
     @ApiOperation("单独维护车架号")
     @PostMapping("/updateVinNo")
-    public ResultBean updateVinNo(@RequestParam("vinNo") String vinNo, @RequestParam("sid") String sid);
+    public ResultBean updateVinNo(@RequestParam("vinNo") String vinNo,@RequestParam("smRemarks") String smRemarks, @RequestParam("sid") String sid);
 
     /**
      * 根据前台传来的sid的集合进行批量删除

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java

@@ -43,7 +43,7 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica
     }
 
     @Override
-    public ResultBean updateVinNo(String vinNo, String sid) {
+    public ResultBean updateVinNo(String vinNo, String smRemarks, String sid) {
         return null;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@@ -104,10 +104,10 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
     HandoverCertVo getCertificateInfoOne(@Param("vinSid") String vinSid);
 
     @Update("update base_vehicle_certificate set transferStateKey = #{tranKey},transferStateValue = #{tranValue} where sid = #{sid}")
-    void updateTransferState(@Param("sid") String sid,@Param("tranKey") String tranKey,@Param("tranValue") String tranValue);
+    void updateTransferState(@Param("sid") String sid, @Param("tranKey") String tranKey, @Param("tranValue") String tranValue);
 
     BaseVehicleCertificate selectByVinSid(String vinSid);
 
     @Update("update base_vehicle_certificate set remarks = #{remarks},vinNo = #{vinNo} where sid = #{sid}")
-    void updateVinNo(@Param("vinNo") String vinNo,@Param("remarks") String remarks,@Param("sid") String sid);
+    void updateVinNo(@Param("vinNo") String vinNo, @Param("remarks") String remarks, @Param("sid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@@ -69,6 +69,7 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
 
     @Autowired
     private FileUploadComponent fileUploadComponent;
+
     /**
      * 台账信息条件分页列表
      *
@@ -165,7 +166,7 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
                 }
                 String smRemarks = dto.getSmRemarks();
                 if (!vinNo.equals(vinNo1)) {
-                    remarks += smRemarks + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
+                    remarks += smRemarks + "由" + baseVehicleCertificate.getVinNo() + "改成" + vinNo;
                 }
                 baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid());
                 dto.setRemarks(remarks);
@@ -178,8 +179,8 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
     }
 
     @Override
-    public ResultBean updateVinNo(String vinNo, String sid) {
-        return baseVehicleCertificateService.updateVinNo(vinNo,sid);
+    public ResultBean updateVinNo(String vinNo, String smRemarks, String sid) {
+        return baseVehicleCertificateService.updateVinNo(vinNo, smRemarks, sid);
     }
 
     /**

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basevehiclecertificate;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@@ -70,6 +71,7 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
     private BaseVehicleAppendixService baseVehicleAppendixService;
     @Autowired
     private BaseVehicleService baseVehicleService;
+
     /**
      * 台账信息条件分页查询
      *
@@ -252,8 +254,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
     public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid) {
         ResultBean<HandoverCertVo> rb = ResultBean.fireFail();
         HandoverCertVo handoverCertVo = baseMapper.getCertificateInfoOne(vinSid);
-        if(handoverCertVo != null){
-            if(StringUtils.isNotBlank(handoverCertVo.getCertificatePhoto())){
+        if (handoverCertVo != null) {
+            if (StringUtils.isNotBlank(handoverCertVo.getCertificatePhoto())) {
                 List<String> photoList = Arrays.asList(handoverCertVo.getCertificatePhoto().split(","));
                 handoverCertVo.setCertificatePhotoList(photoList);
             }
@@ -270,10 +272,10 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
         for (String sid : sids) {
             BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid);
-            if (CertificState.CertificateState.CERSTATE_ZS.getCode().equals(baseVehicleCertificate.getCertificateState()) && CertificState.TransferState.TRANSTATE_DYJ.getCode().equals(baseVehicleCertificate.getTransferStateKey())){
+            if (CertificState.CertificateState.CERSTATE_ZS.getCode().equals(baseVehicleCertificate.getCertificateState()) && CertificState.TransferState.TRANSTATE_DYJ.getCode().equals(baseVehicleCertificate.getTransferStateKey())) {
                 String vehicleSid = baseVehicleCertificate.getVehicleSid();
                 BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.selNewComSaleByVehSid(vehicleSid).getData();
-                if (busSalesOrderDetailsVo == null){
+                if (busSalesOrderDetailsVo == null) {
                     return rb.setMsg("暂无销售订单，不可移交");
                 }
                 String staffSid = busSalesOrderDetailsVo.getStaffSid();
@@ -303,13 +305,13 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
                 //移交附件
                 List<String> transferFiles = baseVehicleAppendixService.selectList(sid);
                 String transferFilesString = "";
-                if (!transferFiles.isEmpty()){
+                if (!transferFiles.isEmpty()) {
                     for (String transferFile : transferFiles) {
                         transferFilesString = transferFilesString + transferFile + ",";
                     }
                 }
-                if (StringUtils.isNotBlank(transferFilesString)){
-                    busTransferRecordsDto.setTransferFiles(transferFilesString.substring(0,transferFilesString.length() - 1));
+                if (StringUtils.isNotBlank(transferFilesString)) {
+                    busTransferRecordsDto.setTransferFiles(transferFilesString.substring(0, transferFilesString.length() - 1));
                 }
                 busTransferRecordsFeign.saveRecords(busTransferRecordsDto);
                 //消息推送
@@ -327,8 +329,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
                 messagePushTransferDto.setReceiveSids(sysUserVo1.getSid());
                 messagePushTransferDto.setReceiveNames(sysUserVo1.getName());
                 messageFeign.pushTransferMessage(messagePushTransferDto);
-                baseMapper.updateTransferState(sid, CertificState.TransferState.TRANSTATE_YJZ.getCode(),CertificState.TransferState.TRANSTATE_YJZ.getRemarks());
-            }else {
+                baseMapper.updateTransferState(sid, CertificState.TransferState.TRANSTATE_YJZ.getCode(), CertificState.TransferState.TRANSTATE_YJZ.getRemarks());
+            } else {
                 return rb.setMsg("不符合移交条件");
             }
         }
@@ -338,7 +340,7 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
     public ResultBean updateYjState(CertificateStateQuery query) {
         ResultBean rb = ResultBean.fireFail();
         BaseVehicleCertificate baseVehicleCertificate = baseMapper.selectByVinSid(query.getVinSid());
-        if(baseVehicleCertificate != null){
+        if (baseVehicleCertificate != null) {
             baseVehicleCertificate.setTransferStateKey(query.getTransferStateKey());
             baseVehicleCertificate.setTransferStateValue(query.getTransferStateValue());
             baseMapper.updateById(baseVehicleCertificate);
@@ -346,19 +348,24 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         return rb.success();
     }
 
-    public ResultBean updateVinNo(String vinNo, String sid) {
+    public ResultBean updateVinNo(String vinNo, String smRemarks, String sid) {
         ResultBean rb = ResultBean.fireFail();
-        if (vinNo.length() != 17){
+        if (vinNo.length() != 17) {
             return rb.setMsg("字符串长度不是17位");
         }
         BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid);
+        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleCertificate.getVehicleSid());
+        String tzVinNo = baseVehicle.getVinNo();
+        if (!vinNo.substring(vinNo.length() - 8).equals(tzVinNo.substring(tzVinNo.length() - 8)) && StringUtils.isBlank(smRemarks)) {
+            return rb.success().setMsg("该车架号后八位与车辆台账中车架号不符，请填写说明原因");
+        }
         String remarks = baseVehicleCertificate.getRemarks();
         if (StringUtils.isBlank(remarks)) {
-            remarks = "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
-        }else {
-            remarks = remarks + "，" + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
+            remarks = smRemarks + "由" + baseVehicleCertificate.getVinNo() + "改成" + vinNo;
+        } else {
+            remarks = remarks + "，" + smRemarks + "由" + baseVehicleCertificate.getVinNo() + "改成" + vinNo;
         }
-        baseMapper.updateVinNo(vinNo,remarks,sid);
+        baseMapper.updateVinNo(vinNo, remarks, sid);
         baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid());
         return rb.success();
     }

anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclecertificate.js

@@ -30,6 +30,15 @@ export function Update(data) {
   })
 }
 
+// 修改
+export function updateVinNo(data) {
+  return request({
+    url: 'base/v1/basevehiclecertificate/updateVinNo',
+    method: 'post',
+    params: data
+  })
+}
+
 // 删除
 export function deleteBySids(data) {
   return request({

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@@ -249,6 +249,11 @@
                     <span style="padding: 0 8px">至</span>
                     <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.solidEndDate" clearable type="date" placeholder="结束日期"/>
                   </el-form-item>
+                  <el-form-item label="厂家开票日期">
+                    <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.manDateStart" clearable  type="date" placeholder="开始日期"/>
+                    <span style="padding: 0 8px">至</span>
+                    <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.manDateEnd" clearable type="date" placeholder="结束日期"/>
+                  </el-form-item>
                 </el-collapse-item>
               </el-collapse>
             </el-form>
@@ -305,6 +310,7 @@
             <el-table-column prop="arrivalDate" width="130" label="物流到车日期" align="center"/>
             <el-table-column prop="returnDate" width="130" label="退库日期" align="center"/>
             <el-table-column prop="solidDate" width="130" label="买断日期" align="center"/>
+            <el-table-column prop="manDate" width="130" label="厂家开票日期" align="center"/>
             <el-table-column prop="salesDate" width="130" label="销售日期" align="center"/>
             <el-table-column width="140" label="存放地点" align="center">
               <template slot-scope="scope">
@@ -376,6 +382,7 @@
             <el-table-column prop="vehicleTypeCode" width="100" label="车型编码" align="center"/>
             <el-table-column prop="configCode" width="100" label="配置编码" align="center"/>
             <el-table-column prop="remarks" width="130" label="备注" align="center"/>
+            <el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center"/>
             <el-table-column prop="createOrgName" width="130" label="创建组织名称" align="center"/>
             <el-table-column prop="vehModelBrandName" width="130" label="品牌" align="center"/>
             <el-table-column prop="vehicleTypeValue" width="130" label="功能" align="center"/>
@@ -386,7 +393,6 @@
 <!--            <el-table-column prop="jacketPrice" width="200" label="上装价格" align="center"/>-->
 <!--            <el-table-column prop="refitFactory" width="200" label="上装委改厂" align="center"/>-->
             <!--最新版车辆台账表中不包含以下字段，暂时放到最后-->
-            <el-table-column prop="warrantyCardNo" width="130" label="保修卡号" align="center"/>
             <el-table-column prop="departmentValue" width="130" label="系别" align="center"/>
           </el-table>
         </div>
@@ -680,7 +686,9 @@ export default {
           orgSidPath: '',
           otherConfigOne: '',
           otherConfigTwo: '',
-          otherConfigThree: ''
+          otherConfigThree: '',
+          manDateStart: '',
+          manDateEnd: ''
         },
         current: 1,
         size: 5,
@@ -1170,7 +1178,9 @@ export default {
           orgSidPath: '',
           otherConfigOne: '',
           otherConfigTwo: '',
-          otherConfigThree: ''
+          otherConfigThree: '',
+          manDateStart: '',
+          manDateEnd: ''
         },
         current: 1,
         size: 5,

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@@ -57,7 +57,6 @@
               <span>{{ temp.insideCode }}</span>
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -167,8 +166,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <span slot="label">保修卡号：</span>
-              <el-input v-model="temp.warrantyCardNo" maxlength="125" placeholder="" class="addinputw" clearable/>
+              <span slot="label">内部编码：</span>
+              <span>{{ temp.manDate }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -235,12 +234,18 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="16">
+          <el-col :span="8">
             <el-form-item>
               <span slot="label">备注：</span>
               <el-input v-model="temp.remarks" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span slot="label">保修卡号：</span>
+              <el-input v-model="temp.warrantyCardNo" maxlength="125" placeholder="" class="addinputw" clearable/>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item prop="isProblemVeh">
               <span slot="label">是否为问题车辆：</span>
@@ -377,7 +382,8 @@ export default {
         supplierName: '',
         supplierSid: '',
         freight: '',
-        vehMark: ''
+        vehMark: '',
+        manDate: ''
       }, // 添加和修改
       dialogFormVisible: false, // 添加修改对话框状态
       dialogStatus: '', // 对话框状态
@@ -664,7 +670,8 @@ export default {
         supplierName: '',
         supplierSid: '',
         freight: '',
-        vehMark: ''
+        vehMark: '',
+        manDate: ''
       }
       this.$emit('doback')
     },

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue

@@ -141,8 +141,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <span slot="label">保修卡号：</span>
-              <span>{{ temp.warrantyCardNo }}</span>
+              <span slot="label">厂家开票日期：</span>
+              <span>{{ temp.manDate }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -207,12 +207,18 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="16">
+          <el-col :span="8">
             <el-form-item>
               <span slot="label">备注：</span>
               <span>{{ temp.remarks }}</span>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span slot="label">保修卡号：</span>
+              <span>{{ temp.warrantyCardNo }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item>
               <span slot="label">是否为问题车辆：</span>

anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue

@@ -4,6 +4,7 @@
       <div>{{ viewTitle }}</div>
       <div>
         <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
+        <el-button type="primary" size="small" @click="saveVinNo()">仅保存车架号</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
     </div>
@@ -299,16 +300,16 @@
     <el-dialog center :visible.sync="dialogVisible" width="50%" :close-on-click-modal="false">
       <el-form class="formadd">
         <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="3" class="tleftb">
+          <el-col :span="4" class="tleftb">
             <span>说明原因</span>
           </el-col>
-          <el-col :span="21">
+          <el-col :span="20">
             <el-form-item><el-input v-model="smRemarks" type="textarea" :rows="3" maxlength="125" placeholder="" class="addinputw addinputw_remarks" clearable/></el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" @click="handleCreate">确 定</el-button>
+        <el-button type="primary" size="small" @click="handleConfirm">确 定</el-button>
         <el-button size="small" @click="handleQuXiao">取 消</el-button>
       </span>
     </el-dialog>
@@ -316,9 +317,10 @@
 </template>
 
 <script>
-import { details, SaveList, Update } from '@/api/cheliang/basevehiclecertificate'
+import { details, SaveList, Update, updateVinNo } from '@/api/cheliang/basevehiclecertificate'
 import { typeValues } from '@/api/cheliang/dictcommons'
 import ImageUpload from '@/components/uploadFile/ManyImageUpload' // 上传文件
+
 export default {
   name: 'PinpaiAdd',
   components: { ImageUpload },
@@ -329,6 +331,7 @@ export default {
       smRemarks: '',
       FormLoading: false,
       listLoading: false,
+      vinNodisabled: false,
       temp: {
         createOrgSid: '',
         certificateSituation: '',
@@ -462,10 +465,54 @@ export default {
     fileChangeIt(files, imgFiles) {
       this.temp.certificatePhoto = imgFiles
     },
+    handleConfirm() {
+      if (this.vinNodisabled) {
+        this.saveVinNo()
+      } else {
+        this.handleCreate()
+      }
+    },
+    handleQuXiao() {
+      this.smRemarks = ''
+      this.dialogVisible = false
+    },
+    saveVinNo() {
+      if (this.temp.vinNo !== '' && this.temp.vinNo !== null && this.temp.vinNo !== undefined && this.temp.vinNo.length < 17) {
+        this.$message({ showClose: true, type: 'error', message: '请检查车架号的长度应为17位' })
+        return
+      }
+      this.temp.smRemarks = this.smRemarks
+      updateVinNo({ sid: this.temp.sid, vinNo: this.temp.vinNo, smRemarks: this.temp.smRemarks }).then((response) => {
+        this.FormLoading = false
+        if (response.success) {
+          if (response.msg !== '该车架号后八位与车辆台账中车架号不符，请填写说明原因') {
+            this.dialogFormVisible = false
+            this.$notify({
+              title: '提示',
+              message: '修改成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.handleReturn('true')
+          } else {
+            const tip = response.msg
+            this.$confirm(tip, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.smRemarks = ''
+              this.dialogVisible = true
+              this.vinNodisabled = true
+            })
+          }
+        }
+      })
+    },
     // 提交添加数据
     handleCreate() {
-      if (this.temp.vinNo !== '' && this.temp.vinNo !== null && this.temp.vinNo !== undefined && this.temp.vinNo.length < 17 && this.temp.vinNo.length !== 8) {
-        this.$message({ showClose: true, type: 'error', message: '请检查车架号的长度应为8位或17位' })
+      if (this.temp.vinNo !== '' && this.temp.vinNo !== null && this.temp.vinNo !== undefined && this.temp.vinNo.length < 17) {
+        this.$message({ showClose: true, type: 'error', message: '请检查车架号的长度应为17位' })
         return
       }
       if (this.temp.certificateStateValue === '正式' && this.temp.carModel === '') {
@@ -522,10 +569,6 @@ export default {
         }
       })
     },
-    handleQuXiao() {
-      this.smRemarks = ''
-      this.dialogVisible = false
-    },
     // 返回
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
@@ -539,6 +582,7 @@ export default {
       } // 添加和修改
       this.dialogVisible = false
       this.smRemarks = ''
+      this.vinNodisabled= false
       this.$emit('doback')
     }
   }