项目信息的计量单位 错字修改,物料库和项目信息的主键获取修改

src/main/java/com/jeeplus/modules/supply/materialLibrary/service/MaterialLibraryService.java

@@ -140,7 +140,6 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
                     //100条
                     List<MaterialLibrary> listPage = projectBasicsList.subList(0, pointsDataLimit);
                     for(MaterialLibrary info:listPage){
-                        info.setId(IdGen.uuid());
                         info.preInsert();
                     }
                     materialLibraryMapper.insertList(listPage);
@@ -149,8 +148,6 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
                 }
                 if(!projectBasicsList.isEmpty()){
                     for(MaterialLibrary info:projectBasicsList){
-
-                        info.setId(IdGen.uuid());
                         info.preInsert();
                     }
                     materialLibraryMapper.insertList(projectBasicsList);
@@ -158,8 +155,8 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
             }else{
                 for(MaterialLibrary info:projectBasicsList){
                     if(StringUtils.isNotBlank(info.getMaterialCode())) {
-                        info.setId(IdGen.uuid());
                         info.preInsert();
+                        System.out.println("111");
                     }
                 }
                 materialLibraryMapper.insertList(projectBasicsList);

src/main/java/com/jeeplus/modules/supply/projectInformation/service/ProjectInformationService.java

@@ -169,7 +169,6 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
                     //100条
                     List<ProjectInformation> listPage = projectBasicsList.subList(0, pointsDataLimit);
                     for(ProjectInformation info:listPage){
-                        info.setId(IdGen.uuid());
                         info.preInsert();
                     }
                     projectInformationMapper.insertSubmissionFormList(listPage);
@@ -178,14 +177,12 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
                 }
                 if(!projectBasicsList.isEmpty()){
                     for(ProjectInformation info:projectBasicsList){
-                        info.setId(IdGen.uuid());
                         info.preInsert();
                     }
                     projectInformationMapper.insertSubmissionFormList(projectBasicsList);
                 }
             }else{
                 for(ProjectInformation info:projectBasicsList){
-                    info.setId(IdGen.uuid());
                     info.preInsert();
                 }
                 projectInformationMapper.insertSubmissionFormList(projectBasicsList);
@@ -213,7 +210,6 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
                     //100条
                     List<ProjectInformation> listPage = projectBasicsList.subList(0, pointsDataLimit);
                     for(ProjectInformation info:listPage){
-                        info.setId(IdGen.uuid());
                         info.preInsert();
                     }
                     projectInformationMapper.insertProjectInformationList(listPage);
@@ -222,14 +218,12 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
                 }
                 if(!projectBasicsList.isEmpty()){
                     for(ProjectInformation info:projectBasicsList){
-                        info.setId(IdGen.uuid());
                         info.preInsert();
                     }
                     projectInformationMapper.insertProjectInformationList(projectBasicsList);
                 }
             }else{
                 for(ProjectInformation info:projectBasicsList){
-                    info.setId(IdGen.uuid());
                     info.preInsert();
                 }
                 projectInformationMapper.insertProjectInformationList(projectBasicsList);

src/main/webapp/webpage/modules/supply/materialLibrary/supplyMaterialLibraryList.jsp

@@ -30,7 +30,7 @@
 					<form:input path="materialDescription" htmlEscape="false" maxlength="64"  class=" form-control"/>
 				</div>
 				<div class="col-xs-12 col-sm-4 col-md-4">
-					<label class="label-item single-overflow pull-left" title="计算单位：">计算单位：</label>
+					<label class="label-item single-overflow pull-left" title="计量单位：">计量单位：</label>
 					<form:input path="unitOfMeasurement" htmlEscape="false" maxlength="64"  class=" form-control"/>
 				</div>