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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source 
 Conflicts:
	modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
yun-zuoyi
WYnneaoapc 6 years ago
parent 360f908ae4 c3441184c0
commit 37e288ff77
33 changed files with 1093 additions and 108 deletions
Show Stats Download Patch File Download Diff File

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

@ -0,0 +1,80 @@
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;
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;
import javax.persistence.Transient;
/**
* @Description: 安灯通知记录表
* @Reference:
* @Author: Crish
* @CreateDate:2019-11-11-14:23
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_MESSAGE_RECORD")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("通知记录")
public class AndonMessageRecord extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心")
private String workCenterCode;
@Column(name = "ANDON_ORDER_NO")
@ApiParam(value = "安灯队列编号")
private String andonOrderNo;
@Column(name = "ALARM_CODE")
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "STATUS_CODE")
@AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
@ApiParam(value = "安灯状态代码")
private String statusCode;
@Column(name = "RP_OBJECT_CODE")
@ApiParam(value = "通知对象代码")
private String rpObjectCode;
@Transient
@ApiParam(value = "通知对象名称")
private String rpObjectName;
@Column(name = "RP_CODE")
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
@ApiParam(value = "通知方式")
private String rpCode;
@Column(name = "RP_NAME")
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
@ApiParam(value = "通知方式名称")
private String rpName;
@Column(name = "RP_LEVEL")
@ApiParam(value = "通知等级")
private String rpLevel;
@Column(name = "IS_SUCCEED")
@ApiParam(value = "成功标识")
private String isSucceed;
@Column(name = "MEMO")
@ApiParam(value = "备注")
private String memo;
}

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

@ -0,0 +1,46 @@
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;
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:
* @Reference: 通知方式
* @Author: Crish
* @CreateDate:2019-11-11-14:23
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_RESPONSE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("通知方式")
public class AndonResponse extends BaseBean {
@Column(name = "RESPONSE_CODE")
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
@ApiParam(value = "通知方式")
private String responseCode;
@Column(name = "RESPONSE_NAME")
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
@ApiParam(value = "通知名称")
private String responseName;
@Column(name = "RESPONSE_CONTENT")
@ApiParam(value = "通知内容")
private String responseContent;
}

46
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java
Unescape Escape View File

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.andon.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description: 按照安灯类型统计分组统计当天发生的安灯总次数和安灯超时次数 model
* @Reference:
* @Author: Crish
* @CreateDate:2019-11-12-10:21
* @Modify:
**/
@Data
public class AndonBoardModel {
@ApiParam("安灯类型")
private String alarmCode;
@ApiParam("安灯类型名称")
private String alarmName;
@ApiParam("安灯正常处理的次数")
private Integer inTime;
@ApiParam("安灯超时次数")
private Integer overTime;
@ApiParam("安灯总次数")
private Integer totalTime;
public int getTotalTimeVal() {
return totalTime == null ? 0 : totalTime;
}
public int getOverTimeVal() {
return overTime == null ? 0 : overTime;
}
public int getInTime() {
return inTime == null ? 0 : inTime;
}
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-11-12-14:24
* @Modify:
**/
@Repository
public interface IAndonMessageRecordRepository extends BaseRepository<AndonMessageRecord, Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonResponse;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description: 通知方式
* @Reference:
* @Author: Crish
* @CreateDate:2019-11-11-15:12
* @Modify:
**/
@Repository
public interface IAndonResponseRepository extends BaseRepository<AndonResponse, Long> {
}

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

@ -20,7 +20,38 @@ import org.apache.commons.lang3.StringUtils;
* @Modify:
**/
public class AndonHqlPack {
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 Start ***********/
/**
* 安灯通知方式查询封装
* @param andonResponse
* @return
*/
public static DdlPackBean getAndonResponse(AndonResponse andonResponse) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonResponse.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonResponse.getResponseCode(), "responseCode", packBean);
return packBean;
}
/**
* 安灯通知记录查询条件封装
* @param andonMessageRecord
* @return
*/
public static DdlPackBean getAndonMessageRecord(AndonMessageRecord andonMessageRecord) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean);
if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){
DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true);
}
return packBean;
}
/**
* 工作单元呼叫原因配置查询条件封装
* @param andonCellAlarmCause
@ -137,7 +168,6 @@ public class AndonHqlPack {
DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean);
return packBean;
}
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/
/**

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

@ -12,8 +12,78 @@ import org.apache.commons.lang3.StringUtils;
**/
public class AndonEnumUtil {
/**
* 成功失败标识
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_SUCCESS_FLAG{
SUCCESS(1, "1","成功"),
FAIL(2, "2","失败");
private int value;
private String code;
private String description;
ANDON_SUCCESS_FLAG(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode(){ return code; }
public String getDescription() {
return description;
}
public static String valueOfDescription(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 String codeOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].code, val)) {
tmp = values()[i].description;
}
}
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;
}
public static String descriptionOfCode(String val) {
String tmp = "";
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].code;
}
}
return tmp;
}
}
/**
* 通知超时标识
* 10 - 一级，20 - 二级，30 - 三级
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NOTICE_OVER_TIME_FLAG{
@ -62,9 +132,17 @@ public class AndonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BROADCAST_CUSTOM_CONDITION {
CALL("{A}","workCenterCode","产线"),
SIGN("{B}","workCellCode","工位"),
RESOLVE("{C}","alarmCode","安灯类型");
LINE("{A}","workCenterCode","产线代码"),
LINE_NAME("{B}","workCenterName","产线名称"),
CELL("{C}","workCellCode","工位代码"),
CELL_NAME("{D}","workCellName","工位名称"),
ALARM_CODE("{E}","alarmCode","安灯类型代码"),
ALARM_NAME("{F}","alarmName","安灯类型名称"),
CALL_USER("{G}","callUser","呼叫人名称"),
ALARM_DETAIL("{H}","alarmDetailCode","安灯子类型"),
ALARM_DETAIL_NAME("{L}","alarmDetailNameRdd","安灯子类型名称"),
AC_CODE("{J}","acCode","事件描述代码"),
AC_NAME("{K}","acNameRdd","事件描述名称");
private String value;
private String code;

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

@ -1128,7 +1128,6 @@ public class CommonEnumUtil {
}
}
// 数据有效的静态常量
public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue();
// 数据未删除的静态常量

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

@ -1023,7 +1023,8 @@ public class ImppEnumUtil {
MAIL(3, "邮件配置"),
CONTACT(4, "联系人"),
BASIS(5, "基础"),
CONFIG(6, "系统配置");
CONFIG(6, "系统配置"),
LOG(7, "日志配置");
private int value;
private String description;

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

@ -62,7 +62,8 @@ public class LacEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HARDWARE_TYPE {
OPC_READ(10, "读OPC"),
OPC_WRITE(20, "写OPC");
OPC_WRITE(20, "写OPC"),
OPC_SUBSCRIPTION(30, "订阅OPC");
private int value;
private String description;
@ -180,4 +181,74 @@ public class LacEnumUtil {
}
}
/**
* 返回方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RETURN_METHOD{
SYNC(1,"同步"),
ASYNC(2,"异步");
private int value;
private String description;
RETURN_METHOD(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(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 PARAM_VALUE_TYPE{
NUMBER(1,"数字"),
STRING(2,"字符串");
private int value;
private String description;
PARAM_VALUE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -13,6 +13,44 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* MesIf 交互方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IF_CONNECT_TYPE {
DB("10", "DB"),
WEBSERVICE("20", "webservice "),
RESTFUL("30", "restful");
private String value;
private String description;
IF_CONNECT_TYPE(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 (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* Mes 工厂初始化数据
*/
@ -26,7 +64,6 @@ public class MesEnumUtil {
MES_PCN_SYNC_CFG("MesPcnSyncCfg", "MES_PCN_SYNC_CFG", "同步配置"),
MES_BUTTON_STATUS("MesButtonStatus", "MES_BUTTON_STATUS", "按钮状态配置表"),
MES_WORK_CELL_PARAM("MesWorkCellParam", "MES_WORK_CELL_PARAM", "工作单元参数"),
MES_STATUS_CFG("MesStatusCfg", "MES_STATUS_CFG", "状态配置"),
MES_EVENT("MesEvent", "MES_EVENT", "事件清单"),
MES_METHOD("MesMethod", "MES_METHOD", "方法清单"),
MES_ACTION("MesAction", "MES_ACTION", "动作"),

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

@ -13,6 +13,93 @@ import org.apache.commons.lang3.StringUtils;
public class MesPcnEnumUtil {
/**
* 条码类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PRODUCE_SN_TYPE {
NORMAL(10, "正常件"),
FIRST_INSPECTION(20, "首检件");
private int value;
private String description;
MES_PRODUCE_SN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* pcn 操作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_OPERATE_TYPE {
WORKSTATION_SCAN(10, "工位扫描"),
QUALITY_JUDGEMENT(20, "质量判定"),
MATERIAL_DISMANTLING(30, "物料拆解"),
REWORK(40, "返修作业"),
WORKSTATION_MONITORING(50, "工位监控");
private int value;
private String description;
MES_OPERATE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
// 根据value返回枚举类型,主要在switch中使用
public static MES_OPERATE_TYPE getByValue(int value) {
for (MES_OPERATE_TYPE mesInsertExcel : values()) {
if (mesInsertExcel.getValue() == value) {
return mesInsertExcel;
}
}
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesProductEncodeCfg 匹配类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -1985,6 +2072,46 @@ public class MesPcnEnumUtil {
}
}
/**
* 工位程序交互时的数据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STATION_DATA_TYPE {
TABLE("table", "表格"),
TEXT("text", "正常文本"),
EXP_TEXT("exp_text", "异常文本"),
FILE("file", "定制内容文件"),
IMAGE("image", "图片"),
BUTTON("button", "按钮");
private String value;
private String description;
STATION_DATA_TYPE(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 (val.equals(values()[i].value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ONLINE_SEND_TYPE {
@ -2054,6 +2181,44 @@ public class MesPcnEnumUtil {
}
}
/**
* 包装层级 MES_PACKAGE
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PACKAGE_PACKLEVEL {
FIRST(1, "第一层"),
SECOND(2, "第二层"),
THIRD(3, "第三层"),
FOURTH(4, "第四层");
private int value;
private String description;
PACKAGE_PACKLEVEL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(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 PRODUCT_PATTERN_PARAMS {

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

@ -641,7 +641,8 @@ public class WmsEnumUtil {
VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"),
VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"),
KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理");
VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货");
private int value;
@ -899,7 +900,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_INFO_STATUS {
CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理");
CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理")
, CLOSE(40, "已关闭");
private int value;
private String description;
@ -932,24 +934,27 @@ public class WmsEnumUtil {
}
}
/**
* 单据是否生成任务状态
* 业务表：库存条码状态
* 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IS_GENERAL_TASK {
CREATE(10, "CREATE", "创建"),
INIT(20, "INIT", "初始化"),
IS_GENERAL(30, "IS_GENERAL", "已生成"),
NO_GENERAL(40, "NO_GENERAL", "不生成"),
CANCEL(50, "CANCEL", "撤销");
public enum STOCK_SN_STATUS {
CREATE(10, "创建"),
QUALITY_CONTROL(20, "质检中"),
PRE_INSTOCK(30, "待入库"),
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
COMMING(80, "在途");
private int value;
private String code;
private String description;
IS_GENERAL_TASK(int value, String code, String description) {
STOCK_SN_STATUS(int value, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -961,10 +966,6 @@ public class WmsEnumUtil {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -975,6 +976,10 @@ public class WmsEnumUtil {
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -984,32 +989,25 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 业务表：库存条码状态
* 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
* 单据是否生成任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
CREATE(10, "创建"),
QUALITY_CONTROL(20, "质检中"),
PRE_INSTOCK(30, "待入库"),
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
COMMING(80, "在途");
public enum IS_GENERAL_TASK {
CREATE(10, "CREATE", "创建"),
INIT(20, "INIT", "初始化"),
IS_GENERAL(30, "IS_GENERAL", "已生成"),
NO_GENERAL(40, "NO_GENERAL", "不生成"),
CANCEL(50, "CANCEL", "撤销");
private int value;
private String code;
private String description;
STOCK_SN_STATUS(int value, String description) {
IS_GENERAL_TASK(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -1021,6 +1019,10 @@ public class WmsEnumUtil {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -1031,10 +1033,6 @@ public class WmsEnumUtil {
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -1044,8 +1042,11 @@ public class WmsEnumUtil {
}
return tmp;
}
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 业务表：库存条码质检状态
*/
@ -1357,20 +1358,22 @@ public class WmsEnumUtil {
}
/**
* 质检业务类型
* 质检业务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_TYPE {
FEED(10, "进料检验"),
ONLINE(20, "在线检验"),
EMDPRODUCT(30, "成品检验"),
SHIPMENTS(40, "出货检验");
public enum QC_INFO_STATUS {
CREATE(10, "新建"),
FINISH(20, "处理中"),
FAIL(30, "已完成"),
CLOSE(40, "已关闭"),
CANCEL(50, "已取消");
private int value;
private String description;
QC_INFO_TYPE(int value, String description) {
QC_INFO_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -1392,27 +1395,20 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 质检业务状态
* 质检明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_STATUS {
CREATE(10, "新建"),
FINISH(20, "处理中"),
FAIL(30, "已完成"),
CLOSE(40, "已关闭"),
CANCEL(50, "已取消");
public enum QC_ITEM_STATUS {
NORMAL(10, "正常"),
CANCELLATION(20, "已处理");
private int value;
private String description;
QC_INFO_STATUS(int value, String description) {
QC_ITEM_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -1435,19 +1431,20 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 质检明细状态
* 质检业务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_ITEM_STATUS {
NORMAL(10, "正常"),
CANCELLATION(20, "已处理");
public enum QC_INFO_TYPE {
FEED(10, "进料检验"),
ONLINE(20, "在线检验"),
EMDPRODUCT(30, "成品检验"),
SHIPMENTS(40, "出货检验");
private int value;
private String description;
QC_ITEM_STATUS(int value, String description) {
QC_INFO_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -1469,8 +1466,11 @@ public class WmsEnumUtil {
}
return tmp;
}
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 作业记录参数状态
*/
@ -3748,7 +3748,8 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SN_OPERATE_TYPE {
REPORT(10, "REPORT", "生产报工"),
BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错");
BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"),
REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销");
private int value;
private String code;
@ -4104,4 +4105,77 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 生产质检单的方式
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CREATE_QC_ORDER_TYPE {
BY_MOVE(10, "按库存移动单"), BY_PART(20, "按物料编号");
private int value;
private String description;
CREATE_QC_ORDER_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 PACKAGE_OPERATE_TYPE {
PACKAGE_ADD("PACKAGE_ADD", "新增"),
PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "追加"),
PACKAGE_DELETE("PACKAGE_DELETE", "删除"),
PACKAGE_CLEAR("PACKAGE_CLEAR", "清空");
private String value;
private String description;
PACKAGE_OPERATE_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String getDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (val.equals(values()[i].value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

10
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
Unescape Escape View File

@ -56,12 +56,16 @@ public class LacCommandStackStep extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="STEP_NAME")
@Column(name="TEMPLATE_NAME_RDD")
@ApiParam(value ="模板名称")
private String templateNameRdd;
@Column(name="STEP_NAME")
@ApiParam(value ="步骤名称")
private String stepName;
@Column(name="STEP_CODE")
@ApiParam(value ="模板代码")
@ApiParam(value ="步骤代码")
private String stepCode;
@Column(name="STEP_SORT")
@ -73,7 +77,7 @@ public class LacCommandStackStep extends BaseBean {
private Double stepExecCond;
@Column(name="STEP_DESCRIPTION")
@ApiParam(value ="步骤执行条件")
@ApiParam(value ="步骤描述")
private String stepDescription;
@Transient

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

@ -81,10 +81,6 @@ public class LacSuitCase extends BaseBean {
@ApiParam(value ="返回类型")
private Integer returnMethod;
@Column(name="SUTI_CASE_STATUS")
@ApiParam(value ="适配器状态")
private Integer sutiCaseStatus;
@Column(name="SUIT_CASE_DESCRIPTION")
@ApiParam(value ="适配器描述")
private String suitCaseDescription;

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

@ -91,7 +91,7 @@ public class LacSuitTaskParamAdapter extends BaseBean {
@Column(name="TRANSFER_PARAM_VALUE_TYPE")
@ApiParam(value ="转换后参数值类型")
private String transferParamValueType;
private Integer transferParamValueType;
@Column(name="DEFAULT_VALUE")
@ApiParam(value ="参数默认值")

5
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
Unescape Escape View File

@ -67,6 +67,9 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(bean.getTaskName(),"taskName",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getTaskCode(),"taskCode",ddlPackBean);
return ddlPackBean;
}
@ -94,6 +97,8 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getParamType(),"paramType",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
return ddlPackBean;
}

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
Unescape Escape View File

@ -48,7 +48,7 @@ public class MesPackage extends BaseBean {
private Double packSpecQty;
@Column(name = "UNIT")
@ApiParam("包装规格数量")
@ApiParam("单位")
private String unit;
@Column(name = "LOT_NO")
@ -63,10 +63,6 @@ public class MesPackage extends BaseBean {
@ApiParam("是否封箱")
private Integer isSealed;
@Transient
@ApiParam("封箱状态")
private String sealStatus;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态10：未打印 20：已打印")
private Integer printStatus;
@ -91,6 +87,12 @@ public class MesPackage extends BaseBean {
@ApiParam("客户代码")
private String custCode;
@Transient
@ApiParam("封箱状态")
private String sealStatus;
public MesPackage() {
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java
Unescape Escape View File

@ -43,6 +43,10 @@ public class MesProdPack extends BaseBean {
@ApiParam("产品标签模板")
private String prodLabelTemplate;
@Column(name = "PACK_LABEL_TEMPLATE")
@ApiParam("包装标签模板")
private String packLabelTemplate;
@Column(name = "PACK_LABEL_TEMPLATE2")
@ApiParam("包装标签模板2")
private String packLabelTemplate2;

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

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Author: wangjie
* @CreateDate: 2019/9/23 8:06 PM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("产品包装model")
public class ProdPackageModel {
@ApiParam("工单号")
private String workOrderNo;
@ApiParam("生产线")
private String workCenterCode;
@ApiParam("客户代码")
private String custCode;
@ApiParam("班次")
private String shiftCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("单位")
private String unit;
@ApiParam("工单数量")
private Double workOrderQty;
@ApiParam("完成数量")
private Double completeQty;
@ApiParam("包装规格数量")
private Double packSpecQty;
@ApiParam("包装规格")
private String packSpec;
@ApiParam("包装集合")
private List<MesPackage> packageList;
@ApiParam("工单集合")
private List<MesWorkOrder> workOrderList;
}

38
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java
Unescape Escape View File

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.mes.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:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION_IF")
@Api("动作接口配置")
public class MesActionIf extends BaseBean {
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

46
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java
Unescape Escape View File

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mes.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:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:43
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_IF")
@Api("接口清单")
public class MesIf extends BaseBean {
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "IF_NAME")
@ApiParam("接口名称")
private String ifName;
@Column(name = "IF_CONNECT_TYPE")
@ApiParam("交互方式")
private String ifConnectType;
@Column(name = "IF_CLASS")
@ApiParam("接口实现类")
private String ifClass;
}

46
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java
Unescape Escape View File

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mes.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:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:40
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_KEY_ACTION")
@Api("关键动作")
public class MesKeyAction extends BaseBean {
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "ACTION_NAME")
@ApiParam("动作名称")
private String actionName;
@Column(name = "ACTION_DESC")
@ApiParam("动作描述")
private String actionDesc;
@Column(name = "ACTION_CLASS")
@ApiParam("动作关联类")
private String actionClass;
}

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

@ -63,10 +63,6 @@ public class MesPackage extends BaseBean {
@ApiParam("是否封箱")
private Integer isSealed;
@Transient
@ApiParam("封箱状态")
private String sealStatus;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态10：未打印 20：已打印")
private Integer printStatus;
@ -91,4 +87,8 @@ public class MesPackage extends BaseBean {
@ApiParam("客户代码")
private String custCode;
@Transient
@ApiParam("封箱状态")
private String sealStatus;
}

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

@ -43,14 +43,14 @@ public class MesProdPack extends BaseBean {
@ApiParam("产品标签模板")
private String prodLabelTemplate;
@Column(name = "PACK_LABEL_TEMPLATE2")
@ApiParam("包装标签模板2")
private String packLabelTemplate2;
@Column(name = "PACK_LABEL_TEMPLATE")
@ApiParam("包装标签模板")
private String packLabelTemplate;
@Column(name = "PACK_LABEL_TEMPLATE2")
@ApiParam("包装标签模板2")
private String packLabelTemplate2;
@Column(name = "PACK_LABEL_TEMPLATE3")
@ApiParam("包装标签模板3")
private String packLabelTemplate3;

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesActionIf;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:53
* @Modify:
**/
public interface MesActionIfRepository extends BaseRepository<MesActionIf, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesIf;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:51
* @Modify:
**/
public interface MesIfRepository extends BaseRepository<MesIf, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesKeyAction;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\13 11:50
* @Modify:
**/
public interface MesKeyActionRepository extends BaseRepository<MesKeyAction, Long> {
}

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

@ -973,9 +973,6 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(packSpec.getSpecName())) {
DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
}
// if (!StringUtils.isEmpty(packSpec.getSpecCode())) {
// DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "parentSpec", packBean);
// }
return packBean;
}
@ -1178,8 +1175,12 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
if (!StringUtils.isEmpty(mesPcnTask.getTaskCode())) {
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
}
if (!StringUtils.isEmpty(mesPcnTask.getTaskName())) {
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
}
packBean.setOrderByStr(mesPcnTask.orderBy());
return packBean;
}
@ -1670,7 +1671,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesProdPack.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesProdPack.getCustomerCode())) {
DdlPreparedPack.getStringEqualPack(mesProdPack.getCustomerCode(), "customerCode", packBean);
DdlPreparedPack.getStringLikerPack(mesProdPack.getCustomerCode(), "customerCode", packBean);
}
if (!StringUtils.isEmpty(mesProdPack.getPackSpec())) {
DdlPreparedPack.getStringLikerPack(mesProdPack.getPackSpec(), "packSpec", packBean);
@ -1746,4 +1747,84 @@ public class MesHqlPack {
"createDatetime", packBean, true);
return packBean;
}
/**
* 模板配置
* @param mesLabelTemplate
* @param organizeCode
* @return
*/
public static DdlPackBean getMesLabelTemplate(MesLabelTemplate mesLabelTemplate, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesLabelTemplate, organizeCode);
if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateCode())) {
DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
}
if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) {
DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean);
}
return packBean;
}
/**
* 关键动作
* @param mesKeyAction
* @param organizeCode
* @return
*/
public static DdlPackBean getMesKeyAction(MesKeyAction mesKeyAction, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesKeyAction, organizeCode);
if (!StringUtils.isEmpty(mesKeyAction.getActionCode())) {
DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionCode(), "actionCode", packBean);
}
if (!StringUtils.isEmpty(mesKeyAction.getActionName())) {
DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionName(), "actionName", packBean);
}
if (!StringUtils.isEmpty(mesKeyAction.getActionDesc())) {
DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionDesc(), "actionDesc", packBean);
}
if (!StringUtils.isEmpty(mesKeyAction.getActionClass())) {
DdlPreparedPack.getStringLikerPack(mesKeyAction.getActionClass(), "actionClass", packBean);
}
return packBean;
}
/**
* 动作接口配置
* @param mesActionIf
* @param organizeCode
* @return
*/
public static DdlPackBean getMesActionIf(MesActionIf mesActionIf, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesActionIf, organizeCode);
if (!StringUtils.isEmpty(mesActionIf.getActionCode())) {
DdlPreparedPack.getStringLikerPack(mesActionIf.getActionCode(), "actionCode", packBean);
}
if (!StringUtils.isEmpty(mesActionIf.getIfCode())) {
DdlPreparedPack.getStringLikerPack(mesActionIf.getIfCode(), "ifCode", packBean);
}
return packBean;
}
/**
* 接口清单
* @param mesIf
* @param organizeCode
* @return
*/
public static DdlPackBean getMesIf(MesIf mesIf, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesIf, organizeCode);
if (!StringUtils.isEmpty(mesIf.getIfCode())) {
DdlPreparedPack.getStringLikerPack(mesIf.getIfCode(), "ifCode", packBean);
}
if (!StringUtils.isEmpty(mesIf.getIfName())) {
DdlPreparedPack.getStringLikerPack(mesIf.getIfName(), "ifName", packBean);
}
if (!StringUtils.isEmpty(mesIf.getIfConnectType())) {
DdlPreparedPack.getStringLikerPack(mesIf.getIfConnectType(), "ifConnectType", packBean);
}
if (!StringUtils.isEmpty(mesIf.getIfClass())) {
DdlPreparedPack.getStringLikerPack(mesIf.getIfClass(), "ifClass", packBean);
}
return packBean;
}
}

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

@ -1,14 +1,12 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
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;
@ -57,7 +55,7 @@ public class SysConfig extends BaseBean {
private String configValue;
@Column(name="CONFIG_VALUE_OPTION")
@ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}")
@ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{\"key\":\"value\"}")
private String configValueOption;
@Column(name="CONFIG_DESCRIPTION")

1
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
Unescape Escape View File

@ -334,6 +334,7 @@ public class SoftSwitchHqlPack {
DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);

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

@ -32,7 +32,6 @@ import javax.persistence.Transient;
@Api("容器类型")
public class WmsContainerType extends BaseBean {
private static final long serialVersionUID = 4849044986767609347L;
@Column(name = "CT_CODE",unique = true)
@ApiParam(value = "容器类型代码")
private String ctCode;

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

@ -233,13 +233,13 @@ public class WmsMoveSn extends BaseBean {
this.refSrc = refSrc;
}
public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double destQty) {
public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, String transTypeName, Double destQty) {
this.partNo = partNo;
this.srcLocateNo = srcLocateNo;
this.destLocateNo = destLocateNo;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.busiTypeCode = busiTypeCode;
this.transTypeName = transTypeName;
this.destQty = destQty;
}

Write Preview
Loading…
Cancel
Save