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

Merge branch 'dev'

Browse Source
yun-zuoyi
于学杰 6 years ago
parent 6ba7a43ea7 89edbcb80a
commit 6598a829e0
92 changed files with 1260 additions and 159 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -28,6 +30,7 @@ import javax.persistence.Table;
@Api("ANDON_呼叫原因")
public class AndonAlarmCause extends BaseBean {
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -36,6 +38,7 @@ public class AndonAlarmDetailType extends BaseBean {
@ApiParam(value = "安灯类型名称")
private String alarmDetailName;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;

6
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -28,10 +30,12 @@ import javax.persistence.Table;
@Api("ANDON_呼叫通知配置")
public class AndonAlarmResponseCfg extends BaseBean {
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_STATUS.class,refForeignKey = "value",value = "description")
@Column(name = "ANDON_STATUS")
@ApiParam(value = "安灯状态")
private String andonStatus;
@ -40,6 +44,7 @@ public class AndonAlarmResponseCfg extends BaseBean {
@ApiParam(value = "通知条件时长")
private String rpWhere;
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "RP_CODE")
@ApiParam(value = "通知方式代码")
private String rpCode;
@ -48,6 +53,7 @@ public class AndonAlarmResponseCfg extends BaseBean {
@ApiParam(value = "通知对象代码")
private String rpObjectCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
@Column(name = "RP_LEVEL")
@ApiParam(value = "通知级别")
private String rpLevel;

4
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -36,6 +38,7 @@ public class AndonDisposalCfg extends BaseBean {
@ApiParam(value = "工作单元代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
private String alarmCode;
@ -44,6 +47,7 @@ public class AndonDisposalCfg extends BaseBean {
@ApiParam(value = "呼叫原因代码")
private String acCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description")
@Column(name = "APPROVAL_STATUS")
@ApiParam(value = "审批状态")
private String approvalStatus;

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -40,6 +42,7 @@ public class AndonEventCause extends BaseBean {
@ApiParam(value = "父阶原因代码")
private String parentEcCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -40,6 +42,7 @@ public class AndonEventMethod extends BaseBean {
@ApiParam(value = "父阶方法代码")
private String parentEmCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -36,6 +38,7 @@ public class AndonEventPhenoMenon extends BaseBean {
@ApiParam(value = "事件现象描述")
private String epmName;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

3
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -34,6 +36,7 @@ import javax.persistence.Table;
@Api("安灯队列")
public class AndonHaltCfg extends BaseBean {
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

8
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
Unescape Escape View File

@ -1,6 +1,9 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -64,14 +67,17 @@ public class AndonPLC extends BaseBean {
@ApiParam(value = "分组号")
private String groupNo;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
@ApiParam(value = "安灯类型")
private String alarmCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_BUSI_FLAG.class,refForeignKey = "value",value = "description")
@Column(name = "TAG_BUSINESS_TYPE")
@ApiParam(value = "标签业务类型")
private String tagBusinessType;
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
@Column(name = "IS_ALARM_STATUS")
@ApiParam(value = "是否按灯状态", example = "1")
private Integer isAlarmStatus;

4
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java
Unescape Escape View File

@ -48,6 +48,10 @@ public class MesArea extends BaseBean {
@ApiParam(value ="名称")
private String name;
public String getName(){
return areaName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")

6
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java
Unescape Escape View File

@ -17,7 +17,7 @@ import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :生产区域
* @Description :生产设备
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
@ -59,6 +59,10 @@ public class MesEquipment extends BaseBean {
@ApiParam(value ="名称")
private String name;
public String getName(){
return this.equipmentName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")

4
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java
Unescape Escape View File

@ -55,6 +55,10 @@ public class MesWorkCell extends BaseBean {
@ApiParam(value ="名称")
private String name;
public String getName(){
return this.workCellName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")

4
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java
Unescape Escape View File

@ -59,6 +59,10 @@ public class MesWorkCenter extends BaseBean {
@ApiParam(value ="名称")
private String name;
public String getName(){
return this.workCenterName;
}
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")

111
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import org.apache.commons.lang3.StringUtils;
/**
@ -286,9 +287,8 @@ public class AndonHqlPack {
*/
public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode);
if (StringUtils.isNotEmpty(mesArea.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean);
}
packBean.setOrderByStr(mesArea.orderBy());
return packBean;
}
@ -300,12 +300,10 @@ public class AndonHqlPack {
*/
public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
}
packBean.setOrderByStr(mesWorkCenter.orderBy());
return packBean;
}
@ -317,15 +315,12 @@ public class AndonHqlPack {
*/
public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode);
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){
DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
}
packBean.setOrderByStr(mesWorkCell.orderBy());
return packBean;
}
@ -343,6 +338,7 @@ public class AndonHqlPack {
if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
}
packBean.setOrderByStr(mesEquipment.orderBy());
return packBean;
}
@ -501,6 +497,11 @@ public class AndonHqlPack {
*/
public static DdlPackBean packAndonEventPhenoMenon(AndonEventPhenoMenon eventPhenoMenon) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmCode(), "epmCode", result);
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmName(), "epmName", result);
DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(eventPhenoMenon, result);
return result;
@ -550,4 +551,90 @@ public class AndonHqlPack {
getStringBuilderPack(andonManageRecord, result);
return result;
}
/**
* 区域唯一校验
* @param mesArea
* @return
*/
public static DdlPackBean packHqlCheckMesAreaOnlyByAreaCode(MesArea mesArea){
DdlPackBean result = new DdlPackBean();
if (mesArea != null && mesArea.getId() != null && mesArea.getId().longValue() > 0) {
DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
}
/**
* 工作中心唯一校验
* @param mesWorkCenter
* @return
*/
public static DdlPackBean packHqlCheckMesWorkCenterOnlyByWorkCenterCode(MesWorkCenter mesWorkCenter){
DdlPackBean result = new DdlPackBean();
if (mesWorkCenter != null && mesWorkCenter.getId() != null && mesWorkCenter.getId().longValue() > 0) {
DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
}
/**
* 工作单元唯一校验
* @param mesWorkCell
* @return
*/
public static DdlPackBean packHqlCheckMesWorkCellOnlyByWorkCellCode(MesWorkCell mesWorkCell){
DdlPackBean result = new DdlPackBean();
if (mesWorkCell != null && mesWorkCell.getId() != null && mesWorkCell.getId().longValue() > 0) {
DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
}
/**
* 设备唯一校验
* @param mesEquipment
* @return
*/
public static DdlPackBean packHqlCheckMesEquipmentOnlyByEquipmentCode(MesEquipment mesEquipment){
DdlPackBean result = new DdlPackBean();
if (mesEquipment != null && mesEquipment.getId() != null && mesEquipment.getId().longValue() > 0) {
DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
}
/**
* 班次唯一校验
* @param mesShift
* @return
*/
public static DdlPackBean packHqlCheckMesShiftOnlyByShiftCode(MesShift mesShift){
DdlPackBean result = new DdlPackBean();
if (mesShift != null && mesShift.getId() != null && mesShift.getId().longValue() > 0) {
DdlPreparedPack.getNumNOEqualPack(mesShift.getId(),"id",result);
DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result);
}
DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
}
}

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java
Unescape Escape View File

@ -28,4 +28,6 @@ public class BaseConstWords {
public static final String DICTIONARY_POLITICAL_STATUS ="POLITICAL_STATUS";
// 员工类型 EMPLOYEE_TYPE
public static final String DICTIONARY_EMPLOYEE_TYPE ="EMPLOYEE_TYPE";
// 系统参数配置 PROPERTIES
public static final String DICTIONARY_PROPERTIES ="PROPERTIES";
}

12
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
Unescape Escape View File

@ -76,6 +76,18 @@ public class DdlPackBean {
return result;
}
public static DdlPackBean getDdlPackBean(BaseBean bean){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
if(bean != null){
result.setOrderByStr(bean.orderBy());
}
return result;
}
public boolean isHql() {
return isHql;
}

232
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
Unescape Escape View File

@ -45,6 +45,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -83,6 +93,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -119,6 +139,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -149,6 +179,26 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -193,6 +243,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
@ -232,6 +292,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
@ -280,6 +350,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -317,6 +397,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -343,6 +433,26 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -369,6 +479,26 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -407,6 +537,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -446,6 +586,26 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -479,5 +639,77 @@ public class AndonEnumUtil {
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 设备状态：
* 10=备用，
* 20=运行，
* 30=故障，
* 40=检修
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_EQUIPMENT_STATUS{
SPARE("10","备用"),
RUN("20","运行"),
ERROR("30","故障"),
OVERHAUL("40","检修");
private String value;
private String description;
ANDON_EQUIPMENT_STATUS(String value,String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

3
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
Unescape Escape View File

@ -1168,6 +1168,7 @@ public class BlockFormEnumUtil {
LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null);
// DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null);
@ -1320,7 +1321,7 @@ public class BlockFormEnumUtil {
public static PROPERTY_TYPE valueOfClassPath(String classPath) {
PROPERTY_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].classPath == classPath) {
if (values()[i].classPath.equals(classPath)) {
tmp = values()[i];
}
}

189
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -304,6 +304,7 @@ public class WmsEnumUtil {
/**
* 产品入库，发运状态
* WMS_产品报工明细信息 ：单据状态
* WMS_发泡打箱包装
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCT_INSTOCK_STATUS {
@ -434,7 +435,8 @@ public class WmsEnumUtil {
public enum OUT_MOVEMENT_MOVE_TYPE {
IN_STORE(10, "IN", "入库"),
OUT_STORE(20, "OUT", "出库"),
MOVE_STORE(30, "MOVE", "移库");
MOVE_STORE(30, "MOVE", "移库"),
OTHER(40, "OTHER", "其他");
private int value;
private String code;
@ -503,10 +505,10 @@ public class WmsEnumUtil {
NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"),
ASN(190, "ASN", "ASN"),
PO(200, "PO", "PO"),
QC(210, "QC", "QC"),
AMPR(220, "AMPR", "AMPR");
ASN(200, "ASN", "ASN"),
PO(210, "PO", "PO"),
QC(220, "QC", "QC"),
AMPR(230, "AMPR", "AMPR");
private int value;
@ -2698,7 +2700,8 @@ public class WmsEnumUtil {
public enum SRC_STATUS {
ZMMES("ZMMES", "知明MES"),
TBMES("TBMES", "MES接口"),
AMP("AMP", "AMP系统");
AMP("AMP", "AMP系统"),
ZSLD("ZSLD", "直送拉动");
private String value;
private String description;
@ -2927,4 +2930,178 @@ public class WmsEnumUtil {
return value;
}
}
/**
* 条码类型 10=实物条码，20=虚拟条码
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMS_STOCK_TYPE {
SOURCE(10, "实物条码"), TARGET(20, "虚拟条码");
private int value;
private String description;
WMS_STOCK_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 库位校验源库位目标库位参数
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SRC_DEST_LOCATE {
SRC(10, "SRC", "源库位"),
DEST(20, "DEST", "目标库位");
private int value;
private String code;
private String description;
SRC_DEST_LOCATE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public static SRC_DEST_LOCATE codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == (value)) {
return values()[i];
}
}
return null;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 物料结算标识
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_CLOSE_FLAG {
INTERNAL_SETTLEMENT("1", "内部结算"),
NOMAL_SETTLEMENT("2", "正常结算");
private String value;
private String description;
OUT_CLOSE_FLAG(String value, String description) {
this.value = value;
this.description = description;
}
public String getDescription() {
return description;
}
public String getCode() {
return value;
}
public String getValue() {
return value;
}
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 物料结算方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_CLOSE_TYPE {
OFF_LINE_SETTLEMENT("10", "下线结算"),
PICK_SETTLEMENT("20", "配料结算");
private String value;
private String description;
OUT_CLOSE_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getDescription() {
return description;
}
public String getCode() {
return value;
}
public String getValue() {
return value;
}
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
Unescape Escape View File

@ -221,6 +221,8 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
List<T> findByProperty(String[] propertyNames, Object[] values,String orderByStuff);
T getByProperty(DdlPackBean packBean);
T getByProperty(String propertyName, Object value);
T getByProperty(String[] propertyNames, Object[] values);

15
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -477,6 +477,21 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
@Override
public T getByProperty(DdlPackBean packBean) {
try {
List<T> list = findByHqlWhere(packBean);
return list.size() != 0 ? list.get(0) : null;
}catch(NoResultException ne){
LOGGER.error("数据不存在，DdlPackBean：{}",packBean);
return null;
}catch(NonUniqueResultException ex){
LOGGER.error("查询单条记录，但出现多条。packBean：{}",packBean);
throw new RuntimeException("存在多条记录：" + ex.getMessage());
}
}
@Override
public T getByProperty(String propertyName, Object value) {
String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName;
try {

12
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -237,6 +237,18 @@ public class DdlPreparedPack {
}
/**
* 封装String对象成不等于语句
*
* @param columnName 列名
* @param packBean
*/
public static void getStringNoEqualPack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, val);
}
}
/**
* 封装String对象成equal语句
*
* @param columnName 列名

2
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
Unescape Escape View File

@ -321,7 +321,7 @@ public final class FormHqlPack {
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfDataSource(BfDataSource source){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean);
DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean);

5
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.platform;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
@ -13,7 +14,9 @@ import java.util.List;
* @Modify:
**/
@Data
public class CommonTreeModel {
public class CommonTreeModel implements Serializable {
private static final long serialVersionUID = -3612131411549787983L;
private BaseBean bean;

5
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@ -14,7 +15,9 @@ import java.util.List;
* @Modify:
**/
@Data
public class LabelTemplateModel {
public class LabelTemplateModel implements Serializable {
private static final long serialVersionUID = 2488615810903387414L;
private SysLabelTemplate labelTemplate;

5
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -12,8 +14,9 @@ import lombok.Data;
* @Modify:
**/
@Data
public class MessagePagerModel {
public class MessagePagerModel implements Serializable {
private static final long serialVersionUID = 6236940647561791913L;
private SysMessage sysMessage;
private Pager pager;

5
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -12,8 +14,9 @@ import lombok.Data;
* @Modify:
**/
@Data
public class RefUserMessagePagerModel {
public class RefUserMessagePagerModel implements Serializable {
private static final long serialVersionUID = -4109915131051843577L;
private SysRefUserMessage sysRefUserMessage;
private Pager pager;

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java
Unescape Escape View File

@ -22,6 +22,8 @@ import java.util.List;
@Data
public class UserDetailModel extends BaseBean {
private static final long serialVersionUID = 4413526491980249893L;
@ApiParam(value ="账号ID")
private String userId;

6
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java
Unescape Escape View File

@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.platform;
import cn.estsh.i3plus.pojo.base.common.Pager;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -11,8 +13,10 @@ import lombok.Data;
* @Modify:
**/
@Data
public class UserDetailPagerModel {
public class UserDetailPagerModel implements Serializable {
private static final long serialVersionUID = -5347423781211585908L;
private UserDetailModel userDetailModel;
private Pager pager;

5
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -12,8 +14,9 @@ import lombok.Data;
* @Modify:
**/
@Data
public class UserRolePagerModel {
public class UserRolePagerModel implements Serializable {
private static final long serialVersionUID = 6180855492105859082L;
private SysRole sysRole;
private Pager pager;

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java
Unescape Escape View File

@ -15,7 +15,7 @@ import lombok.Data;
@Data
public class TemplateModel {
@ApiParam("模板ID")
@ApiParam("数据源ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long sourceId;

20
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
Unescape Escape View File

@ -0,0 +1,20 @@
package cn.estsh.i3plus.pojo.model.wms;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description 定时任务参数解析Model
* @Reference
* @Author dragon
* @CreateDate 2019/7/17 16:25
* @Modify
*/
@Data
public class WmsJobParamModel implements Serializable {
private String organizeCode;
private List<String> zonesNoList;
private Integer snType;
}

5
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java
Unescape Escape View File

@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.platform.bean;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : 邮件配置信息
* @Reference :
@ -11,8 +13,9 @@ import lombok.Data;
* @Modify:
**/
@Data
public class MailConfig {
public class MailConfig implements Serializable {
private static final long serialVersionUID = -6776607385471325344L;
@ApiParam(value = "邮箱开关")
private int mailSwitch;

11
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java
Unescape Escape View File

@ -16,9 +16,17 @@ import java.util.List;
@Data
public class SessionUser implements Serializable {
private static final long serialVersionUID = -6478598185766500419L;
@ApiParam("会话ID")
private String token;
@ApiParam("用户ID")
private Long userId;
@ApiParam("设备ID")
private String deviceId;
@ApiParam("用户工号")
private String userCode;
@ -32,6 +40,9 @@ public class SessionUser implements Serializable {
@ApiParam("用户类型")
private String userType;
@ApiParam("用户登录平台")
private Integer loginPlatform;
@ApiParam("用户信息")
private SysUser user;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java
Unescape Escape View File

@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value="条码规则",description = "条码规则")
public class SysBarcodeRule extends BaseBean {
private static final long serialVersionUID = -2041412527908996307L;
@Column(name = "NAME")
@ApiParam(value = "规则名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java
Unescape Escape View File

@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value="系统配置",description = "系统配置")
public class SysConfig extends BaseBean {
private static final long serialVersionUID = 2718495807943432629L;
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java
Unescape Escape View File

@ -32,6 +32,7 @@ import java.util.List;
@Api(value="部门",description = "部门")
public class SysDepartment extends BaseBean {
private static final long serialVersionUID = -1505054622781210062L;
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java
Unescape Escape View File

@ -31,6 +31,7 @@ import javax.persistence.Table;
@Api(value="系统字典",description = "系统字典")
public class SysDictionary extends BaseBean {
private static final long serialVersionUID = 593801368328634592L;
@Column(name="NAME")
@ApiParam(value ="字典名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java
Unescape Escape View File

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api(value="企业信息",description = "企业信息")
public class SysEnterprise extends BaseBean {
private static final long serialVersionUID = -2138074947458189045L;
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java
Unescape Escape View File

@ -31,6 +31,7 @@ import java.text.DecimalFormat;
@Api(value="企业配置信息",description = "企业配置信息")
public class SysEnterpriseConfig extends BaseBean {
private static final long serialVersionUID = -6131429295344210675L;
@Column(name="ENTERPRISE_ID")
@ApiParam(value ="企业id" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java
Unescape Escape View File

@ -27,6 +27,7 @@ import javax.persistence.Table;
@Api("工厂仓库")
public class SysFactoryStore extends BaseBean {
private static final long serialVersionUID = 6717712070974796221L;
@Column(name="store_code")
@ApiParam("仓库代码")
private String storeCode;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java
Unescape Escape View File

@ -31,6 +31,7 @@ import java.text.DecimalFormat;
@Api(value="文件",description = "文件")
public class SysFile extends BaseBean {
private static final long serialVersionUID = 623700632055475696L;
@Column(name="NAME")
@ApiParam(value ="文件名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java
Unescape Escape View File

@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value="文件附件",description = "文件附件")
public class SysFileAttach extends BaseBean {
private static final long serialVersionUID = -6730529794381568890L;
@Column(name="ATTACH_SOFT_TYPE")
@ApiParam(value ="附件所属模块")
private Integer attachSoftType;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java
Unescape Escape View File

@ -27,6 +27,7 @@ import javax.persistence.*;
@Api(value="打印模板",description = "打印模板")
public class SysLabelTemplate extends BaseBean {
private static final long serialVersionUID = 5371856566557305323L;
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
private String templateCode;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java
Unescape Escape View File

@ -29,6 +29,7 @@ import javax.persistence.*;
@Api(value="打印模板参数",description = "打印模板参数")
public class SysLabelTemplateParam extends BaseBean {
private static final long serialVersionUID = 6476163540527157643L;
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java
Unescape Escape View File

@ -24,6 +24,7 @@ import javax.persistence.Table;
@Api(value="系统语言表",description = "对系统语言进行匹配。")
public class SysLocaleLanguage extends BaseBean {
private static final long serialVersionUID = -1904007575555304772L;
@Column(name="LANGUAGE_NAME")
@ApiParam(value = "语言名称",example = "前台显示的名称")
private String languageName;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
Unescape Escape View File

@ -29,6 +29,7 @@ import javax.persistence.Transient;
@Api(value="系统资源",description = "对按钮、功能、信息提示等进行转换。")
public class SysLocaleResource extends BaseBean {
private static final long serialVersionUID = -2397207310100672746L;
@Column(name="resource_type")
@ApiParam(value = "资源类型",example = "1",access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE")
private Integer resourceType;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java
Unescape Escape View File

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api(value="用户登录记录",description = "用户登录记录")
public class SysLogUserLogin extends BaseBean {
private static final long serialVersionUID = 4665598896654312569L;
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , access ="用户ID")
private Long userId;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
Unescape Escape View File

@ -32,6 +32,7 @@ import java.util.List;
@Api(value="系统功能",description = "系统功能")
public class SysMenu extends BaseBean {
private static final long serialVersionUID = 6892387964234712323L;
@Column(name="NAME")
@ApiParam(value ="功能名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java
Unescape Escape View File

@ -31,6 +31,7 @@ import java.util.List;
@Api(value = "系统消息", description = "系统消息")
public class SysMessage extends BaseBean {
private static final long serialVersionUID = -6090909263221993356L;
@Column(name = "MESSAGE_TITLE")
@ApiParam(value = "消息标题", access = "消息标题")
private String messageTitle;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
Unescape Escape View File

@ -33,6 +33,7 @@ import javax.persistence.Table;
@Api(value="单号规则",description = "单号规则")
public class SysOrderNoRule extends BaseBean {
private static final long serialVersionUID = -283233170141936426L;
@Column(name = "NAME")
@ApiParam(value = "规则名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
Unescape Escape View File

@ -33,6 +33,7 @@ import java.util.List;
@Api(value="组织",description = "组织")
public class SysOrganize extends BaseBean {
private static final long serialVersionUID = 5932340027033720434L;
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java
Unescape Escape View File

@ -32,6 +32,7 @@ import java.util.List;
@Api(value="岗位",description = "岗位")
public class SysPosition extends BaseBean {
private static final long serialVersionUID = -3438901661332705721L;
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java
Unescape Escape View File

@ -31,6 +31,7 @@ import java.text.DecimalFormat;
@Api(value="关系-角色菜单",description = "关系-角色菜单")
public class SysRefRoleMenu extends BaseBean {
private static final long serialVersionUID = -2013469818246101184L;
@Column(name="MENU_ID")
@ApiParam(value ="菜单ID" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java
Unescape Escape View File

@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value="关系-任务周期与计划",description = "关系-任务周期与计划")
public class SysRefTaskCyclePlan extends BaseBean {
private static final long serialVersionUID = 5217923903994138624L;
@Column(name="TASK_CYCLE_ID")
@ApiParam(value ="任务周期id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java
Unescape Escape View File

@ -31,6 +31,7 @@ import java.text.DecimalFormat;
@Api(value="关系-账号部门",description = "关系-账号部门")
public class SysRefUserDepartment extends BaseBean {
private static final long serialVersionUID = -2361062982274833764L;
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java
Unescape Escape View File

@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value="关系-用户部门",description = "关系-用户部门")
public class SysRefUserInfoDepartment extends BaseBean {
private static final long serialVersionUID = -1023456569329939973L;
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java
Unescape Escape View File

@ -31,6 +31,7 @@ import javax.persistence.Table;
@Api(value="关系-用户消息",description = "关系-用户消息")
public class SysRefUserMessage extends BaseBean {
private static final long serialVersionUID = 555705651072659162L;
@Column(name="MESSAGE_ID")
@ApiParam(value ="消息id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java
Unescape Escape View File

@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value="关系-用户岗位",description = "关系-用户岗位")
public class SysRefUserPosition extends BaseBean {
private static final long serialVersionUID = 3234085587521697199L;
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

2
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java
Unescape Escape View File

@ -30,7 +30,7 @@ import javax.persistence.Table;
@Api(value="关系-用户角色",description = "关系-用户角色")
public class SysRefUserRole extends BaseBean {
private static final long serialVersionUID = -2253689528880200360L;
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
Unescape Escape View File

@ -32,6 +32,7 @@ import javax.persistence.Table;
@Api(value="用户角色表",description = "用户权限角色。")
public class SysRole extends BaseBean {
private static final long serialVersionUID = -869130572226447415L;
@Column(name="NAME")
@ApiParam(value ="角色名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java
Unescape Escape View File

@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value="任务",description = "任务")
public class SysTask extends BaseBean {
private static final long serialVersionUID = -4462661508105857312L;
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java
Unescape Escape View File

@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value="任务周期",description = "任务周期")
public class SysTaskCycle extends BaseBean {
private static final long serialVersionUID = 6821425488105955756L;
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java
Unescape Escape View File

@ -32,6 +32,7 @@ import javax.persistence.Table;
@Api(value = "任务计划", description = "任务计划")
public class SysTaskPlan extends BaseBean {
private static final long serialVersionUID = -136675837627794707L;
@Column(name = "NAME")
@ApiParam(value = "名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java
Unescape Escape View File

@ -37,6 +37,7 @@ import javax.persistence.Table;
@Api(value="硬件设备表",description = "硬件设备表")
public class SysTool extends BaseBean {
private static final long serialVersionUID = 100098534186501411L;
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java
Unescape Escape View File

@ -29,6 +29,7 @@ import java.text.DecimalFormat;
@Api(value="设备类型",description = "设备类型")
public class SysToolType extends BaseBean {
private static final long serialVersionUID = 6736217130492256001L;
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
Unescape Escape View File

@ -32,6 +32,7 @@ import java.util.List;
@Api(value="账号登陆表",description = "账号登陆系统账户。")
public class SysUser extends BaseBean {
private static final long serialVersionUID = 3721769401146979123L;
@Column(name="USER_INFO_ID")
@ApiParam(value ="人员ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

2
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
Unescape Escape View File

@ -34,6 +34,8 @@ import java.util.List;
@Api(value="用户详细",description = "用户详细")
public class SysUserInfo extends BaseBean {
private static final long serialVersionUID = 3876318482048754222L;
@Column(name="USER_ID")
@ApiParam(value ="账号ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java
Unescape Escape View File

@ -32,6 +32,7 @@ import javax.persistence.Version;
@Api(value="测试用户类",description = "测试事务信息")
public class TestTransUser extends BaseBean {
private static final long serialVersionUID = 3860279685301736213L;
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;

69
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -121,7 +121,7 @@ public class CoreHqlPack {
* @return
*/
public static DdlPackBean packHqlSysPositionList(SysPosition position){
DdlPackBean result = new DdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(position);
// 查询参数封装
DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result);
@ -153,7 +153,7 @@ public class CoreHqlPack {
}
public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List<Long> idList){
DdlPackBean result = new DdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(organize);
// String Like
DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
@ -197,7 +197,7 @@ public class CoreHqlPack {
}
public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List<Long> idList){
DdlPackBean result = DdlPackBean.getDdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(department);
DdlPreparedPack.getStringLikerPack(department.getName(),"name",result);
DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result);
@ -229,7 +229,7 @@ public class CoreHqlPack {
}
public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List<Long> idList){
DdlPackBean result = DdlPackBean.getDdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(menu);
DdlPreparedPack.getInPackList(idList,"id",result);
DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result);
@ -243,6 +243,15 @@ public class CoreHqlPack {
return result;
}
public static DdlPackBean packDdlBeanSysMenu(SysMenu menu){
DdlPackBean result = DdlPackBean.getDdlPackBean(menu);
DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result);
result.setOrderByStr(menu.orderBy());
return result;
}
/**
* 系统角色复杂查询
* @param role
@ -272,7 +281,7 @@ public class CoreHqlPack {
}
public static DdlPackBean packDdlBeanSysRole(SysRole role,List<Long> idList){
DdlPackBean result = new DdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(role);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
@ -373,7 +382,7 @@ public class CoreHqlPack {
* @return
*/
public static DdlPackBean packHqlSysMessage(SysMessage message){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(message);
// hql拼接
DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean);
@ -416,36 +425,38 @@ public class CoreHqlPack {
/**
* 任务周期复杂查询
* @param taskTimeExpression
* @param sysTaskCycle
* @return
*/
public static String packHqlSysTaskCycle(SysTaskCycle taskTimeExpression) {
public static String packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(taskTimeExpression.getName(),"name",result);
HqlPack.getStringLikerPack(sysTaskCycle.getName(), "name", result);
HqlPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result);
// 添加默认排序
HqlPack.getOrderDefault(taskTimeExpression);
HqlPack.getOrderDefault(sysTaskCycle);
return result.toString();
}
/**
* 定时任务复杂查询
* @param taskTime
* @param sysTaskPlan
* @return
*/
public static String packHqlSysTaskPlan(SysTaskPlan taskTime){
public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(taskTime.getName(),"name",result);
HqlPack.getNumEqualPack(taskTime.getTaskPlanStatus(),"taskPlanStatus",result);
HqlPack.getNumEqualPack(taskTime.getTaskCycleId(),"taskCycleId",result);
HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
// 添加默认排序
HqlPack.getOrderDefault(taskTime);
HqlPack.getOrderDefault(sysTaskPlan);
return result.toString();
}
@ -486,7 +497,7 @@ public class CoreHqlPack {
}
public static DdlPackBean packDdlBeanSysUser(SysUser user,List<Long> idList){
DdlPackBean result = DdlPackBean.getDdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(user);
DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
@ -506,7 +517,7 @@ public class CoreHqlPack {
* @return
*/
public static DdlPackBean packDdlSysUser(SysUser user){
DdlPackBean ddlPack = new DdlPackBean();
DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(user);
// And X = X
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack);
@ -608,7 +619,7 @@ public class CoreHqlPack {
}
public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List<Long> idList){
DdlPackBean result = DdlPackBean.getDdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(userInfo);
// And
DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
@ -715,6 +726,7 @@ public class CoreHqlPack {
HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result);
HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
// 添加默认排序
HqlPack.getOrderDefault(orderNoRule);
@ -753,6 +765,7 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(sysTask.getName(),"name",result);
HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
return result.toString();
}
@ -874,22 +887,20 @@ public class CoreHqlPack {
* @return DdlPackBean
*/
public static DdlPackBean packHqlSysFileCode(SysFile sysFile){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(sysFile);
// and
DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",ddlPackBean);
DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",result);
// not
DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",ddlPackBean);
DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",result);
return ddlPackBean;
return result;
}
public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){
DdlPackBean result = new DdlPackBean();
DdlPackBean result = DdlPackBean.getDdlPackBean(ref);
// Number Eq
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result);
// String Eq
DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result);
@ -901,8 +912,6 @@ public class CoreHqlPack {
DdlPackBean result = DdlPackBean.getDdlPackBean();
// Number Eq
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
DdlPreparedPack.getNumEqualPack(userId,"userId",result);
DdlPreparedPack.getNumEqualPack(roleId,"roleId",result);
@ -918,10 +927,8 @@ public class CoreHqlPack {
* @return
*/
public static DdlPackBean packHqlSysOrganize(List<SysRefUserDepartment> sysRefUserDepartments){
DdlPackBean packBean = new DdlPackBean();
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",packBean);
return packBean;
}

7
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.report.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -29,6 +31,11 @@ import java.util.List;
@Api(value="报表模板",description = "报表模板")
public class BrTemplate extends BaseBean {
@Column(name = "DATA_SOURCE_ID")
@ApiParam(value = "数据源ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long dataSourceId = 0L;
@Column(name="NAME")
@ApiParam(value ="模板名称" , access ="模板名称")
private String name;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java
Unescape Escape View File

@ -58,7 +58,7 @@ public class SapCyco extends SapBase{
@ApiParam(value = "删除标识")
@AnnoOutputColumn
private String xloek;
private String xloek="";
@ApiParam(value = "年度")
@AnnoOutputColumn

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDn.java
Unescape Escape View File

@ -46,7 +46,7 @@ public class SapDn extends SapBase{
@ApiParam(value = "客户物料号",example = "1")
@AnnoOutputColumn
private String kdmat;
private String kdmat = "";
@ApiParam(value = "交货数量",example = "1")
@AnnoOutputColumn

13
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
Unescape Escape View File

@ -136,4 +136,17 @@ public class WmsASNMasterDetails extends BaseBean {
@Transient
@ApiParam("标准包装")
public Double snp;
public WmsASNMasterDetails(){}
public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode){
this.recQty = recQty;
this.partNo = partNo;
this.orderNo = orderNo;
this.partNameRdd = partNameRdd;
this.item = item;
this.unit = unit;
this.erpAreaNo = erpAreaNo;
this.organizeCode = organizeCode;
}
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
Unescape Escape View File

@ -103,6 +103,14 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("是否范围内")
public Integer isScope;
@Transient
@ApiParam(value = "实盘箱数", example = "1")
public Long countBoxQty;
@Transient
@ApiParam(value = "物料数量", example = "1")
public Double sumPartQty;
public WmsCSFactTrans(){}
public Integer getIsScopeVal() {
@ -133,4 +141,12 @@ public class WmsCSFactTrans extends BaseBean {
this.srcZoneNo = srcZoneNo;
this.srcWhNo = srcWhNo;
}
public WmsCSFactTrans(Long countBoxQty,Double sumPartQty,String zoneNo, String partNo, String partNameRdd) {
this.countBoxQty = countBoxQty;
this.sumPartQty = sumPartQty;
this.zoneNo = zoneNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
}
}

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
Unescape Escape View File

@ -220,6 +220,6 @@ public class WmsDocMovementDetails extends BaseBean {
public Integer busiType;
@Column(name = "IS_SN")
@ApiParam(value = "条码生成状态", example = "1")
@ApiParam(value = "条码生成状态", example = "20")
public Integer isSn;
}

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
Unescape Escape View File

@ -130,10 +130,16 @@ public class WmsMoveMaster extends BaseBean {
@ApiParam("交易类型名称")
private String transTypeName;
@Column(name="FIX_ID")
@ApiParam(value = "设备编号")
public String fixId;
public WmsMoveMaster(){};
public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) {
public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId) {
this.id = id;
this.orderNo = orderNo;
this.organizeCode = organizeCode;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
@ -147,7 +153,7 @@ public class WmsMoveMaster extends BaseBean {
this.destZoneNo = destZoneNo;
this.transQty = transQty;
this.rejectQty = rejectQty;
this.fixId = fixId;
}

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
Unescape Escape View File

@ -131,4 +131,8 @@ public class WmsPOMaster extends BaseBean {
@Transient
@ApiParam("手机")
private String vendorPhone;
@Transient
@ApiParam("前端信息")
private String message;
}

76
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java
Unescape Escape View File

@ -0,0 +1,76 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : WMS_包装箱条码表
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2019-07-17 11:32
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_PACK_SN")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="包装箱条码表",description = "包装箱条码表")
public class WmsPackSn extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam(value = "订单号")
private String orderNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
private String partNo;
@Column(name = "PART_NAME_ADD")
@ApiParam(value = "物料名称")
private String partNameAdd;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "SID")
@ApiParam("SID")
private Double sId;
@Column(name = "COMMIT_DATE")
@ApiParam(value = "提交日期")
private String commitDate;
@Column(name = "COMMIT_TIME")
@ApiParam(value = "提交时间")
private String commitTime;
@Column(name = "SN")
@ApiParam(value = "条码")
private String sn;
/**
* 状态:10=新建,20=已处理,30=处理出错 PRODUCT_INSTOCK_STATUS
*/
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态")
private Integer orderStatus;
/**
* 数据来源:ZMMES=知明MES,TBMES=MES接口 SRC_STATUS
*/
@Column(name = "SRC")
@ApiParam(value = "单据来源")
private String src;
}

21
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
Unescape Escape View File

@ -5,7 +5,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.bytebuddy.implementation.bind.annotation.Default;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -123,14 +122,6 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "默认入库库位")
private String inLocateNo;
@Transient
@ApiParam("默认入库存储区")
private String inZoneNo;
@Transient
@ApiParam("默认入库仓库")
private String inWhNo;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@ -143,6 +134,10 @@ public class WmsPart extends BaseBean {
@ApiParam("項目结算标识")
private String outCloseFlag = "2";
@Column(name = "OUT_CLOSE_TYPE")
@ApiParam("结算方式")
private String outCloseType;
@Transient
@ApiParam("总数量")
private Double qty;
@ -169,12 +164,4 @@ public class WmsPart extends BaseBean {
this.min = minQty;
this.qty = cqty;
}
public WmsPart(String partNo, String vendorNo, String inLocateNo, String inZoneNo, String inWhNo) {
this.partNo = partNo;
this.vendorNo = vendorNo;
this.inLocateNo = inLocateNo;
this.inZoneNo = inZoneNo;
this.inWhNo = inWhNo;
}
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
Unescape Escape View File

@ -147,6 +147,10 @@ public class WmsStockQuan extends BaseBean {
@ApiParam(value = "存储区集合")
private List<String> zoneList;
@Transient
@ApiParam(value = "移动单条码集合")
private List<WmsMoveSn> wmsMoveSnList;
public String getAreaNo() {
return areaNo;
@ -204,7 +208,7 @@ public class WmsStockQuan extends BaseBean {
}
public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName,
Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName) {
Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
this.whNo = whNo;
this.zoneNo = zoneNo;
this.partNo = partNo;
@ -220,7 +224,9 @@ public class WmsStockQuan extends BaseBean {
this.lockQty = lockQty;
this.prodCfgTypeCode = prodCfgTypeCode;
this.prodCfgTypeName = prodCfgTypeName;
this.scrapQty = scrapQty;
}
public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
this.qty = qty;
this.failQty = failQty;

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
Unescape Escape View File

@ -109,9 +109,8 @@ public class WmsStockSn extends BaseBean {
private String unit;
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;
private Double qty = 0d;
/**
* 质量状态:10=合格,20=不合格,30=隔离
@ -155,6 +154,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "SN_TYPE")
@ApiParam(value = "条码类型", example = "10")
private Integer snType = 10;
@ApiParam(value = "仓库名称")
@Transient
public String whNameRdd;
@ -227,8 +230,11 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "ERP库存地")
public String erpZoneNo;
public WmsStockSn(){}
@Transient
@ApiParam(value = "目标数量")
public Double destQty;
public WmsStockSn(){}
public WmsStockSn(String partNo){
this.partNo = partNo;

29
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java
Unescape Escape View File

@ -0,0 +1,29 @@
package cn.estsh.i3plus.pojo.wms.bean.esbio;
import lombok.Data;
/**
* Created by Administrator on 2019/7/2.
*/
@Data
public class IQ {
public String SID="";
public String TPDESC="";
public String RECYMD="";
public String RECHMS="";
public String XMLCON="";
public String ACTFLG="";
public String ACTYMD="";
public String ACTHMS="";
public String WERKS="";
}

29
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java
Unescape Escape View File

@ -0,0 +1,29 @@
package cn.estsh.i3plus.pojo.wms.bean.esbio;
import lombok.Data;
/**
* Created by Administrator on 2019/7/2.
*/
@Data
public class OQ {
public String SID="";
public String TPDESC="";
public String CREYMD="";
public String CREHMS="";
public String XMLCON="";
public String ACTFLG="";
public String ACTYMD="";
public String ACTHMS="";
public String WERKS="";
}

26
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java
Unescape Escape View File

@ -0,0 +1,26 @@
package cn.estsh.i3plus.pojo.wms.bean.esbio;
import lombok.Data;
@Data
public class PublishTopicData {
public int TPID =0;
public String PBNO ="";
public String TPNO ="";
public String TPDESC ="";
public String MESTAB ="";
public String MESGROP ="";
public String MESORD ="";
public String MESPK ="";
public String PBNAME ="";
}

28
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java
Unescape Escape View File

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.wms.bean.esbio;
import lombok.Data;
@Data
public class SI_TP {
public String TPTYP="";
public String TPNO="";
public String TPDESC="";
public String MESTAB="";
public String MESGROP="";
public String MESPK="";
public String ACTTYP="";
public String ACTDESC="";
public String ENAB="";
public String WERKS="";
}

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.bean.esbio;
import lombok.Data;
@Data
public class SI_TPMAP {
public int SEQ=0;
public String SAPCOL="";
public String MESCOL="";
public String COLTYP="";
public String COLDESC="";
}

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java
Unescape Escape View File

@ -17,18 +17,24 @@ import java.util.List;
@Repository
public interface IEngineScriptPersistenceRepository extends BaseRepository<EngineScriptPersistence, Long> {
/**
* 按照脚本编号查询脚本实体对象
* 按照工厂代码和脚本编号查询脚本实体对象
* @param organizeCode 工厂代码
* @param scriptNo 脚本编号
* @return 脚本实体对象
*/
EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo);
/**
* 按照脚本编号查询脚本实体对象
* @param scriptNo 脚本编号
* @return 脚本实体对象
*/
EngineScriptPersistence findByScriptNo(String scriptNo);
/**
* 查找所有的脚本语言类型
* @return 数据库中已经存在的脚本语言类型
*/
@Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType")
List findGroupByLanguageType();
EngineScriptPersistence findByScriptNo(String scriptNo);
}

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.AmpJisRec;
import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-06-28 15:17
* @Modify:
**/
@Repository
public interface WmsInterfaceDataMapperRepository extends BaseRepository<WmsInterfaceDataMapper,Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsPackSn;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2019-07-17 13:36
* @Modify:
**/
@Repository
public interface WmsPackSnRepository extends BaseRepository<WmsPackSn, Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsShipping;
import org.springframework.stereotype.Repository;
/**
* @Description 对象持久层仓用方法控制(产品发运表)
* @Reference
* @Author dragon
* @CreateDate 2019/7/17 15:54
* @Modify
*/
@Repository
public interface WmsShippingRepository extends BaseRepository<WmsShipping, Long> {
}

145
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.wms.bean.*;
import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
import com.alibaba.fastjson.JSONObject;
@ -47,6 +48,23 @@ public class WmsHqlPack {
}
/**
* 单位换算 分页查询
* @return
*/
public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsUnitConvert.getUnitCode(), "unitCode", result);
DdlPreparedPack.getStringEqualPack(wmsUnitConvert.getDestUnitCode(), "destUnitCode", result);
getStringBuilderPack(wmsUnitConvert, result);
return result;
}
/**
* PO订单明细表 分页查询
*
* @param wmsPOMasterDetails
@ -58,7 +76,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
@ -79,7 +97,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result);
@ -118,9 +136,10 @@ public class WmsHqlPack {
DdlPackBean packBean = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
getStringBuilderPack(wmsDocMovementMaster, packBean);
@ -138,7 +157,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
@ -176,6 +195,7 @@ public class WmsHqlPack {
/**
* 物流路线子表查询条件封装
*
* @param wmsRoutingDetail
* @return
*/
@ -207,6 +227,7 @@ public class WmsHqlPack {
/**
* 物流路线子表查询条件封装
*
* @param wmsRoutingAssign
* @return
*/
@ -244,7 +265,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
@ -265,7 +286,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringRightLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
getStringBuilderPack(wmsIbCheckPlan, result);
@ -289,7 +310,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
@ -554,6 +575,8 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result);
//特殊发货标志
DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
//单据来源
DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result);
getStringBuilderPack(wmsShipping, result);
@ -679,9 +702,9 @@ public class WmsHqlPack {
// 来源单据类型
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result);
// 来源单据号
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
DdlPreparedPack.getStringLikerPack(wmsSnPrint.getRefNo(), "refNo", result);
// 打印机
DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result);
DdlPreparedPack.getStringLikerPack(wmsSnPrint.getPrinter(), "printer", result);
// 打印机状态
DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result);
@ -808,7 +831,14 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
if (wmsStockSn.getSnStatus() == null) {
DdlPreparedPack.getInPackArray(new Integer[]{
WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(),
WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result);
}
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
result.setWhereAppend(result.getWhereAppend() + " and qty > 0");
getStringBuilderPack(wmsStockSn, result);
@ -864,7 +894,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
@ -872,6 +902,7 @@ public class WmsHqlPack {
return result;
}
/**
* 业务：库存表报查询封装
*
@ -923,6 +954,7 @@ public class WmsHqlPack {
return result;
}
/**
* 业务：物料包装查询封装
*
@ -933,8 +965,8 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result);
DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
getStringBuilderPack(wmsPackage, result);
@ -970,9 +1002,16 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result);
DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(),
wmsMoveMaster.getModifyDateTimeEnd(), "modifyDatetime", result, true);
getStringBuilderPack(wmsMoveMaster, result);
return result;
@ -1063,13 +1102,13 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//单号
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result);
//业务类型
DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
//关联单据类型
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
//关联单据号
DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result);
getStringBuilderPack(wmsQCMaster, result);
@ -1118,6 +1157,7 @@ public class WmsHqlPack {
/**
* 条码状态查询报表查询条件
*
* @param wmsStockSn
* @return
*/
@ -1431,6 +1471,13 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zones", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result);
if (StringUtils.isNotBlank(wmsStockSn.getOrderByParam())) {
result.setOrderByStr(wmsStockSn.getOrderByParam());
}
getStringBuilderPack(wmsStockSn, result);
return result;
}
@ -1547,6 +1594,7 @@ public class WmsHqlPack {
/**
* 把 List<Map> 中的一组数据重新封装到List<String>中
*
* @param mapList
* @param keyName
*/
@ -1561,6 +1609,7 @@ public class WmsHqlPack {
/**
* 把 List<Map> 中的一组查询条件封装成 HQL
*
* @param mapList
* @param keyName
* @param columnName
@ -1680,10 +1729,10 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) {
DdlPackBean packBean = new DdlPackBean();
if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean);
DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmName(), "tmName", packBean);
}
if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean);
DdlPreparedPack.getStringLikerPack(wmsTransModule.getCallClass(), "callClass", packBean);
}
if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean);
@ -1942,6 +1991,7 @@ public class WmsHqlPack {
getStringBuilderPack(wmsVendorPart, result);
return result;
}
/**
* 主数据信息 分页查询
*
@ -2102,11 +2152,70 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getInPackList(statusList, "asnStatus", result);
DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(), "actionStatus", result);
DdlPreparedPack.getStringEqualPack(String.valueOf(WmsEnumUtil.ORDER_TYPE.AMP.getValue()),"asnType",result);
DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(), "asnType", result);
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result;
}
/**
* 接口映射分页查询条件
*
* @param wmsInterfaceDataMapper
* @return
*/
public static DdlPackBean packHqlWmsInterfaceDataMapper(WmsInterfaceDataMapper wmsInterfaceDataMapper) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getSrcTableName(), "srcTableName", result);
DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getDestBeanName(), "destBeanName", result);
DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getBusiRoute(), "busiRoute", result);
DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getGroupName(), "groupName", result);
getStringBuilderPack(wmsInterfaceDataMapper, result);
return result;
}
/**
* 库存条码管理查询条件
*
* @param wmsStockSn
* @return
*/
public static DdlPackBean packHqlWmsStockSnManageByPager(WmsStockSn wmsStockSn) {
DdlPackBean result = new DdlPackBean();
// 物料编码支持多选
DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
// 存储区
DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
// 库位不为空
DdlPreparedPack.getStringNotNullPack( "locateNo", result);
DdlPreparedPack.getStringNoEqualPack("","locateNo", result);
// 排除创建及出库状态条码
if(wmsStockSn.getSnStatus() != null){
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
}
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result);
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result);
//数量大于0
DdlPreparedPack.getNumberBiggerPack(0,"qty",result);
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
getStringBuilderPack(wmsStockSn, result);
return result;
}
}

Write Preview
Loading…
Cancel
Save