20211213

src/main/java/com/gaotao/modules/base/controller/BaseController.java

@@ -1185,4 +1185,123 @@ public class BaseController {
         }
         return responseData;
     }
+
+    /**
+     * @Description 查询工艺路线工具
+     * @Title searchRoutingDetailData
+     * @param indata
+     * @author rq
+     * @date 2022/1/14 17:18
+     * @return Object
+     * @throw
+     */
+    @PostMapping("/searchRoutingToolData")
+    @ResponseBody
+    public Object searchRoutingToolData(@RequestBody RoutingToolData indata){
+        Map<String, Object> map = new HashMap<>();
+        try {
+            List<RoutingToolData> resultList = baseService.searchRoutingToolData(indata);
+            map.put("success", true);
+            map.put("rows", resultList);
+            map.put("total", resultList.size());
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("msg", e.getMessage());
+        }
+        return map;
+    }
+
+    /**
+     * @Description 工艺路线可用机台
+     * @Title searchAllResource
+     * @param indata
+     * @author rq
+     * @date 2022/1/14 17:18
+     * @return Object
+     * @throw
+     */
+    @PostMapping("/searchAllResource")
+    @ResponseBody
+    public Object searchAllResource(@RequestBody WorkCenterResourceData indata){
+        Map<String, Object> map = new HashMap<>();
+        try {
+            List<WorkCenterResourceData> resultList = baseService.searchAllResource(indata);
+            map.put("success", true);
+            map.put("rows", resultList);
+            map.put("total", resultList.size());
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("msg", e.getMessage());
+        }
+        return map;
+    }
+
+    /**
+     * @Description 工艺路线已选机台
+     * @Title searchUsedResource
+     * @param indata
+     * @author rq
+     * @date 2022/1/14 17:18
+     * @return Object
+     * @throw
+     */
+    @PostMapping("/searchUsedResource")
+    @ResponseBody
+    public Object searchUsedResource(@RequestBody WorkCenterResourceData indata){
+        Map<String, Object> map = new HashMap<>();
+        try {
+            List<WorkCenterResourceData> resultList = baseService.searchUsedResource(indata);
+            map.put("success", true);
+            map.put("rows", resultList);
+            map.put("total", resultList.size());
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("msg", e.getMessage());
+        }
+        return map;
+    }
+
+    /**
+     * @Description TODO
+     * @Title saveRoutingDetailData
+     * @param inData
+     * @author rq
+     * @date 2022/1/15 15:48
+     * @return Object
+     * @throw
+     */
+    @PostMapping("/addRoutingResource")
+    @ResponseBody
+    public Object addRoutingResource(@RequestBody RoutingDetailAvailableResourceData inData){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData = baseService.addRoutingResource(inData);
+        } catch (Exception e) {
+            responseData.setMsg(e.getMessage());
+            responseData.setCode("500");
+        }
+        return responseData;
+    }
+
+
+    /**
+     * @Title deleteRoutingResource
+     * @Description 删除机台
+     * @author rq
+     * @date 2021/4/16 11:56
+     * @return {@link Object}
+     */
+
+    @PostMapping("/deleteRoutingResource")
+    @ResponseBody
+    public Object deleteRoutingResource(@RequestBody RoutingDetailAvailableResourceData inData){
+        ResponseData responseData = new ResponseData();
+        try {
+            responseData = baseService.deleteRoutingResource(inData);
+        } catch (Exception e) {
+            responseData.setMsg(e.getMessage());
+            responseData.setCode("500");
+        }
+        return responseData;
+    }
 }

src/main/java/com/gaotao/modules/base/dao/BaseMapper.java

@@ -923,4 +923,69 @@ public interface BaseMapper {
      * @throw
      */
     void deleteRoutingDetail(RoutingDetailData inData);
+
+    /**
+     * @Description 查询工艺路线工具
+     * @Title searchRoutingToolData
+     * @param indata
+     * @author rq
+     * @date 2022/1/17 11:29
+     * @return List<RoutingToolData>
+     * @throw
+     */
+    List<RoutingToolData> searchRoutingToolData(RoutingToolData indata);
+
+    /**
+     * @Description 工艺路线可用机台
+     * @Title searchAllResource
+     * @param indata
+     * @author rq
+     * @date 2022/1/17 15:32
+     * @return List<WorkCenterResourceData>
+     * @throw
+     */
+    List<WorkCenterResourceData> searchAllResource(WorkCenterResourceData indata);
+
+    /**
+     * @Description 工艺路线已选机台
+     * @Title searchAllResource
+     * @param indata
+     * @author rq
+     * @date 2022/1/17 15:32
+     * @return List<WorkCenterResourceData>
+     * @throw
+     */
+    List<WorkCenterResourceData> searchUsedResource(WorkCenterResourceData indata);
+    /**
+     * @Description
+     * @Title checkRoutingResource
+     * @param indata
+     * @author rq
+     * @date 2022/1/17 15:32
+     * @return List<WorkCenterResourceData>
+     * @throw
+     */
+    List<RoutingDetailAvailableResourceData> checkRoutingResource(RoutingDetailAvailableResourceData indata);
+
+    /**
+     * @Description TODO
+     * @Title addRoutingResource
+      * @param indata
+     * @author rq
+     * @date 2022/1/17 16:54
+     * @return void
+     * @throw
+     */
+    void addRoutingResource(RoutingDetailAvailableResourceData indata);
+
+    /**
+     * @Description 删除机台
+     * @Title deleteRoutingResource
+     * @param indata
+     * @author rq
+     * @date 2022/1/17 16:54
+     * @return void
+     * @throw
+     */
+    void deleteRoutingResource(RoutingDetailAvailableResourceData indata);
 }

