diff --git a/src/main/java/com/spring/modules/project/data/PlmProjectPartData.java b/src/main/java/com/spring/modules/project/data/PlmProjectPartData.java index 0ff17890..742b5e8c 100644 --- a/src/main/java/com/spring/modules/project/data/PlmProjectPartData.java +++ b/src/main/java/com/spring/modules/project/data/PlmProjectPartData.java @@ -24,6 +24,11 @@ public class PlmProjectPartData extends PlmProjectPart { **/ private String customerDesc; + private String groupName; + + private String productGroupName1; + private String productGroupName2; + public String getProjectName() { return projectName; } @@ -71,4 +76,28 @@ public class PlmProjectPartData extends PlmProjectPart { public void setCodeDesc(String codeDesc) { this.codeDesc = codeDesc; } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public String getProductGroupName1() { + return productGroupName1; + } + + public void setProductGroupName1(String productGroupName1) { + this.productGroupName1 = productGroupName1; + } + + public String getProductGroupName2() { + return productGroupName2; + } + + public void setProductGroupName2(String productGroupName2) { + this.productGroupName2 = productGroupName2; + } } diff --git a/src/main/java/com/spring/modules/project/entity/PlmProjectPart.java b/src/main/java/com/spring/modules/project/entity/PlmProjectPart.java index 94f6fa40..83d24ec0 100644 --- a/src/main/java/com/spring/modules/project/entity/PlmProjectPart.java +++ b/src/main/java/com/spring/modules/project/entity/PlmProjectPart.java @@ -73,6 +73,11 @@ public class PlmProjectPart { private String codeNo; private String finialPartNo; + private String groupId; + + private String productGroupId1; + private String productGroupId2; + public Integer getId() { return id; } @@ -200,5 +205,29 @@ public class PlmProjectPart { public void setFinialPartNo(String finialPartNo) { this.finialPartNo = finialPartNo; } + + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + public String getProductGroupId1() { + return productGroupId1; + } + + public void setProductGroupId1(String productGroupId1) { + this.productGroupId1 = productGroupId1; + } + + public String getProductGroupId2() { + return productGroupId2; + } + + public void setProductGroupId2(String productGroupId2) { + this.productGroupId2 = productGroupId2; + } } diff --git a/src/main/java/com/spring/modules/sys/controller/DictDataController.java b/src/main/java/com/spring/modules/sys/controller/DictDataController.java index 504d288f..ce54ddcb 100644 --- a/src/main/java/com/spring/modules/sys/controller/DictDataController.java +++ b/src/main/java/com/spring/modules/sys/controller/DictDataController.java @@ -75,6 +75,24 @@ public class DictDataController { } return R.error("操作失败"); } + /** + * 修改字典数据状态为停用 + * @param dictDataList + * author zelian_wu + * date 2024-1-3 + * @return + */ + @PostMapping("/removeBatch") + public R removeBatchDictData(@RequestBody List dictDataList){ + if (Objects.isNull(dictDataList)|| dictDataList.isEmpty()){ + throw new RuntimeException("请选择字典数据"); + } + if (dictDataService.lambdaUpdate().set(DictData::getStatus,"N") + .in(DictData::getDictCode,dictDataList.stream().map(DictData::getDictCode).collect(Collectors.toList())).update()) { + return R.ok("操作成功!"); + } + return R.error("操作失败"); + } /** * 删除字典数据 * @param dictData diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index a90de81d..632b579b 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -22,7 +22,7 @@ AND project_id like #{query.projectId} - AND dbo.plm_get_projectBaseDesc(project_type_db,'project_type') like #{query.projectType} + AND plm_project_info.project_type_db like #{query.projectType} AND dbo.get_projectTeamName(site,project_id,'ProjectOwner') like '%' + #{query.projectOwnerName} +'%' @@ -142,14 +142,60 @@ delete from plm_project_part where site=#{site} and project_id=#{projectId} - insert into plm_project_part(site,project_id,test_part_no,part_type,part_desc,part_spec,material_number,remark,create_date,create_by,part_name,code_no) values - (#{site},#{projectId},#{testPartNo},#{partType},#{partDesc},#{partSpec},#{materialNumber},#{remark},GetDate(),#{username},#{partName},#{codeNo}) + insert into plm_project_part + (site,project_id, + test_part_no, + part_type, + part_desc, + part_spec, + material_number, + remark, + create_date, + create_by, + part_name, + code_no, + group_id, + product_group_id1, + product_group_id2) + values + (#{site}, + #{projectId}, + #{testPartNo}, + #{partType}, + #{partDesc}, + #{partSpec}, + #{materialNumber}, + #{remark}, + GetDate(), + #{username}, + #{partName}, + #{codeNo}, + #{groupId}, + #{productGroupId1}, + #{productGroupId2}) - update plm_project_part set part_type=#{partType},part_desc=#{partDesc},part_spec=#{partSpec},material_number=#{materialNumber}, - remark=#{remark},update_date=GetDate(),update_by=#{username},part_name=#{partName},code_no=#{codeNo} where id=#{id} + update plm_project_part + set part_type=#{partType}, + part_desc=#{partDesc}, + part_spec=#{partSpec}, + material_number=#{materialNumber}, + remark=#{remark}, + update_date=GetDate(), + update_by=#{username}, + part_name=#{partName}, + code_no=#{codeNo}, + group_id = #{groupId}, + product_group_id1 = #{productGroupId1}, + product_group_id2 = #{productGroupId2} + where id=#{id} @@ -196,9 +283,32 @@ update_by,dbo.plm_get_projectBaseDesc(part_type,'part_type') partTypeDesc,final_