first

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

@@ -142,4 +142,39 @@ public class ProjectController {
         projectService.deleteProjectPartWithId(data);
         return R.ok();
     }
+
+
+    /**
+     * @Description 根据项目查询刀模申请
+     * @Title getPlmToolPurchaseRequestDataByProject
+      * @param data
+     * @author rq
+     * @date 2023/9/13 14:31
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/getPlmToolPurchaseRequestDataByProject")
+    @ResponseBody
+    public R getPlmToolPurchaseRequestDataByProject(@RequestBody PlmProjectInfoData data){
+        List<PlmToolPurchaseRequestData> rows  = projectService.getPlmToolPurchaseRequestDataByProject(data);
+        return R.ok().put("rows", rows);
+    }
+
+
+    /**
+     * @Description TODO
+     * @Title savePlmToolPurchaseRequestData
+      * @param data
+     * @author rq
+     * @date 2023/9/14 11:25
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/savePlmToolPurchaseRequestData")
+    @ResponseBody
+    public R savePlmToolPurchaseRequestData(@RequestBody PlmToolPurchaseRequestData data){
+        projectService.savePlmToolPurchaseRequestData(data);
+        return R.ok();
+    }
+
 }

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

@@ -154,9 +154,34 @@ public interface ProjectDao {
      * @Title deleteProjectPartWithId 
       * @param data 
      * @author rq
-     * @date 2023/9/12 11:16 
+     * @date 2023/9/12 18:07
      * @return void
      * @throw
      */
     void deleteProjectPartWithId(PlmProjectPartData data);
+
+
+    /**
+     * @Description TODO
+     * @Title getPlmToolPurchaseRequestDataByProject
+     * @param data
+     * @author rq
+     * @date 2023/9/13 14:33
+     * @return List<PlmToolPurchaseRequestData>
+     * @throw
+     */
+    List<PlmToolPurchaseRequestData> getPlmToolPurchaseRequestDataByProject(PlmProjectInfoData data);
+
+    /**
+     * @Description TODO
+     * @Title savePlmToolPurchaseRequestData
+      * @param data
+     * @author rq
+     * @date 2023/9/14 11:32
+     * @return void
+     * @throw
+     */
+    void savePlmToolPurchaseRequestData(PlmToolPurchaseRequestData data);
+
+
 }

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