src/main/java/com/gaotao/modules/base/entity/RoutingDetailAvailableResourceData.java

@@ -0,0 +1,69 @@
+package com.gaotao.modules.base.entity;
+
+public class RoutingDetailAvailableResourceData {
+    /**
+     *
+     */
+    private String site;
+
+    /**
+     *
+     */
+    private String partNo;
+
+    /**
+     *
+     */
+    private String revNo;
+
+    /**
+     *
+     */
+    private Double itemNo;
+
+    /**
+     *
+     */
+    private String resourceID;
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getPartNo() {
+        return partNo;
+    }
+
+    public void setPartNo(String partNo) {
+        this.partNo = partNo;
+    }
+
+    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 getResourceID() {
+        return resourceID;
+    }
+
+    public void setResourceID(String resourceID) {
+        this.resourceID = resourceID;
+    }
+}
+

src/main/java/com/gaotao/modules/base/entity/RoutingToolData.java

@@ -0,0 +1,140 @@
+package com.gaotao.modules.base.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.xml.crypto.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class RoutingToolData {
+    private String site;
+    private String partNo;
+    private String revNo;
+    private Float itemNo;
+    private String toolID;
+    private String toolDescription;
+    private String spec;
+    private Float toolQty;
+    private String familyID;
+    private String familyName;
+    private String active;
+    private String remark;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createDate;
+    private String createdBy;
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getRevNo() {
+        return revNo;
+    }
+
+    public void setRevNo(String revNo) {
+        this.revNo = revNo;
+    }
+
+    public Float getItemNo() {
+        return itemNo;
+    }
+
+    public void setItemNo(Float itemNo) {
+        this.itemNo = itemNo;
+    }
+
+    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 getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public Float getToolQty() {
+        return toolQty;
+    }
+
+    public void setToolQty(Float toolQty) {
+        this.toolQty = toolQty;
+    }
+
+    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 getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    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 getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getPartNo() {
+        return partNo;
+    }
+
+    public void setPartNo(String partNo) {
+        this.partNo = partNo;
+    }
+}

src/main/java/com/gaotao/modules/base/entity/WorkCenterResourceData.java

@@ -63,6 +63,10 @@ public class WorkCenterResourceData {
      */
     private String virturlFlag;
 
+    private String partNo;
+    private String revNo;
+    private Float itemNo;
+
     public String getSite() {
         return site;
     }
@@ -158,5 +162,29 @@ public class WorkCenterResourceData {
     public void setAdd(int add) {
         this.add = add;
     }
+
+    public String getPartNo() {
+        return partNo;
+    }
+
+    public void setPartNo(String partNo) {
+        this.partNo = partNo;
+    }
+
+    public String getRevNo() {
+        return revNo;
+    }
+
+    public void setRevNo(String revNo) {
+        this.revNo = revNo;
+    }
+
+    public Float getItemNo() {
+        return itemNo;
+    }
+
+    public void setItemNo(Float itemNo) {
+        this.itemNo = itemNo;
+    }
 }
 

src/main/java/com/gaotao/modules/base/service/BaseService.java

@@ -569,4 +569,59 @@ public interface BaseService {
      * @throw
      */
     ResponseData deleteRoutingDetail(RoutingDetailData inData);
+
+    /**
+     * @Description 查询工艺路线工具
+     * @Title searchRoutingToolData 
+      * @param indata 
+     * @author rq
+     * @date 2022/1/17 11:29 
+     * @return List<RoutingToolData>
+     * @throw
+     */
+    List<RoutingToolData> searchRoutingToolData(RoutingToolData indata);
+
+    /**
+     * @Description 工艺路线可用机台
+     * @Title searchAllResource
+      * @param indata
+     * @author rq
+     * @date 2022/1/17 15:32
+     * @return List<WorkCenterResourceData>
+     * @throw
+     */
+    List<WorkCenterResourceData> searchAllResource(WorkCenterResourceData indata);
+
+    /**
+     * @Description 工艺路线已选机台
+     * @Title searchAllResource
+     * @param indata
+     * @author rq
+     * @date 2022/1/17 15:32
+     * @return List<WorkCenterResourceData>
+     * @throw
+     */
+    List<WorkCenterResourceData> searchUsedResource(WorkCenterResourceData indata);
+
+    /**
+     * @Description 添加机台
+     * @Title addRoutingResource
+     * @param inData
+     * @author rq
+     * @date 2022/1/15 16:17
+     * @return ResponseData
+     * @throw
+     */
+    ResponseData addRoutingResource(RoutingDetailAvailableResourceData inData);
+
+    /**
+     * @Description 删除机台
+     * @Title addRoutingResource
+     * @param inData
+     * @author rq
+     * @date 2022/1/15 16:17
+     * @return ResponseData
+     * @throw
+     */
+    ResponseData deleteRoutingResource(RoutingDetailAvailableResourceData inData);
 }

src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java

@@ -1278,4 +1278,43 @@ public class BaseServiceImpl implements BaseService {
         responseData.setMsg("操作成功!");
         return responseData;
     }
+
+    @Override
+    public  List<RoutingToolData> searchRoutingToolData(RoutingToolData indata){
+        return baseMapper.searchRoutingToolData(indata);
+    }
+
+    @Override
+    public List<WorkCenterResourceData> searchAllResource(WorkCenterResourceData indata){
+        return baseMapper.searchAllResource(indata);
+    }
+
+    @Override
+    public List<WorkCenterResourceData> searchUsedResource(WorkCenterResourceData indata){
+        return baseMapper.searchUsedResource(indata);
+    }
+
+    @Override
+    @Transactional
+    public ResponseData addRoutingResource(RoutingDetailAvailableResourceData inData){
+        ResponseData responseData = new ResponseData();
+        List<RoutingDetailAvailableResourceData> check=baseMapper.checkRoutingResource(inData);
+        if(check.size()==0) {
+            baseMapper.addRoutingResource(inData);
+        }
+        responseData.setCode("200");
+        responseData.setSuccess(true);
+        responseData.setMsg("操作成功!");
+        return responseData;
+    }
+
+    @Override
+    public ResponseData deleteRoutingResource(RoutingDetailAvailableResourceData inData){
+        ResponseData responseData = new ResponseData();
+        baseMapper.deleteRoutingResource(inData);
+        responseData.setCode("200");
+        responseData.setSuccess(true);
+        responseData.setMsg("操作成功!");
+        return responseData;
+    }
 }

