first

src/main/java/com/spring/modules/project/controller/ProjectController.java

@@ -6,10 +6,7 @@ import com.spring.common.utils.R;
 import com.spring.modules.factory.entity.Site;
 import com.spring.modules.factory.entity.vo.SiteVo;
 import com.spring.modules.factory.service.SiteService;
-import com.spring.modules.project.data.PlmOperatorData;
-import com.spring.modules.project.data.PlmProjectContactData;
-import com.spring.modules.project.data.PlmProjectInfoData;
-import com.spring.modules.project.data.PlmUserRoleData;
+import com.spring.modules.project.data.*;
 import com.spring.modules.project.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -106,4 +103,36 @@ public class ProjectController {
         projectService.deleteProjectInfo(data);
         return R.ok();
     }
+
+    /**
+     * @Description 查询项目物料（组件）
+     * @Title getProjectInfoPartList
+      * @param data
+     * @author rq
+     * @date 2023/9/11 16:59
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/getProjectInfoPartList")
+    @ResponseBody
+    public R getProjectInfoPartList(@RequestBody PlmProjectInfoData data){
+        List<PlmProjectPartData> rows  = projectService.getProjectInfoPartList(data);
+        return R.ok().put("rows", rows);
+    }
+
+    /**
+     * @Description TODO
+     * @Title saveProjectPart 
+      * @param data 
+     * @author rq
+     * @date 2023/9/11 17:58
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/saveProjectPart")
+    @ResponseBody
+    public R saveProjectPart(@RequestBody PlmProjectPartData data){
+        projectService.saveProjectPart(data);
+        return R.ok();
+    }
 }

src/main/java/com/spring/modules/project/dao/ProjectDao.java

@@ -2,10 +2,7 @@ package com.spring.modules.project.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.spring.modules.project.data.PlmOperatorData;
-import com.spring.modules.project.data.PlmProjectContactData;
-import com.spring.modules.project.data.PlmProjectInfoData;
-import com.spring.modules.project.data.PlmUserRoleData;
+import com.spring.modules.project.data.*;
 import com.spring.modules.project.entity.PlmProjectTeam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -106,4 +103,38 @@ public interface ProjectDao {
     void deleteProjectContact(PlmProjectContactData data);
     void saveProjectContactList(PlmProjectContactData data);
     void deleteProjectInfo(PlmProjectInfoData data);
+
+    /**
+     * @Description TODO
+     * @Title getProjectInfoPartList
+     * @param
+     * @author rq
+     * @date 2023/9/11 17:02
+     * @return List<PlmProjectContactData>
+     * @throw
+     */
+    List<PlmProjectPartData> getProjectInfoPartList(PlmProjectInfoData data);
+
+    /**
+     * @Description TODO
+     * @Title saveProjectPart
+      * @param data
+     * @author rq
+     * @date 2023/9/11 18:02
+     * @return String
+     * @throw
+     */
+    String getTestPartNo(PlmProjectPartData data);
+
+    /**
+     * @Description 保存项目物料
+     *
+     * @Title saveProjectPart
+      * @param data
+     * @author rq
+     * @date 2023/9/11 18:06
+     * @return void
+     * @throw
+     */
+    void saveProjectPart(PlmProjectPartData data);
 }

src/main/java/com/spring/modules/project/data/PlmProjectPartData.java