@@ -0,0 +1,90 @@
+package com.spring.modules.project.data;
+
+import com.spring.modules.project.entity.PlmToolPurchaseRequest;
+import org.apache.ibatis.type.Alias;
+
+@Alias("PlmToolPurchaseRequestData")
+public class PlmToolPurchaseRequestData extends PlmToolPurchaseRequest {
+
+    private String toolTypeDesc;
+    private String partDesc;
+    private String statusDesc;
+    private String supplierName;
+    private String applicantName;
+    private String plannerName;
+    private String typeDesc;
+    private String username;
+    private String partName;
+
+    public String getToolTypeDesc() {
+        return toolTypeDesc;
+    }
+
+    public void setToolTypeDesc(String toolTypeDesc) {
+        this.toolTypeDesc = toolTypeDesc;
+    }
+
+    public String getPartDesc() {
+        return partDesc;
+    }
+
+    public void setPartDesc(String partDesc) {
+        this.partDesc = partDesc;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getApplicantName() {
+        return applicantName;
+    }
+
+    public void setApplicantName(String applicantName) {
+        this.applicantName = applicantName;
+    }
+
+    public String getPlannerName() {
+        return plannerName;
+    }
+
+    public void setPlannerName(String plannerName) {
+        this.plannerName = plannerName;
+    }
+
+    public String getTypeDesc() {
+        return typeDesc;
+    }
+
+    public void setTypeDesc(String typeDesc) {
+        this.typeDesc = typeDesc;
+    }
+
+    public String getStatusDesc() {
+        return statusDesc;
+    }
+
+    public void setStatusDesc(String statusDesc) {
+        this.statusDesc = statusDesc;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPartName() {
+        return partName;
+    }
+
+    public void setPartName(String partName) {
+        this.partName = partName;
+    }
+}

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

@@ -0,0 +1,328 @@
+package com.spring.modules.project.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class PlmToolPurchaseRequest {
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 工厂编码
+     */
+    private String site;
+
+    /**
+     * 单据号
+     */
+    private String orderNo;
+
+    /**
+     * 项目料号
+     */
+    private String testPartNo;
+
+    /**
+     * 项目号
+     */
+    private String projectId;
+
+    /**
+     * 工具编码
+     */
+    private String toolId;
+
+    /**
+     * 分类
+     */
+    private String type;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 工具原因
+     */
+    private String reason;
+
+    /**
+     * 工具偏移量
+     */
+    private BigDecimal toolOffset;
+
+    /**
+     * 数量
+     */
+    private Integer qty;
+
+    /**
+     * 甲方
+     */
+    private String partyA;
+
+    /**
+     * 供应商编码
+     */
+    private String supplierId;
+
+    /**
+     * 售价
+     */
+    private BigDecimal price;
+
+    /**
+     * 工装成本估算
+     */
+    private BigDecimal toolCost;
+
+    /**
+     * 总成本
+     */
+    private BigDecimal allCost;
+
+    /**
+     * IFD PR编号
+     */
+    private String ifsPrNo;
+
+    /**
+     * 采购订单号
+     */
+    private String poNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     *
+     */
+    private String createBy;
+
+    /**
+     *
+     */
+    private Date createDate;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    private Date updateDate;
+
+    /**
+     * 规划人
+     */
+    private String planner;
+
+    private String applicant;
+
+    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 getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getTestPartNo() {
+        return testPartNo;
+    }
+
+    public void setTestPartNo(String testPartNo) {
+        this.testPartNo = testPartNo;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getToolId() {
+        return toolId;
+    }
+
+    public void setToolId(String toolId) {
+        this.toolId = toolId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public BigDecimal getToolOffset() {
+        return toolOffset;
+    }
+
+    public void setToolOffset(BigDecimal toolOffset) {
+        this.toolOffset = toolOffset;
+    }
+
+    public Integer getQty() {
+        return qty;
+    }
+
+    public void setQty(Integer qty) {
+        this.qty = qty;
+    }
+
+    public String getPartyA() {
+        return partyA;
+    }
+
+    public void setPartyA(String partyA) {
+        this.partyA = partyA;
+    }
+
+    public String getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(String supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public BigDecimal getToolCost() {
+        return toolCost;
+    }
+
+    public void setToolCost(BigDecimal toolCost) {
+        this.toolCost = toolCost;
+    }
+
+    public BigDecimal getAllCost() {
+        return allCost;
+    }
+
+    public void setAllCost(BigDecimal allCost) {
+        this.allCost = allCost;
+    }
+
+    public String getIfsPrNo() {
+        return ifsPrNo;
+    }
+
+    public void setIfsPrNo(String ifsPrNo) {
+        this.ifsPrNo = ifsPrNo;
+    }
+
+    public String getPoNumber() {
+        return poNumber;
+    }
+
+    public void setPoNumber(String poNumber) {
+        this.poNumber = poNumber;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getPlanner() {
+        return planner;
+    }
+
+    public void setPlanner(String planner) {
+        this.planner = planner;
+    }
+
+    public String getApplicant() {
+        return applicant;
+    }
+
+    public void setApplicant(String applicant) {
+        this.applicant = applicant;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}
+

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

@@ -130,4 +130,26 @@ public interface ProjectService {
      * @throw
      */
     void deleteProjectPartWithId(PlmProjectPartData data);
+
+    /**
+     * @Description TODO
+     * @Title getPlmToolPurchaseRequestDataByProject
+      * @param data
+     * @author rq
+     * @date 2023/9/13 14:33
+     * @return List<PlmToolPurchaseRequestData>
+     * @throw
+     */
+    List<PlmToolPurchaseRequestData> getPlmToolPurchaseRequestDataByProject(PlmProjectInfoData data);
+
+    /**
+     * @Description TODO
+     * @Title savePlmToolPurchaseRequestData
+      * @param
+     * @author rq
+     * @date 2023/9/14 11:25
+     * @return void
+     * @throw
+     */
+    void savePlmToolPurchaseRequestData(PlmToolPurchaseRequestData data);
 }

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

@@ -201,4 +201,19 @@ public class ProjectServiceImpl implements ProjectService {
 
     }
 
+    @Override
+    public List<PlmToolPurchaseRequestData> getPlmToolPurchaseRequestDataByProject(PlmProjectInfoData data){
+        return projectDao.getPlmToolPurchaseRequestDataByProject(data);
+    }
+
+    @Override
+    public void savePlmToolPurchaseRequestData(PlmToolPurchaseRequestData data){
+        if(data.getId()==0){
+            String orderNo=transNoControlService.transNo("1","purchase_request");
+            data.setOrderNo(orderNo);
+            projectDao.savePlmToolPurchaseRequestData(data);
+        }else {
+            // projectDao.updatePlmToolPurchaseRequestData(data);
+        }
+    }
 }

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

@@ -157,4 +157,20 @@ update_by,dbo.plm_get_projectBaseDesc(part_type,'part_type') partTypeDesc
     delete from plm_project_part  where id=#{id}
 </delete>
 
+<select id="getPlmToolPurchaseRequestDataByProject" resultType="PlmToolPurchaseRequestData">
+    select id,site,order_no,test_part_no,project_id,tool_id,type,reason,tool_offset,qty,party_a,supplier_id,price,tool_cost,
+    all_cost,IFS_PR_No,po_number,remark,create_by,create_date,update_by,update_date,planner,applicant,dbo.get_userDisPlay(applicant) applicantName,
+    dbo.get_userDisPlay(planner) plannerName,dbo.plm_get_test_part_name(site,test_part_no) partName
+    ,status ,dbo.plm_get_projectBaseDesc(status,'purchaseRequest_status')
+    from plm_tool_purchase_request
+    where site=${site} and project_id=#{projectId}
+</select>
+
+<insert id="savePlmToolPurchaseRequestData">
+    insert into plm_tool_purchase_request (site,order_no,test_part_no,project_id,tool_id,type,status,reason,tool_offset,qty,party_a,supplier_id,price,tool_cost,
+    all_cost,IFS_PR_No,po_number,remark,create_by,create_date,planner,applicant) values
+    (#{site},#{orderNo},#{testPartNo},#{projectId},#{toolId},#{type},#{status},#{reason},#{toolOffset},#{qty},#{partyA},#{supplierId},${price},#{toolCost},
+    #{allCost},#{ifsPrNo},#{poNumber},#{remark},#{username},GetDate(),#{planner},#{applicant})
+</insert>
+
 </mapper>