src/main/resources/mapper/base/BaseMapper.xml

@@ -687,4 +687,43 @@ dbo.Get_Part_DescSpec(site,WX_PartNo) as wxSpec,dbo.Get_WorkCenter_Type(Site,Wor
     <delete id="deleteRoutingDetail" parameterType="com.gaotao.modules.base.entity.RoutingDetailData">
         delete from RoutingDetail where site=#{site} and PartNo=#{partNo}  and RevNo=#{revNo} and ItemNo=#{itemNo}
     </delete>
+    
+    <select id="searchRoutingToolData" resultType="com.gaotao.modules.base.entity.RoutingToolData">
+        Select T.Site,T.RevNo,T.ItemNo,T.ToolID,P.ToolDescription,P.Spec
+        ,T.ToolQty,P.FamilyID,dbo.Get_PartFamilyDesc(T.Site,P.FamilyID) as FamilyName,P.Active
+        ,T.Remark,T.CreateDate,T.CreatedBy
+         from RoutingTool as T,ToolHeader as P
+         Where T.Site=P.Site and T.ToolID=P.ToolID
+         and T.PartNo=#{partNo}
+         and T.Site=#{site} and T.RevNo=#{revNo}
+    </select>
+
+    <select id="searchAllResource" resultType="com.gaotao.modules.base.entity.WorkCenterResourceData">
+        Select Site,WorkCenterNo,ResourceID,ResourceDesc,Active
+        from WorkCenterResource
+        where site=#{site} and WorkCenterNo=#{workCenterNo} and Active='Y'
+    </select>
+
+     <select id="searchUsedResource" resultType="com.gaotao.modules.base.entity.WorkCenterResourceData">
+       SELECT R.ResourceID,W.ResourceDesc,W.Active FROM
+        RoutingDetail_AvailableResource R
+        LEFT JOIN WorkCenterResource W on W.ResourceID=R.ResourceID and R.Site=W.Site
+        where R.site=#{site} and R.PartNo=#{partNo} and R.revNo=#{revNo} and R.itemNo=#{itemNo} and W.Active='Y'
+    </select>
+
+    <select id="checkRoutingResource" resultType="com.gaotao.modules.base.entity.RoutingDetailAvailableResourceData">
+        SELECT site,ResourceID FROM
+        RoutingDetail_AvailableResource
+        where site=#{site} and PartNo=#{partNo} and revNo=#{revNo} and itemNo=#{itemNo} and ResourceID=#{resourceID}
+    </select>
+
+    <insert id="addRoutingResource" parameterType="com.gaotao.modules.base.entity.RoutingDetailAvailableResourceData">
+        INSERT INTO RoutingDetail_AvailableResource(Site,PartNo,RevNo,ItemNo,ResourceID)
+        VALUES (#{site},#{partNo},#{revNo},#{itemNo},#{resourceID})
+    </insert>
+
+    <delete id="deleteRoutingResource" parameterType="com.gaotao.modules.base.entity.RoutingDetailAvailableResourceData">
+        delete from RoutingDetail_AvailableResource
+        where site=#{site} and PartNo=#{partNo} and revNo=#{revNo} and itemNo=#{itemNo} and ResourceID=#{resourceID}
+    </delete>
 </mapper>