Browse Source

20211213

master
ruanqi 4 years ago
parent
commit
93438a41e8
  1. 43
      src/main/java/com/gaotao/modules/base/controller/BaseController.java
  2. 78
      src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
  3. 9
      src/main/java/com/gaotao/modules/base/entity/RoutingHeaderData.java
  4. 22
      src/main/java/com/gaotao/modules/base/service/BaseService.java
  5. 58
      src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
  6. 32
      src/main/resources/mapper/base/BaseMapper.xml

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

@ -1509,4 +1509,47 @@ public class BaseController {
return responseData;
}
/**
* @Description 保存工艺路线
* @Title saveRoutingHeaderData
* @param inData
* @author rq
* @date 2022/1/25 15:55
* @return Object
* @throw
*/
@PostMapping("/saveRoutingHeaderData")
@ResponseBody
public Object saveRoutingHeaderData(@RequestBody RoutingHeaderData inData){
ResponseData responseData = new ResponseData();
try {
responseData = baseService.saveRoutingHeaderData(inData);
} catch (Exception e) {
responseData.setMsg(e.getMessage());
responseData.setCode("500");
}
return responseData;
}
/**
* @Description 删除工艺路线全部
* @Title deleteRoutingHeaderData
* @param inData
* @author rq
* @date 2022/1/15 15:48
* @return Object
* @throw
*/
@PostMapping("/deleteRoutingHeaderData")
@ResponseBody
public Object deleteRoutingHeaderData(@RequestBody RoutingHeaderData inData){
ResponseData responseData = new ResponseData();
try {
responseData = baseService.deleteRoutingHeaderData(inData);
} catch (Exception e) {
responseData.setMsg(e.getMessage());
responseData.setCode("500");
}
return responseData;
}
}

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

@ -1014,7 +1014,7 @@ public interface BaseMapper {
/**
* @Description 检查工具
* @Title checkToolHeader
* @param inData
* @param
* @author rq
* @date 2022/1/18 17:21
* @return List<ToolHeaderData>
@ -1252,4 +1252,80 @@ public interface BaseMapper {
* @throw
*/
void setDefault(RoutingHeaderData inData);
/**
* @Description
* @Title saveRoutingHeaderData
* @param inData
* @author rq
* @date 2022/1/20 16:39
* @return RoutingHeaderData
* @throw
*/
void saveRoutingHeaderData(RoutingHeaderData inData);
/**
* @Description
* @Title updateRoutingHeaderData
* @param inData
* @author rq
* @date 2022/1/20 16:39
* @return RoutingHeaderData
* @throw
*/
void updateRoutingHeaderData(RoutingHeaderData inData);
/**
* @Description 取消默认
* @Title cancelDefault
* @param inData
* @author rq
* @date 2022/1/20 16:39
* @return RoutingHeaderData
* @throw
*/
void cancelDefault(RoutingHeaderData inData);
/**
* @Description
* @Title deleteRoutingHeaderData
* @param inData
* @author rq
* @date 2022/1/20 16:39
* @return RoutingHeaderData
* @throw
*/
void deleteRoutingHeaderData(RoutingHeaderData inData);
/**
* @Description
* @Title deleteRoutingDetailData
* @param inData
* @author rq
* @date 2022/1/20 16:39
* @return RoutingHeaderData
* @throw
*/
void deleteRoutingDetailData(RoutingHeaderData inData);
/**
* @Description
* @Title deleteRoutingToolAll
* @param inData
* @author rq
* @date 2022/1/20 16:39
* @return RoutingHeaderData
* @throw
*/
void deleteRoutingToolAll(RoutingHeaderData inData);
/**
* @Description
* @Title deleteRoutingResourceAll
* @param inData
* @author rq
* @date 2022/1/20 16:39
* @return RoutingHeaderData
* @throw
*/
void deleteRoutingResourceAll(RoutingHeaderData inData);
}

9
src/main/java/com/gaotao/modules/base/entity/RoutingHeaderData.java

