diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java index 0de7684e..bfc931a4 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -335,4 +335,32 @@ public class TechnicalSpecificationController { return R.ok().put("row",page); } + @PostMapping(value="/searchBMRoute") + @ResponseBody + public R searchBMRoute(@RequestBody SearchBMData data){ + List rows= technicalSpecificationService.searchBMRoute(data); + return R.ok().put("rows", rows); + } + /** + * @Description TODO + * @Title searchBMRoute + * @param data + * @author rq + * @date 2023/12/6 17:29 + * @return R + * @throw + */ + @PostMapping(value="/saveBMRoute") + @ResponseBody + public R saveBMRoute(@RequestBody PlmBmRoutingDetailData data){ + technicalSpecificationService.saveBMRoute(data); + return R.ok(); + } + + @PostMapping(value="/deleteBMRoute") + @ResponseBody + public R deleteBMRoute(@RequestBody PlmBmRoutingDetailData data){ + technicalSpecificationService.deleteBMRoute(data); + return R.ok(); + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index fb6c98da..48236cc0 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -330,4 +330,40 @@ public interface TechnicalSpecificationMapper { * @throw */ List getBMPageBase(SearchBMData data); + + + /** + * @Description TODO + * @Title searchBMRoute + * @param + * @author rq + * @date 2023/12/6 16:59 + * @return List + * @throw + */ + List searchBMRoute(SearchBMData data); + + /** + * @Description TODO + * @Title saveBMRoute + * @param data + * @author rq + * @date 2023/12/6 17:33 + * @return void + * @throw + */ + void saveBMRoute(PlmBmRoutingDetailData data); + + /** + * @Description TODO + * @Title updateBMRoute + * @param data + * @author rq + * @date 2023/12/6 17:33 + * @return void + * @throw + */ + void updateBMRoute(PlmBmRoutingDetailData data); + + void deleteBMRoute(PlmBmRoutingDetailData data); } diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmBmRoutingDetailData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmBmRoutingDetailData.java new file mode 100644 index 00000000..b5c42b31 --- /dev/null +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmBmRoutingDetailData.java @@ -0,0 +1,10 @@ +package com.spring.modules.sampleManagement.data; + +import com.spring.modules.sampleManagement.entity.PlmBmRoutingDetail; +import lombok.Data; +import org.apache.ibatis.type.Alias; +@Data +@Alias("PlmBmRoutingDetailData") +public class PlmBmRoutingDetailData extends PlmBmRoutingDetail { + private String username; +} diff --git a/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmRoutingDetail.java b/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmRoutingDetail.java new file mode 100644 index 00000000..e1b3350b --- /dev/null +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmRoutingDetail.java @@ -0,0 +1,136 @@ +package com.spring.modules.sampleManagement.entity; + +import java.util.Date; + +public class PlmBmRoutingDetail { + /** + * + */ + private Integer id; + + /** + * + */ + private String site; + + /** + * + */ + private String codeNo; + + /** + * + */ + private Integer itemNo; + + /** + * + */ + private String operationDesc; + + /** + * + */ + 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 getCodeNo() { + return codeNo; + } + + public void setCodeNo(String codeNo) { + this.codeNo = codeNo; + } + + public Integer getItemNo() { + return itemNo; + } + + public void setItemNo(Integer itemNo) { + this.itemNo = itemNo; + } + + public String getOperationDesc() { + return operationDesc; + } + + public void setOperationDesc(String operationDesc) { + this.operationDesc = operationDesc; + } + + 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; + } +} + diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index 7b9f1122..b4ea0e8e 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -219,6 +219,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification @Override public List searchBMBom(PlmBmBomData inData){ + return technicalSpecificationMapper.searchBMBom(inData); } @@ -338,4 +339,25 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification } return row; } + + @Override + public List searchBMRoute(SearchBMData data){ + return technicalSpecificationMapper.searchBMRoute(data); + } + + @Override + public void saveBMRoute(PlmBmRoutingDetailData data){ + if(data.getId()==0){ + technicalSpecificationMapper.saveBMRoute(data); + }else{ + technicalSpecificationMapper.updateBMRoute(data); + } + } + + @Override + public void deleteBMRoute(PlmBmRoutingDetailData data){ + + technicalSpecificationMapper.deleteBMRoute(data); + + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java index befff54f..a100b9ca 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -275,4 +275,28 @@ public interface TechnicalSpecificationService { * @throw */ String getBMPageBase(SearchBMData data); + + /** + * @Description TODO + * @Title searchBMRoute + * @param + * @author rq + * @date 2023/12/6 16:59 + * @return List + * @throw + */ + List searchBMRoute(SearchBMData data); + + /** + * @Description TODO + * @Title saveBMRoute + * @param data + * @author rq + * @date 2023/12/6 17:30 + * @return void + * @throw + */ + void saveBMRoute(PlmBmRoutingDetailData data); + + void deleteBMRoute(PlmBmRoutingDetailData data); } diff --git a/src/main/resources/mapper/base/PropertiesMapper.xml b/src/main/resources/mapper/base/PropertiesMapper.xml index acb2706d..2dde2e34 100644 --- a/src/main/resources/mapper/base/PropertiesMapper.xml +++ b/src/main/resources/mapper/base/PropertiesMapper.xml @@ -344,6 +344,9 @@ AND active = #{query.active} + + + AND bu_no = #{query.buNo} and function_type = #{query.functionType} diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 7621d320..9a1a69af 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -264,7 +264,26 @@ a.wiRevison,a.wiDate,a.routingRemark,a.routingAction, + + + + + + + delete from plm_bm_routing_detail where id=#{id} + + \ No newline at end of file