Browse Source

1127

master
ruanqi 3 years ago
parent
commit
be6c93e13f
  1. 28
      src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
  2. 36
      src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
  3. 10
      src/main/java/com/spring/modules/sampleManagement/data/PlmBmRoutingDetailData.java
  4. 136
      src/main/java/com/spring/modules/sampleManagement/entity/PlmBmRoutingDetail.java
  5. 22
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
  6. 24
      src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
  7. 3
      src/main/resources/mapper/base/PropertiesMapper.xml
  8. 21
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

28
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<PlmBmRoutingDetailData> 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();
}
}

36
src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@ -330,4 +330,40 @@ public interface TechnicalSpecificationMapper {
* @throw
*/
List<PlmBmPageBaseData> getBMPageBase(SearchBMData data);
/**
* @Description TODO
* @Title searchBMRoute
* @param
* @author rq
* @date 2023/12/6 16:59
* @return List<PlmBmRoutingDetailData>
* @throw
*/
List<PlmBmRoutingDetailData> 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);
}

10
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;
}

136
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;
}
}

22
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@ -219,6 +219,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
@Override
public List<PlmBmBomData> searchBMBom(PlmBmBomData inData){
return technicalSpecificationMapper.searchBMBom(inData);
}
@ -338,4 +339,25 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
}
return row;
}
@Override
public List<PlmBmRoutingDetailData> 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);
}
}

24
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<PlmBmRoutingDetailData>
* @throw
*/
List<PlmBmRoutingDetailData> 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);
}

3
src/main/resources/mapper/base/PropertiesMapper.xml

@ -344,6 +344,9 @@
</if>
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
<if test="query.buNo != null and query.buNo != ''">
AND bu_no = #{query.buNo}
</if>
<if test="query.functionType != null and query.functionType != ''">
and function_type = #{query.functionType}

21
src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@ -264,7 +264,26 @@ a.wiRevison,a.wiDate,a.routingRemark,a.routingAction,
</update>
<select id="getBMPageBase" resultType="PlmBmPageBaseData">
select bu_no,code_no from plm_bm_pageBase where bu_no=#{buNo}
select bu_no,code_no from plm_bm_model_header where bu_no=#{buNo} and site=#{site} and active='Y'
</select>
<select id="searchBMRoute" resultType="PlmBmRoutingDetailData">
select id,site,code_no,item_no,OperationDesc,remark,create_date,create_by,update_date,update_by
from plm_bm_routing_detail where site=#{site} and code_no=#{codeNo} order by item_no
</select>
<select id="saveBMRoute">
insert into plm_bm_routing_detail (site,code_no,item_no,OperationDesc,remark,create_date,create_by)
values(#{site},#{codeNo},#{itemNo},#{operationDesc},#{remark},GetDate(),#{username})
</select>
<select id="updateBMRoute">
update plm_bm_routing_detail set item_no=#{itemNo},OperationDesc=#{operationDesc}
,remark=#{remark},update_date=GetDate(),update_by=#{username}
where id=#{id}
</select>
<delete id="deleteBMRoute">
delete from plm_bm_routing_detail where id=#{id}
</delete>
</mapper>
Loading…
Cancel
Save