I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

task`1287`3` 新增文件表，原来业务与文件脱离

Browse Source
yun-zuoyi
WYnneaoapc 6 years ago
parent 2d7558e1ba
commit 7069bc5cbb
10 changed files with 172 additions and 33 deletions
Show Stats Download Patch File Download Diff File

31
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Author: Wynne.Lu
@ -25,7 +26,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)")
public class MesESOP extends BaseBean {
public class MesEsop extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("零件号")
@ -59,4 +60,32 @@ public class MesESOP extends BaseBean {
@ApiParam("文件id")
private Long fileId;
@Transient
@ApiParam("文件名称")
private String fileName;
@Transient
@ApiParam("文件URL")
private String fileUrl;
@Transient
@ApiParam("组名")
private String groupName;
@Transient
@ApiParam("文件原名")
private String fileOriginName;
@Transient
@ApiParam("文件大小")
private String fileSize;
@Transient
@ApiParam("文件类型名称")
private String fileType;
@Transient
@ApiParam("同步标记")
private Integer syncTag = 0;
}

26
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java
Unescape Escape View File

@ -0,0 +1,26 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/12/4 3:09 下午
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("FastDfs文件model")
public class EsopFileModel {
private MesEsop esop;
private MesFile file;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java → modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java
Unescape Escape View File

@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesESOP;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop;
import org.springframework.stereotype.Repository;
/**
@ -13,5 +13,5 @@ import org.springframework.stereotype.Repository;
* @Modify:
**/
@Repository
public interface MesESOPRepository extends BaseRepository<MesESOP, Long> {
public interface MesEsopRepository extends BaseRepository<MesEsop, Long> {
}

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wynne.lu
* @CreateDate : 2019-07-30
* @Modify:
**/
@Repository
public interface MesFileRepository extends BaseRepository<MesFile, Long> {
}

31
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Author: Wynne.Lu
@ -25,7 +26,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)")
public class MesESOP extends BaseBean {
public class MesEsop extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("零件号")
@ -59,4 +60,32 @@ public class MesESOP extends BaseBean {
@ApiParam("文件id")
private Long fileId;
@Transient
@ApiParam("文件名称")
private String fileName;
@Transient
@ApiParam("文件URL")
private String fileUrl;
@Transient
@ApiParam("组名")
private String groupName;
@Transient
@ApiParam("文件原名")
private String fileOriginName;
@Transient
@ApiParam("文件大小")
private String fileSize;
@Transient
@ApiParam("文件类型名称")
private String fileType;
@Transient
@ApiParam("同步标记")
private Integer syncTag = 0;
}

26
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsopFileModel.java
Unescape Escape View File

@ -0,0 +1,26 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesEsop;
import cn.estsh.i3plus.pojo.mes.bean.MesFile;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/12/4 3:09 下午
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("FastDfs文件model")
public class EsopFileModel {
private MesEsop esop;
private MesFile file;
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java
Unescape Escape View File

@ -22,6 +22,9 @@ public class FastDfsDownloadModel {
@ApiParam("部分相对路径")
private String dirPath;
@ApiParam("fdfs文件路径")
private String fdfsPath;
@ApiParam("文件名称")
private String fileName;

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java
Unescape Escape View File

@ -1,8 +1,7 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesActionMethod;
import cn.estsh.i3plus.pojo.mes.bean.MesESOP;
import cn.estsh.i3plus.pojo.mes.bean.MesEsop;
import org.springframework.stereotype.Repository;
/**
@ -13,5 +12,5 @@ import org.springframework.stereotype.Repository;
* @Modify:
**/
@Repository
public interface MesESOPRepository extends BaseRepository<MesESOP, Long> {
public interface MesEsopRepository extends BaseRepository<MesEsop, Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFileRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesFile;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wynne.lu
* @CreateDate : 2019-07-30
* @Modify:
**/
@Repository
public interface MesFileRepository extends BaseRepository<MesFile, Long> {
}

47
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -416,14 +416,14 @@ public class MesHqlPack {
* @param mesWcCheck
* @return
*/
public static DdlPackBean getMesWcCheck(MesWcCheck mesWcCheck, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck, organizeCode);
public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(wcCheck, organizeCode);
// DdlPreparedPack.getNumEqualPack(mesWcCheck.getIsValid(),"isValid",packBean);
DdlPreparedPack.getStringLikerPack(mesWcCheck.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringLikerPack(mesWcCheck.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesWcCheck.getCheckType(), "checkType", packBean);
DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckObj(), "checkObj", packBean);
DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckItem(), "checkItem", packBean);
DdlPreparedPack.getStringLikerPack(wcCheck.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringLikerPack(wcCheck.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(wcCheck.getCheckType(), "checkType", packBean);
DdlPreparedPack.getStringLikerPack(wcCheck.getCheckObj(), "checkObj", packBean);
DdlPreparedPack.getStringLikerPack(wcCheck.getCheckItem(), "checkItem", packBean);
return packBean;
}
@ -470,31 +470,26 @@ public class MesHqlPack {
/**
* MES 上传文件FastDfs封装
*
* @param mesESOP
* @param esop
* @return
*/
public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) {
public static DdlPackBean getEsopExcludeById(MesEsop esop, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getStepCode(), "stepCode", packBean);
DdlPreparedPack.getNumEqualPack(mesESOP.getStepSeq(), "stepSeq", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumNOEqualPack(mesESOP.getId(), "id", packBean);
DdlPreparedPack.getStringEqualPack(esop.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(esop.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getProcessCode(), "processCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getStepCode(), "stepCode", packBean);
DdlPreparedPack.getNumEqualPack(esop.getStepSeq(), "stepSeq", packBean);
DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumNOEqualPack(esop.getId(), "id", packBean);
return packBean;
}
public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
if (!StringUtils.isEmpty(mesESOP.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(mesESOP.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean);
}
public static DdlPackBean getEsop(MesEsop esop, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(esop, organizeCode);
DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringLikerPack(esop.getPartNo(), "partNo", packBean);
return packBean;
}

Write Preview
Loading…
Cancel
Save