@@ -0,0 +1,27 @@
+package com.spring.modules.project.data;
+
+import com.spring.modules.project.entity.PlmProjectPart;
+import org.apache.ibatis.type.Alias;
+
+@Alias("PlmProjectPartData")
+public class PlmProjectPartData extends PlmProjectPart {
+    private String partTypeDesc;
+
+    private String username;
+
+    public String getPartTypeDesc() {
+        return partTypeDesc;
+    }
+
+    public void setPartTypeDesc(String partTypeDesc) {
+        this.partTypeDesc = partTypeDesc;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}

src/main/java/com/spring/modules/project/entity/PlmProjectPart.java

@@ -0,0 +1,186 @@
+package com.spring.modules.project.entity;
+
+import java.util.Date;
+
+public class PlmProjectPart {
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 工厂编码
+     */
+    private String site;
+
+    /**
+     * 项目号
+     */
+    private String projectId;
+
+    /**
+     * 物料号
+     */
+    private String testPartNo;
+    /**
+     * 物料名称
+     */
+    private String partName;
+    /**
+     * 物料类别
+     */
+    private String partType;
+
+    /**
+     * 物料描述
+     */
+    private String partDesc;
+
+    /**
+     * 规格型号
+     */
+    private String partSpec;
+
+    /**
+     * 物料图号
+     */
+    private String materialNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     *
+     */
+    private Date createDate;
+
+    /**
+     *
+     */
+    private String createBy;
+
+    /**
+     *
+     */
+    private Date updateDate;
+
+    /**
+     *
+     */
+    private String updateBy;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getTestPartNo() {
+        return testPartNo;
+    }
+
+    public void setTestPartNo(String testPartNo) {
+        this.testPartNo = testPartNo;
+    }
+
+    public String getPartType() {
+        return partType;
+    }
+
+    public void setPartType(String partType) {
+        this.partType = partType;
+    }
+
+    public String getPartDesc() {
+        return partDesc;
+    }
+
+    public void setPartDesc(String partDesc) {
+        this.partDesc = partDesc;
+    }
+
+    public String getPartSpec() {
+        return partSpec;
+    }
+
+    public void setPartSpec(String partSpec) {
+        this.partSpec = partSpec;
+    }
+
+    public String getMaterialNumber() {
+        return materialNumber;
+    }
+
+    public void setMaterialNumber(String materialNumber) {
+        this.materialNumber = materialNumber;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getPartName() {
+        return partName;
+    }
+
+    public void setPartName(String partName) {
+        this.partName = partName;
+    }
+}
+

src/main/java/com/spring/modules/project/service/ProjectService.java

@@ -1,10 +1,7 @@
 package com.spring.modules.project.service;
 
 import com.spring.common.utils.PageUtils;
-import com.spring.modules.project.data.PlmOperatorData;
-import com.spring.modules.project.data.PlmProjectContactData;
-import com.spring.modules.project.data.PlmProjectInfoData;
-import com.spring.modules.project.data.PlmUserRoleData;
+import com.spring.modules.project.data.*;
 
 import java.util.List;
 
@@ -100,4 +97,26 @@ public interface ProjectService {
     void saveProjectContactList(PlmProjectContactData data);
 
     void deleteProjectInfo(PlmProjectInfoData data);
+
+    /**
+     * @Description TODO
+     * @Title getProjectInfoPartList
+      * @param
+     * @author rq
+     * @date 2023/9/11 17:02
+     * @return List<PlmProjectContactData>
+     * @throw
+     */
+    List<PlmProjectPartData> getProjectInfoPartList(PlmProjectInfoData data);
+
+    /**
+     * @Description TODO
+     * @Title saveProjectPart
+      * @param  
+     * @author rq
+     * @date 2023/9/11 17:51 
+     * @return void
+     * @throw
+     */
+    void saveProjectPart(PlmProjectPartData data);
 }

src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.spring.common.utils.PageUtils;
 import com.spring.modules.base.service.TransNoControlService;
 import com.spring.modules.project.dao.ProjectDao;
-import com.spring.modules.project.data.PlmOperatorData;
-import com.spring.modules.project.data.PlmProjectContactData;
-import com.spring.modules.project.data.PlmProjectInfoData;
-import com.spring.modules.project.data.PlmUserRoleData;
+import com.spring.modules.project.data.*;
 import com.spring.modules.project.entity.PlmProjectTeam;
 import com.spring.modules.project.entity.PlmUserRole;
 import com.spring.modules.project.service.ProjectService;
@@ -178,4 +175,18 @@ public class ProjectServiceImpl implements ProjectService {
         projectDao.deleteProjectInfo(inData);
     }
 
+    @Override
+    public List<PlmProjectPartData> getProjectInfoPartList(PlmProjectInfoData data){
+        return projectDao.getProjectInfoPartList(data);
+    }
+
+    @Override
+    @Transactional
+    public void saveProjectPart(PlmProjectPartData data){
+        if(data.getId()==0){
+            String partNo=projectDao.getTestPartNo(data);
+            data.setTestPartNo(partNo);
+            projectDao.saveProjectPart(data);
+        }
+    }
 }

src/main/resources/mapper/project/ProjectDao.xml

@@ -132,4 +132,18 @@
 <delete id="deleteProjectInfo">
     delete from plm_project_info where  site=#{site} and project_id=#{projectId}
 </delete>
+<select id="getProjectInfoPartList" resultType="PlmProjectPartData">
+    select id,site,project_id,test_part_no,part_type,part_desc,part_spec,material_number,remark,create_date,create_by,update_date,part_name,
+update_by,dbo.plm_get_projectBaseDesc(part_type,'part_type') partTypeDesc
+    from plm_project_part where site=#{site} and project_id=#{projectId}
+</select>
+<select id="getTestPartNo" resultType="String">
+    select top 1 #{projectId}+'-'+ Right( '0000'+ convert(VARCHAR(10), isnull(max(convert(INT,RIGHT(test_part_no, 4))),0)+1)  ,4) from plm_project_part
+    where site=#{site} and project_id=#{projectId}
+</select>
+<insert id="saveProjectPart">
+    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) values
+    (#{site},#{projectId},#{testPartNo},#{partType},#{partDesc},#{partSpec},#{materialNumber},#{remark},GetDate(),#{username},#{partName})
+</insert>
+
 </mapper>