diff --git a/src/main/java/com/gaotao/modules/base/controller/ProductProcessRouteController.java b/src/main/java/com/gaotao/modules/base/controller/ProductProcessRouteController.java index 38d3eb1..6f09a5c 100644 --- a/src/main/java/com/gaotao/modules/base/controller/ProductProcessRouteController.java +++ b/src/main/java/com/gaotao/modules/base/controller/ProductProcessRouteController.java @@ -1,6 +1,7 @@ package com.gaotao.modules.base.controller; import com.gaotao.modules.base.entity.CalendarData; +import com.gaotao.modules.base.entity.ProcessRouteToolData; import com.gaotao.modules.base.entity.ProductProcessRouteData; import com.gaotao.modules.base.service.ProductProcessRouteService; import org.springframework.beans.factory.annotation.Autowired; @@ -49,4 +50,26 @@ public class ProductProcessRouteController { } return map; } + + //------------查询-工艺路线工具---------------- + /** + * 获取工艺路线工具 + * @param + * @return + */ + @PostMapping(value="/searchProcessRouteTool") + @ResponseBody + public Object searchProcessRouteTool(@RequestBody ProcessRouteToolData indata){ + Map map = new HashMap<>(); + try { + List result = productProcessRouteService.searchProcessRouteTool(indata); + map.put("success", true); + map.put("rows", result); + map.put("total", result.size()); + } catch (Exception e) { + map.put("success", false); + map.put("msg", e.getMessage()); + } + return map; + } } diff --git a/src/main/java/com/gaotao/modules/base/dao/ProductProcessRouteMapper.java b/src/main/java/com/gaotao/modules/base/dao/ProductProcessRouteMapper.java index 2a8766f..ef37c9f 100644 --- a/src/main/java/com/gaotao/modules/base/dao/ProductProcessRouteMapper.java +++ b/src/main/java/com/gaotao/modules/base/dao/ProductProcessRouteMapper.java @@ -1,5 +1,6 @@ package com.gaotao.modules.base.dao; +import com.gaotao.modules.base.entity.ProcessRouteToolData; import com.gaotao.modules.base.entity.ProductProcessRouteData; import org.apache.ibatis.annotations.Mapper; @@ -25,4 +26,16 @@ public interface ProductProcessRouteMapper { * @throw */ List searchProductProcessRoute(ProductProcessRouteData indata); + + //------------查询-工艺路线工具---------------- + /** + * @Description 查询-工艺路线工具 + * @Title searchProcessRouteTool + * @param inData + * @author rq + * @date 2021/10/12 18:00 + * @return List + * @throw + */ + List searchProcessRouteTool(ProcessRouteToolData inData); } diff --git a/src/main/java/com/gaotao/modules/base/entity/ProcessRouteToolData.java b/src/main/java/com/gaotao/modules/base/entity/ProcessRouteToolData.java new file mode 100644 index 0000000..bdc94ce --- /dev/null +++ b/src/main/java/com/gaotao/modules/base/entity/ProcessRouteToolData.java @@ -0,0 +1,259 @@ +package com.gaotao.modules.base.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +public class ProcessRouteToolData { + private String toolID; + private String toolDescription; + private String toolSpec; + private String toolFamilyID; + private String toolFamilyName; + private String toolActive; + private String partNo; + private String partDescription; + private String spec; + private String active; + private String revNo; + private Double itemNo; + private String operationDesc; + private String workCenterNo; + private String routingType; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date phaseInDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date phaseOutDate; + private String status; + private String defaultflag; + private String repairFlag; + private String familyID; + private String familyName; + private String groupID; + private String groupName; + private String site; + private String user; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date1; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date2; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date3; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date4; + + public String getToolID() { + return toolID; + } + + public void setToolID(String toolID) { + this.toolID = toolID; + } + + public String getToolDescription() { + return toolDescription; + } + + public void setToolDescription(String toolDescription) { + this.toolDescription = toolDescription; + } + + public String getToolSpec() { + return toolSpec; + } + + public void setToolSpec(String toolSpec) { + this.toolSpec = toolSpec; + } + + public String getToolFamilyID() { + return toolFamilyID; + } + + public void setToolFamilyID(String toolFamilyID) { + this.toolFamilyID = toolFamilyID; + } + + public String getToolFamilyName() { + return toolFamilyName; + } + + public void setToolFamilyName(String toolFamilyName) { + this.toolFamilyName = toolFamilyName; + } + + public String getToolActive() { + return toolActive; + } + + public void setToolActive(String toolActive) { + this.toolActive = toolActive; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getPartDescription() { + return partDescription; + } + + public void setPartDescription(String partDescription) { + this.partDescription = partDescription; + } + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getRevNo() { + return revNo; + } + + public void setRevNo(String revNo) { + this.revNo = revNo; + } + + public Double getItemNo() { + return itemNo; + } + + public void setItemNo(Double itemNo) { + this.itemNo = itemNo; + } + + public String getOperationDesc() { + return operationDesc; + } + + public void setOperationDesc(String operationDesc) { + this.operationDesc = operationDesc; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public String getRoutingType() { + return routingType; + } + + public void setRoutingType(String routingType) { + this.routingType = routingType; + } + + public Date getPhaseInDate() { + return phaseInDate; + } + + public void setPhaseInDate(Date phaseInDate) { + this.phaseInDate = phaseInDate; + } + + public Date getPhaseOutDate() { + return phaseOutDate; + } + + public void setPhaseOutDate(Date phaseOutDate) { + this.phaseOutDate = phaseOutDate; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDefaultflag() { + return defaultflag; + } + + public void setDefaultflag(String defaultflag) { + this.defaultflag = defaultflag; + } + + public String getRepairFlag() { + return repairFlag; + } + + public void setRepairFlag(String repairFlag) { + this.repairFlag = repairFlag; + } + + public String getFamilyID() { + return familyID; + } + + public void setFamilyID(String familyID) { + this.familyID = familyID; + } + + public String getFamilyName() { + return familyName; + } + + public void setFamilyName(String familyName) { + this.familyName = familyName; + } + + public String getGroupID() { + return groupID; + } + + public void setGroupID(String groupID) { + this.groupID = groupID; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } +} diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/ProductProcessRouteServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/ProductProcessRouteServiceImpl.java index dfefa90..dbd4d40 100644 --- a/src/main/java/com/gaotao/modules/base/service/Impl/ProductProcessRouteServiceImpl.java +++ b/src/main/java/com/gaotao/modules/base/service/Impl/ProductProcessRouteServiceImpl.java @@ -2,6 +2,7 @@ package com.gaotao.modules.base.service.Impl; import com.gaotao.modules.base.dao.BaseMapper; import com.gaotao.modules.base.dao.ProductProcessRouteMapper; +import com.gaotao.modules.base.entity.ProcessRouteToolData; import com.gaotao.modules.base.entity.ProductProcessRouteData; import com.gaotao.modules.base.service.ProductProcessRouteService; import org.springframework.beans.factory.annotation.Autowired; @@ -23,4 +24,11 @@ public class ProductProcessRouteServiceImpl implements ProductProcessRouteServic public List searchProductProcessRoute(ProductProcessRouteData indata){ return productProcessRouteMapper.searchProductProcessRoute(indata); } + + //------------查询-工艺路线工具---------------- + @Override + public List searchProcessRouteTool(ProcessRouteToolData indata){ + return productProcessRouteMapper.searchProcessRouteTool(indata); + } + } diff --git a/src/main/java/com/gaotao/modules/base/service/ProductProcessRouteService.java b/src/main/java/com/gaotao/modules/base/service/ProductProcessRouteService.java index c2a1bfe..f41131c 100644 --- a/src/main/java/com/gaotao/modules/base/service/ProductProcessRouteService.java +++ b/src/main/java/com/gaotao/modules/base/service/ProductProcessRouteService.java @@ -1,6 +1,7 @@ package com.gaotao.modules.base.service; import com.gaotao.modules.base.entity.PartData; +import com.gaotao.modules.base.entity.ProcessRouteToolData; import com.gaotao.modules.base.entity.ProductProcessRouteData; import java.util.List; @@ -19,4 +20,16 @@ public interface ProductProcessRouteService { * @throw */ List searchProductProcessRoute(ProductProcessRouteData indata); + + //------------查询-工艺路线工具---------------- + /** + * @Description 查询-工艺路线工具 + * @Title searchProcessRouteTool + * @param inData + * @author rq + * @date 2021/10/12 18:00 + * @return List + * @throw + */ + List searchProcessRouteTool(ProcessRouteToolData inData); } diff --git a/src/main/resources/mapper/base/ProductProcessRouteMapper.xml b/src/main/resources/mapper/base/ProductProcessRouteMapper.xml index 8802b3f..dff5ca5 100644 --- a/src/main/resources/mapper/base/ProductProcessRouteMapper.xml +++ b/src/main/resources/mapper/base/ProductProcessRouteMapper.xml @@ -63,4 +63,73 @@ + + + \ No newline at end of file