Merge remote-tracking branch 'origin/main'

SC-boot/linkage-admin/src/main/resources/application-dev.yml

@@ -54,7 +54,7 @@ spring:
 
 config:
   #===================== 是否开启测试环境 =====================
-  TestVersion: true
+  TestVersion: false
 
   #===================== 文件模板配置 =====================
   fileType: local #文件存储类型(local-本地存储，minio-网络存储)

SC-boot/linkage-common/src/main/java/jnpf/util/RandomUtil.java

@@ -35,9 +35,9 @@ public class RandomUtil {
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     //ID缓存有效时间 定时刷新有效期
-    private static long CacheTimeout = 60 * 60 * 24;
+    private static long CacheTimeout = 60 * 60 * 24 * 1000;
     //30分钟续期一次 如果Redis被清空可以早点续期
-    private static long ScheduleTimeout = 60 * 30;
+    private static long ScheduleTimeout = 60 * 60 * 1000;
     private static byte WorkerIdBitLength = 16;
     //65535 参数为shot 最大值为Short.MAX_VALUE
     private static int MaxWorkerIdNumberByMode = (1 << WorkerIdBitLength) -1 >Short.MAX_VALUE?Short.MAX_VALUE : (1 << WorkerIdBitLength) -1 ;

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java

@@ -342,8 +342,20 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                     dataRowMap.put("classification", model.getClassification());
                     dataRowMap.put("declarationDate", model.getDeclarationDate());
                     dataRowMap.put("name", model.getName());
-                    dataRowMap.put("num", model.getNum());
+                    if (model.getNum()==null){
-                    dataRowMap.put("amount", model.getAmount());
+                        String amo="0";
+                        dataRowMap.put("num", amo);
+                    }else {
+                        dataRowMap.put("num", model.getNum());
+                    }
+
+                    if (model.getAmount()==null){
+                        String amo="0";
+                        dataRowMap.put("amount", amo);
+                    }else {
+                        dataRowMap.put("amount", model.getAmount());
+                    }
+
                     dataRowMap.put("deptName", model.getDeptName());
                     dataRowMap.put("remark", model.getRemark());
                     dataRowMap.put("creatorusername", model.getCreatorusername());

SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java

@@ -155,7 +155,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
             }
         }
         Page<SalebackEntity> page=new Page<>(salebackPagination.getCurrentPage(), salebackPagination.getPageSize());
-        //加权限
+//        //加权限
 //        IPage<SalebackEntity> IPage = this.page(page, salebackQueryWrapper);
 //        List<SalebackEntity> list = IPage.getRecords();
 //        Optional<SalebackEntity> firstElement = list.stream().findFirst();
@@ -172,7 +172,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
             detpartment = userProvider.getDepartmentId(userId);
         }
         if (StringUtil.isNotNull(detpartment)) {
-            salebackPagination.setDepartmentId(detpartment);
+                salebackPagination.setDepartmentId(detpartment);
         }
         IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination);
         return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());

SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue

@@ -35,7 +35,6 @@
       </div>
     </div>
     <div class="import-main" v-show="active==2">
-<!--      <p style="color: #950614">批量导入自动去重在合同档案中已经存在的合同数据</p>-->
       <JNPF-table v-loading="listLoading" :data="list">
 
         <el-table-column prop="contractCode" label="合同编码" width="150">

SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue

@@ -6,14 +6,14 @@
         <template v-if="!loading">
           <el-col :span="12">
             <el-form-item label="磅单上传" disabled prop="poundPictures">
-              <JNPF-UploadImg disabled v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1" :disabled="true">
+              <JNPF-UploadImgB disabled v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1" :disabled="true">
-              </JNPF-UploadImg>
+              </JNPF-UploadImgB>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="车辆图片" prop="vehiclePictures">
-              <JNPF-UploadImg  v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
+              <JNPF-UploadImgB  v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
-              </JNPF-UploadImg>
+              </JNPF-UploadImgB>
             </el-form-item>
           </el-col>