diff --git a/src/main/java/com/gaotao/modules/base/controller/BaseController.java b/src/main/java/com/gaotao/modules/base/controller/BaseController.java index f57a0e4..298156a 100644 --- a/src/main/java/com/gaotao/modules/base/controller/BaseController.java +++ b/src/main/java/com/gaotao/modules/base/controller/BaseController.java @@ -1304,4 +1304,99 @@ public class BaseController { } return responseData; } + + /** + * @Description 工序下拉框 + * @Title getItemSelect + * @param inData + * @author rq + * @date 2022/1/18 14:38 + * @return Object + * @throw + */ + @PostMapping("/getItemSelect") + @ResponseBody + public Object getItemSelect(@RequestBody RoutingDetailData inData){ + Map map = new HashMap<>(); + try { + List resultList = baseService.getItemSelect(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 getToolDesc + * @param inData + * @author rq + * @date 2022/1/18 14:38 + * @return Object + * @throw + */ + @PostMapping("/getToolDesc") + @ResponseBody + public Object getToolDesc(@RequestBody ToolHeaderData inData){ + Map map = new HashMap<>(); + try { + List resultList = baseService.getToolDesc(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 saveRoutingTool + * @param inData + * @author rq + * @date 2022/1/15 15:48 + * @return Object + * @throw + */ + @PostMapping("/saveRoutingTool") + @ResponseBody + public Object saveRoutingTool(@RequestBody RoutingToolData inData){ + ResponseData responseData = new ResponseData(); + try { + responseData = baseService.saveRoutingTool(inData); + } catch (Exception e) { + responseData.setMsg(e.getMessage()); + responseData.setCode("500"); + } + return responseData; + } + + /** + * @Description 删除工艺路线工具 + * @Title deleteRoutingTool + * @param inData + * @author rq + * @date 2022/1/15 15:48 + * @return Object + * @throw + */ + @PostMapping("/deleteRoutingTool") + @ResponseBody + public Object deleteRoutingTool(@RequestBody RoutingToolData inData){ + ResponseData responseData = new ResponseData(); + try { + responseData = baseService.deleteRoutingTool(inData); + } catch (Exception e) { + responseData.setMsg(e.getMessage()); + responseData.setCode("500"); + } + return responseData; + } } diff --git a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java index b633a1c..a50cf1f 100644 --- a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java +++ b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java @@ -988,4 +988,70 @@ public interface BaseMapper { * @throw */ void deleteRoutingResource(RoutingDetailAvailableResourceData indata); + + /** + * @Description 工序下拉框 + * @Title getItemSelect + * @param inData + * @author rq + * @date 2022/1/18 14:39 + * @return List + * @throw + */ + List getItemSelect(RoutingDetailData inData); + + /** + * @Description 工具详情 + * @Title getToolDesc + * @param inData + * @author rq + * @date 2022/1/18 15:19 + * @return List + * @throw + */ + List getToolDesc(ToolHeaderData inData); + + /** + * @Description 检查工具 + * @Title checkToolHeader + * @param inData + * @author rq + * @date 2022/1/18 17:21 + * @return List + * @throw + */ + List checkToolHeader(@Param("site") String site,@Param("toolID") String toolID); + + /** + * @Description 保存工具 + * @Title saveRoutingToolData + * @param + * @author rq + * @date 2022/1/18 17:34 + * @return void + * @throw + */ + void saveRoutingToolData(RoutingToolData inData); + + /** + * @Description 编辑工具 + * @Title editRoutingToolData + * @param + * @author rq + * @date 2022/1/18 17:34 + * @return void + * @throw + */ + void editRoutingToolData(RoutingToolData inData); + + /** + * @Description 删除工具 + * @Title deleteRoutingTool + * @param inData + * @author rq + * @date 2022/1/18 17:59 + * @return void + * @throw + */ + void deleteRoutingTool(RoutingToolData inData); } diff --git a/src/main/java/com/gaotao/modules/base/entity/RoutingToolData.java b/src/main/java/com/gaotao/modules/base/entity/RoutingToolData.java index be7a933..1e3c20d 100644 --- a/src/main/java/com/gaotao/modules/base/entity/RoutingToolData.java +++ b/src/main/java/com/gaotao/modules/base/entity/RoutingToolData.java @@ -25,7 +25,8 @@ public class RoutingToolData { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createDate; private String createdBy; - + private String user; + private int add; public String getSite() { return site; } @@ -137,4 +138,20 @@ public class RoutingToolData { public void setPartNo(String partNo) { this.partNo = partNo; } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public int getAdd() { + return add; + } + + public void setAdd(int add) { + this.add = add; + } } diff --git a/src/main/java/com/gaotao/modules/base/entity/ToolHeaderData.java b/src/main/java/com/gaotao/modules/base/entity/ToolHeaderData.java new file mode 100644 index 0000000..24ee5e3 --- /dev/null +++ b/src/main/java/com/gaotao/modules/base/entity/ToolHeaderData.java @@ -0,0 +1,227 @@ +package com.gaotao.modules.base.entity; + +import java.util.Date; + +public class ToolHeaderData { + /** + * 工具编号 + */ + private String toolID; + + /** + * 工厂编号 + */ + private String site; + + /** + * 工具名称 + */ + private String toolDescription; + + /** + * 规格型号 + */ + private String spec; + + /** + * 工具分类 + */ + private String familyID; + + /** + * 是否在用Y/N + */ + private String active; + + /** + * 备注 + */ + private String remark; + + /** + * 标准成本 + */ + private Double standardCost; + + /** + * 属性模板 + */ + private String codeNo; + + /** + * 创建日期 + */ + private Date createDate; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 计量单位 + */ + private String umid; + + /** + * 默认仓库 + */ + private String defaultWarehouseID; + + /** + * 最近更改人 + */ + private String lastUpdateBy; + + /** + * 默认库位 + */ + private String defaultLocationID; + + /** + * 是否创建物料 + */ + private String partCreatedFlag; + + /** + * 对应物料编码 + */ + private String partNo; + + public String getToolID() { + return toolID; + } + + public void setToolID(String toolID) { + this.toolID = toolID; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + 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 String getFamilyID() { + return familyID; + } + + public void setFamilyID(String familyID) { + this.familyID = familyID; + } + + 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 Double getStandardCost() { + return standardCost; + } + + public void setStandardCost(Double standardCost) { + this.standardCost = standardCost; + } + + public String getCodeNo() { + return codeNo; + } + + public void setCodeNo(String codeNo) { + this.codeNo = codeNo; + } + + 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 getUmid() { + return umid; + } + + public void setUmid(String umid) { + this.umid = umid; + } + + public String getDefaultWarehouseID() { + return defaultWarehouseID; + } + + public void setDefaultWarehouseID(String defaultWarehouseID) { + this.defaultWarehouseID = defaultWarehouseID; + } + + public String getLastUpdateBy() { + return lastUpdateBy; + } + + public void setLastUpdateBy(String lastUpdateBy) { + this.lastUpdateBy = lastUpdateBy; + } + + public String getDefaultLocationID() { + return defaultLocationID; + } + + public void setDefaultLocationID(String defaultLocationID) { + this.defaultLocationID = defaultLocationID; + } + + public String getPartCreatedFlag() { + return partCreatedFlag; + } + + public void setPartCreatedFlag(String partCreatedFlag) { + this.partCreatedFlag = partCreatedFlag; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } +} + diff --git a/src/main/java/com/gaotao/modules/base/service/BaseService.java b/src/main/java/com/gaotao/modules/base/service/BaseService.java index 35c2066..45607fd 100644 --- a/src/main/java/com/gaotao/modules/base/service/BaseService.java +++ b/src/main/java/com/gaotao/modules/base/service/BaseService.java @@ -624,4 +624,48 @@ public interface BaseService { * @throw */ ResponseData deleteRoutingResource(RoutingDetailAvailableResourceData inData); + + /** + * @Description 工序下拉框 + * @Title getItemSelect + * @param inData + * @author rq + * @date 2022/1/18 14:39 + * @return List + * @throw + */ + List getItemSelect(RoutingDetailData inData); + + /** + * @Description 工具详情 + * @Title getToolDesc + * @param inData + * @author rq + * @date 2022/1/18 15:19 + * @return List + * @throw + */ + List getToolDesc(ToolHeaderData inData); + + /** + * @Description 保存工具 + * @Title saveRoutingTool + * @param inData + * @author rq + * @date 2022/1/18 16:52 + * @return ResponseData + * @throw + */ + ResponseData saveRoutingTool(RoutingToolData inData); + + /** + * @Description 删除工艺路线工具 + * @Title deleteRoutingTool + * @param inData + * @author rq + * @date 2022/1/18 16:52 + * @return ResponseData + * @throw + */ + ResponseData deleteRoutingTool(RoutingToolData inData); } diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java index a4b2e3f..d6948fb 100644 --- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java @@ -1317,4 +1317,59 @@ public class BaseServiceImpl implements BaseService { responseData.setMsg("操作成功!"); return responseData; } + + @Override + public List getItemSelect(RoutingDetailData inData){ + return baseMapper.getItemSelect(inData); + } + + + @Override + public List getToolDesc(ToolHeaderData inData){ + return baseMapper.getToolDesc(inData); + } + @Override + public ResponseData saveRoutingTool(RoutingToolData inData){ + ResponseData responseData = new ResponseData(); + List check=baseMapper.checkToolHeader(inData.getSite(),inData.getToolID()); + if(check.size()==0){ + responseData.setMsg("该工具编码不存在！"); + responseData.setCode("500"); + return responseData; + } + if (inData.getAdd()==0){ + List list3=baseMapper.checkSiteId(inData.getSite()); + if(list3.size()==0){ + responseData.setMsg("该工厂编码不存在！"); + responseData.setCode("500"); + return responseData; + } + List check2 =baseMapper.searchRoutingToolData(inData); + if(check2.size()>0){ + responseData.setMsg("该工序已存在当前工具无需重复添加！"); + responseData.setCode("500"); + return responseData; + } + //新增 + baseMapper.saveRoutingToolData(inData); + }else{ + + baseMapper.editRoutingToolData(inData); + } + responseData.setCode("200"); + responseData.setSuccess(true); + responseData.setMsg("操作成功!"); + return responseData; + } + + @Override + public ResponseData deleteRoutingTool(RoutingToolData inData){ + ResponseData responseData = new ResponseData(); + baseMapper.deleteRoutingTool(inData); + responseData.setCode("200"); + responseData.setSuccess(true); + responseData.setMsg("操作成功!"); + return responseData; + } + } diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index 1de969c..02e6a44 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -693,9 +693,14 @@ dbo.Get_Part_DescSpec(site,WX_PartNo) as wxSpec,dbo.Get_WorkCenter_Type(Site,Wor ,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.ToolID = #{toolID} + + and T.Site=P.Site and T.ToolID=P.ToolID and T.PartNo=#{partNo} and T.Site=#{site} and T.RevNo=#{revNo} + + SELECT ItemNo,OperationDesc from RoutingDetail + + + and partNo = #{partNo} + + + and site = #{site} + + + and revNo = #{revNo} + + + and ItemNo = #{itemNo} + + + + + + + + + + INSERT INTO RoutingTool(Site,PartNo,RevNo,ItemNo,ToolID,ToolQty,Remark,CreateDate,CreatedBy) + VALUES(#{site},#{partNo},#{revNo},#{itemNo},#{toolID},#{toolQty},#{remark},GETDATE(),#{user} ) + + + + update RoutingTool SET ToolQty=#{toolQty},Remark=#{remark} + WHERE Site=#{site} and PartNo=#{partNo} and ToolID=#{toolID} and RevNo=#{revNo} and ItemNo=#{itemNo} + + + + delete from RoutingTool WHERE Site=#{site} and PartNo=#{partNo} and ToolID=#{toolID} and RevNo=#{revNo} and ItemNo=#{itemNo} + \ No newline at end of file