@ -72,6 +72,7 @@ public class RoutingHeaderData {
private String spec;
private String umid;
private String user;
private int add;
public String getSite() {
return site;
}
@ -191,5 +192,13 @@ public class RoutingHeaderData {
public void setUser(String user) {
this.user = user;
}
public int getAdd() {
return add;
}
public void setAdd(int add) {
this.add = add;
}
}

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

@ -723,4 +723,26 @@ public interface BaseService {
* @throw
*/
ResponseData setDefault(RoutingHeaderData inData);
/**
* @Description
* @Title saveRoutingHeaderData
* @param inData
* @author rq
* @date 2022/1/20 14:11
* @return ResponseData
* @throw
*/
ResponseData saveRoutingHeaderData(RoutingHeaderData inData);
/**
* @Description
* @Title deleteRoutingHeaderData
* @param inData
* @author rq
* @date 2022/1/20 14:11
* @return ResponseData
* @throw
*/
ResponseData deleteRoutingHeaderData(RoutingHeaderData inData);
}

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

@ -1516,4 +1516,62 @@ public class BaseServiceImpl implements BaseService {
responseData.setMsg("操作成功!");
return responseData;
}
@Override
public ResponseData saveRoutingHeaderData(RoutingHeaderData inData){
ResponseData responseData = new ResponseData();
PartData part1=new PartData();
inData.setRoutingTypeDb("M");
if("投产".equals(inData.getStatus())){
inData.setStatusDb("B");
}else if("停用".equals(inData.getStatus())){
inData.setStatusDb("S");
}else if("试验".equals(inData.getStatus())) {
inData.setStatusDb("T");
}
part1.setPartNo(inData.getPartNo());
part1.setSite(inData.getSite());
List<PartData> partR1 =baseMapper.getPartNoDetail(part1);
if (partR1.size()==0){
responseData.setMsg("该物料编码不存在或者不可用!");
responseData.setCode("500");
return responseData;
}
if (inData.getAdd()==0){
CopyRoutingData copyRoutingData=new CopyRoutingData();
copyRoutingData.setPartNo(inData.getPartNo());
copyRoutingData.setSite(inData.getSite());
copyRoutingData.setRevNo(inData.getRevNo());
List<RoutingHeaderData> checkRevNo=baseMapper.checkRoutingRevNo(copyRoutingData);
if(checkRevNo.size()>0){
responseData.setMsg("该版本已经存在,请重新输入!");
responseData.setCode("500");
return responseData;
}
if("Y".equals(inData.getDefaultflag())){
baseMapper.cancelDefault(inData);
}
baseMapper.saveRoutingHeaderData(inData);
}else {
baseMapper.updateRoutingHeaderData(inData);
}
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
return responseData;
}
@Override
@Transactional
public ResponseData deleteRoutingHeaderData(RoutingHeaderData inData){
ResponseData responseData = new ResponseData();
baseMapper.deleteRoutingHeaderData(inData);
baseMapper.deleteRoutingDetailData(inData);
baseMapper.deleteRoutingToolAll(inData);
baseMapper.deleteRoutingResourceAll(inData);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
return responseData;
}
}

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

@ -886,4 +886,36 @@ dbo.Get_Part_DescSpec(site,WX_PartNo) as wxSpec,dbo.Get_WorkCenter_Type(Site,Wor
update RoutingHeader set Defaultflag = case when RevNo=#{revNo} then 'Y' else 'N' end
where Site=#{site} and PartNo=#{partNo}
</update>
<insert id="saveRoutingHeaderData" parameterType="com.gaotao.modules.base.entity.RoutingHeaderData">
insert into RoutingHeader(Site,PartNo,RevNo,PhaseInDate,PhaseOutDate,RoutingType_DB,RoutingType,Status,Status_DB,Defaultflag,Remark,RepairFlag)
VALUES (#{site},#{partNo},#{revNo},#{phaseInDate},#{phaseOutDate},#{routingTypeDb},#{routingType},#{status},#{statusDb},#{defaultflag},#{remark},#{repairFlag})
</insert>
<update id="updateRoutingHeaderData">
update RoutingHeader SET PhaseInDate=#{phaseInDate},PhaseOutDate=#{phaseOutDate},Remark=#{remark},RepairFlag=#{repairFlag}
where Site=#{site} and PartNo=#{partNo} and RevNo=#{revNo}
</update>
<update id="cancelDefault">
update RoutingHeader set Defaultflag = 'N'
where Site=#{site} and PartNo=#{partNo}
</update>
<delete id="deleteRoutingHeaderData">
DELETE FROM RoutingHeader where Site=#{site} and PartNo=#{partNo} and RevNo=#{revNo}
</delete>
<delete id="deleteRoutingDetailData">
DELETE FROM RoutingDetail where Site=#{site} and PartNo=#{partNo} and RevNo=#{revNo}
</delete>
<delete id="deleteRoutingToolAll">
DELETE FROM RoutingTool where Site=#{site} and PartNo=#{partNo} and RevNo=#{revNo}
</delete>
<delete id="deleteRoutingResourceAll">
DELETE FROM RoutingDetail_AvailableResource where Site=#{site} and PartNo=#{partNo} and RevNo=#{revNo}
</delete>
</mapper>
Loading…
Cancel
Save