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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent 4d383dda1b 6190a4f66d
commit 398207b875
66 changed files with 2091 additions and 230 deletions
Show Stats Download Patch File Download Diff File

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

@ -43,7 +43,8 @@ public class CommonEnumUtil {
SURFACE(98, 0, 0, "i3surface", "对外服务"),
CLOUD(97, 0, 0, "i3cloud", "微服务"),
GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"),
CONSOLE(95, 8010, 2, "impp-console", "服务监控台");
CONSOLE(95, 8010, 2, "impp-console", "服务监控台"),
DEV(9999, 0000, 0, "Development", "系统调试");
/**
* 产品ID
@ -1231,7 +1232,7 @@ public class CommonEnumUtil {
* 日志记录方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOG_DETAIL_SHOW_TYPE {
public enum LOG_DETAIL_SHOW_TYPE {
DEBUG(1, "DEBUG"),
OVER_TIME(2, "记录超时服务"),
ALL_METHOD(3, "所有服务"),
@ -1963,6 +1964,50 @@ public class CommonEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DAO_OPERATE_TYPE {
INSERT(1, "新增"),
DELETE(2, "删除"),
UPDATE(3, "修改"),
SELECT(4, "查询");
private int value;
private String description;
private DAO_OPERATE_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;
}
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;
}
}
/**
* actuator env
*/

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

@ -643,7 +643,8 @@ public class MesEnumUtil {
REPAIR("REPAIR", "处理措施"),
SCRAP("SCRAP", "报废原因"),
QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
WC_CHECK("WC_CHECK", "开线检查项");
WC_CHECK("WC_CHECK", "开线检查项"),
BOARD("BOARD", "看板类型");
private String value;
private String description;

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

@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SHIPPING_ACTUAL_STATUS {
CREATE(10, "创建"),
CANCEL(20, "已发运");
SHIPPED(20, "已发运");
private int value;
private String description;
@ -3403,7 +3403,7 @@ public class MesPcnEnumUtil {
public int getValue() {
return value;
}
public String getCode() {
return code;
}

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

@ -6192,4 +6192,226 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
* 数据格式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_FORMAT {
STRING_FORMAT(1, "String", "字符串格式"),
INTEGER_FORMAT(2, "Integer", "整数格式"),
DOUBLE_FORMAT(3, "Double", "高精度浮点格式"),
DATE_FORMAT(4, "Date", "日期格式"),
FLOAT_FORMAT(5, "Float", "浮点格式"),
BOOL_FORMAT(6, "Boolean", "布尔格式"),
LONG_FORMAT(7, "LONG", "长整数格式");
private int value;
private String code;
private String description;
DATA_FORMAT(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 数据导入类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TEMPLATE_IMPORT_TYPE {
SINGLE_TABLE(10, "SINGLE_TABLE", "单表"),
MULTI_TABLE(20, "MULTI_TABLE", "多表");
private int value;
private String code;
private String description;
TEMPLATE_IMPORT_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 数据更新类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TEMPLATE_UPDATE_TYPE {
FULL_COVERAGE(10, "FULL_COVERAGE", "全覆盖"),
DIFF_UPDATE(20, "DIFF_UPDATE", "差异更新"),
REPEATE_NO_IMPORT(30, "REPEATE_NO_IMPORT", "重复不导入");
private int value;
private String code;
private String description;
TEMPLATE_UPDATE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 采购计划历史状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PURCHASE_PLAN_HISTORY_STATUS {
CREATE(10, "CREATE", "采购订单创建"),
PUBLISH(20, "PUBLISH", "采购订单发布"),
VERDOR_CONFIRM(30, "VERDOR_CONFIRM", "供应商确认订单"),
VERDOR_PRINT(40, "VERDOR_PRINT", "供应商打印"),
VERDOR_SNED(50, "VERDOR_SNED", "供应商发货"),
RECEIPT_FINISH(60, "RECEIPT_FINISH", "收货完成"),
FAIL(70, "FAIL", "质检完成");
private int value;
private String code;
private String description;
PURCHASE_PLAN_HISTORY_STATUS(int value, String code,String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
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 String valueOfDescription(int val) {
return valueOf(val);
}
}
}

1
modules/i3plus-pojo-mes-pcn/pom.xml
Unescape Escape View File

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-mes-pcn</artifactId>
<packaging>jar</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<dependencies>
<dependency>

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

@ -8,6 +8,7 @@ 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;
@ -28,78 +29,78 @@ import java.io.Serializable;
@Table(name = "if_queue_shipping")
@Api("JIT发运数据同步")
public class IfQueueShipping extends BaseBean implements Serializable {
private static final long serialVersionUID = -8961182851667690154L;
@Column(name = "JIT_NO")
@ApiParam("JIT队列编号")
private String jitNo;
private static final long serialVersionUID = -8961182851667690154L;
@Column(name = "JIT_NO")
@ApiParam("JIT队列编号")
private String jitNo;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "CUST_FLAG_NO")
@ApiParam("客户标识号")
private String custFlagNo;
@Column(name = "CUST_FLAG_NO")
@ApiParam("客户标识号")
private String custFlagNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private String actionDateTime;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private String actionDateTime;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "JIT_LOT_NO")
@ApiParam("JIT队列批次")
private String jitLotNo;
@Column(name = "JIT_LOT_NO")
@ApiParam("JIT队列批次")
private String jitLotNo;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

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

@ -0,0 +1,52 @@
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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 4:49 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD")
@Api("MES_看板")
public class MesBoard extends BaseBean implements Serializable {
private static final long serialVersionUID = 3932883110518753734L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "BOARD_NAME")
@ApiParam("看板名称")
private String boardName;
@Column(name = "BOARD_TYPE")
@ApiParam("看板类型")
private String boardType;
@Column(name = "REFRESH_INTERVAL")
@ApiParam("刷新时间")
private Integer refreshInterval;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
}

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

@ -0,0 +1,50 @@
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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 5:07 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_EQU_DETAIL")
@Api("MES_看板设备明细")
public class MesBoardEquDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 2187463105092165451L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "EQU_CODE")
@ApiParam("设备代码")
private String equCode;
@Column(name = "EQU_NAME")
@ApiParam("设备名称")
private String equName;
@ApiParam(value = "横坐标")
private Float horizontalAxis = 0f;
@ApiParam(value = "纵坐标")
private Float verticalAxis = 0f;
}

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

@ -0,0 +1,52 @@
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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 5:01 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_EQU_STATUS")
@Api("MES_看板设备状态")
public class MesBoardEquStatus extends BaseBean implements Serializable {
private static final long serialVersionUID = -8426698586967483537L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "EQU_CODE")
@ApiParam("设备代码")
private String equCOde;
@Column(name = "EQU_STATUS_CODE")
@ApiParam("状态代码")
private Integer equStatusCode;
@Column(name = "EQU_STATUS_DESC")
@ApiParam("状态描述")
private String equStatusDesc;
@Column(name = "COLOR")
@ApiParam("颜色")
private String color;
}

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

@ -0,0 +1,48 @@
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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 5:19 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_MONITOR_OBJECT")
@Api("MES_看板监控对象")
public class MesBoardMonitorObject extends BaseBean implements Serializable {
private static final long serialVersionUID = 4136991652901768961L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "OBJECT_TYPE")
@ApiParam("对象类型")
private String objectType;
@Column(name = "OBJECT_VALUE")
@ApiParam("对象值")
private String objectValue;
@Column(name = "OBJECT_VALUE_DESC")
@ApiParam("对象值描述")
private String objectValueDesc;
}

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

@ -0,0 +1,40 @@
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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 4:53 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_PICTURE")
@Api("MES_看板图片")
public class MesBoardPicture extends BaseBean implements Serializable {
private static final long serialVersionUID = 5784111763887252647L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "PICTURE_URL")
@ApiParam("图片路径")
private String pictureUrl;
}

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

@ -0,0 +1,62 @@
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;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 6:49 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_PLAN_CAPACITY")
@Api("MES_看板计划产能")
public class MesBoardPlanCapacity extends BaseBean implements Serializable {
private static final long serialVersionUID = 7355311263972875850L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "PLAN_DATE")
@ApiParam("计划日期")
private String planDate;
@Column(name = "SHIFT_CODE")
@ApiParam("班次代码")
private String shiftCode;
@Column(name = "PLAN_PEOPLE_NUM")
@ApiParam("计划人数")
private Integer planPeopleNum;
@Column(name = "ACTUAL_PEOPLE_NUM")
@ApiParam("实际人数")
private Integer actualPeopleNum;
@Column(name = "PLAN_CAPACITY")
@ApiParam("计划产量")
private Integer planCapacity;
@Transient
@ApiParam("看板时段计划产量")
private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacities;
}

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

@ -0,0 +1,44 @@
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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 5:16 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_SHIFT")
@Api("MES_看板班次")
public class MesBoardShift extends BaseBean implements Serializable {
private static final long serialVersionUID = 3681747818263404086L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "SHIFT_CODE")
@ApiParam("班次代码")
private String shiftCode;
@Column(name = "SHIFT_NAME")
@ApiParam("班次名称")
private String shiftName;
}

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

@ -0,0 +1,52 @@
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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 5:13 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_SHIFT_SECTION")
@Api("MES_看板班次时段")
public class MesBoardShiftSection extends BaseBean implements Serializable {
private static final long serialVersionUID = -957301986885952078L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "SHIFT_CODE")
@ApiParam("班次代码")
private String shiftCode;
@Column(name = "START_TIME")
@ApiParam("开始时段")
private String startTime;
@Column(name = "END_TIME")
@ApiParam("结束时段")
private String endTime;
@Column(name = "IS_SPANDAY")
@ApiParam("是否跨天")
private Integer isSpanday;
}

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

@ -0,0 +1,56 @@
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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 5:24 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_SHIFT_SECTION_CAPACITY")
@Api("MES_看板时段计划产量")
public class MesBoardShiftSectionCapacity extends BaseBean implements Serializable {
private static final long serialVersionUID = -1184108324734484237L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "PLAN_DATE")
@ApiParam("计划日期")
private String planDate;
@Column(name = "SHIFT_CODE")
@ApiParam("班次代码")
private String shiftCode;
@Column(name = "START_TIME")
@ApiParam("开始时段")
private String startTime;
@Column(name = "END_TIME")
@ApiParam("结束时段")
private String endTime;
@Column(name = "PLAN_CAPACITY")
@ApiParam("计划产量")
private Integer planCapacity;
}

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

@ -0,0 +1,44 @@
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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 4:43 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_TYPE")
@Api("MES_看板类型")
public class MesBoardType extends BaseBean implements Serializable {
private static final long serialVersionUID = 3652595133806144706L;
@Column(name = "BOARD_TYPE")
@ApiParam("看板类型")
private String boardType;
@Column(name = "BOARD_TYPE_NAME")
@ApiParam("看板类型名称")
private String boardTypeName;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
}

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

@ -0,0 +1,44 @@
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;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 4:47 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOARD_TYPE_BASE_CFG")
@Api("MES_看板类型基础配置")
public class MesBoardTypeBaseCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 5405378688706555644L;
@Column(name = "BOARD_TYPE")
@ApiParam("看板类型")
private String boardType;
@Column(name = "WINDOW_NO")
@ApiParam("界面编号")
private String windowNo;
@Column(name = "SEQ")
@ApiParam("顺序")
private Integer seq;
}

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

@ -31,11 +31,11 @@ import java.io.Serializable;
})
@Api("工作单元组件参数配置")
public class MesWorkCellModuleParam extends BaseBean implements Serializable {
private static final long serialVersionUID = 4836155960343256982L;
private static final long serialVersionUID = 4836155960343256982L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")

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

@ -0,0 +1,37 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 6:55 下午
* @Modify:
*/
@Data
public class BoardModel {
@ApiParam("看板名称")
private String boardName;
@ApiParam("班别")
private String shiftName;
@ApiParam("对象值描述")
private String objectValueDesc;
@ApiParam("计划人数")
private Integer planPeopleNum;
@ApiParam("实际人数")
private Integer actualPeopleNum;
@ApiParam("目标达成数")
private Integer achievedPeopleNum;
@ApiParam("看板时段计划产量")
private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacityList;
}

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

@ -1,74 +0,0 @@
package cn.estsh.i3plus.pojo.mes.model;
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;
import java.io.Serializable;
/**
* @Description :MES_JIT发运队列
* @Reference :
* @Author : qianhausheng
* @CreateDate : 2020-03-06 10:16 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_SHIPPING")
@Api("MES_JIT发运队列")
public class MesQueueShipping extends BaseBean implements Serializable {
private static final long serialVersionUID = 655875369308414110L;
@Column(name = "JIT_NO")
@ApiParam("队列编号")
private String jitNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("配置代码")
private String prodCfgCode;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "CUST_FLAG_NO")
@ApiParam("客户标识号")
private String custFlagNo;
@Column(name = "SEQ")
@ApiParam("排序号")
private Double seq;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户产线代码")
private String custPlantCode;
@Column(name = "JIT_LOT_NO")
@ApiParam("JIT队列批次")
private String jitLotNo;
@Column(name = "JIT_ACTUAL_NO")
@ApiParam("客户JIT队列编号")
private String jitActualNo;
}

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

@ -1,73 +0,0 @@
package cn.estsh.i3plus.pojo.mes.model;
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;
import java.io.Serializable;
/**
* @Description :MES_JIT发运队列明细
* @Reference :
* @Author : qianhausheng
* @CreateDate : 2020-03-06 10:16 上午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_SHIPPING_DETAIL")
@Api("MES_JIT发运队列明细")
public class MesQueueShippingDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 1442091799346314190L;
@Column(name = "JIT_NO")
@ApiParam("队列编号")
private String jitNo;
@Column(name = "PROD_CFG_CODE")
@ApiParam("配置代码")
private String prodCfgCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "status")
@ApiParam("状态")
private Integer status;
@Column(name="SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "GROUP_NO")
@ApiParam("组内编号")
private Integer groupNo;
@Column(name = "GROUP_SEQ")
@ApiParam("分组序号")
private String groupSeq;
@Column(name = "qty")
@ApiParam("数量")
private Double qty;
}

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

@ -21,17 +21,20 @@ public class QueueJitActualModule {
private String queueGroupNo;
@ApiParam("组内编号")
private Integer groupNo;
@ApiParam("JIT排序号")
private String jitSeq;
public QueueJitActualModule() {
}
public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo) {
public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) {
this.id = id;
this.vinCode = vinCode;
this.seq = seq;
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
this.jitSeq = jitSeq;
}
}

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

@ -84,6 +84,9 @@ public class QueueOrderModel implements Serializable {
@ApiParam("vin")
private String vinCode;
@ApiParam("客户JIT队列编号")
private String jitActualNo;
public QueueOrderModel() {
}
@ -167,7 +170,7 @@ public class QueueOrderModel implements Serializable {
this.orderNo = orderNo;
}
public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) {
public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo) {
this.id = id;
this.queDetailSeq = queDetailSeq;
this.pgCode = pgCode;
@ -175,6 +178,7 @@ public class QueueOrderModel implements Serializable {
this.groupNo = groupNo;
this.prodCfgCode = prodCfgCode;
this.isGroupPrinted = isGroupPrinted;
this.jitActualNo = jitActualNo;
}
public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,

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

@ -16,27 +16,27 @@ import java.io.Serializable;
@Data
@Api("JIT发运队列列表Model")
public class QueueShippingModel implements Serializable {
private Long id;
private Long id;
@ApiParam("显示颜色")
private String color;
@ApiParam("显示颜色")
private String color;
@ApiParam("队列编号")
private String jisActualNo;
@ApiParam("队列编号")
private String jisActualNo;
@ApiParam("产品位置代码")
private String produceCtgyCode;
@ApiParam("产品位置代码")
private String produceCtgyCode;
@ApiParam("产品位置")
private String prodCfgName;
@ApiParam("产品位置")
private String prodCfgName;
@ApiParam("起始vin")
private String vin;
@ApiParam("起始vin")
private String vin;
@ApiParam("结束vin")
private String endVin;
@ApiParam("结束vin")
private String endVin;
@ApiParam("料架号")
private String queueGroupNo;
@ApiParam("料架号")
private String queueGroupNo;
}

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

@ -41,6 +41,8 @@ public class RequestModel {
private ActionRequestModel actionRequestBean;//工单状态
private String serialNumber;//过程条码
public RequestModel(List<MesQueueOrder> queueOrderList, Double currentSeq, Double nextSeq) {
this.queueOrderList = queueOrderList;
this.currentSeq = currentSeq;
@ -166,4 +168,8 @@ public class RequestModel {
public void setDestStatus(Integer destStatus) {
this.destStatus = destStatus;
}
public String getSerialNumber() { return serialNumber; }
public void setSerialNumber(String serialNumber) { this.serialNumber = serialNumber; }
}

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

@ -97,7 +97,7 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("车型代码")
private String carModuleCode;
@ApiParam("上一个序列号")
private Double lastQueDetailSeq;
private String lastQueDetailSeq;
@ApiParam("包装数量")
private Integer pgCodeNum;

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 10:49 上午
* @Modify:
*/
@Repository
public interface MesBoardEquDetailRepository extends BaseRepository<MesBoardEquDetail, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 10:50 上午
* @Modify:
*/
@Repository
public interface MesBoardEquStatusRepository extends BaseRepository<MesBoardEquStatus, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardMonitorObject;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 10:51 上午
* @Modify:
*/
@Repository
public interface MesBoardMonitorObjectRepository extends BaseRepository<MesBoardMonitorObject, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardPicture;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 10:52 上午
* @Modify:
*/
@Repository
public interface MesBoardPictureRepository extends BaseRepository<MesBoardPicture, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardPlanCapacity;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 10:53 上午
* @Modify:
*/
@Repository
public interface MesBoardPlanCapacityRepository extends BaseRepository<MesBoardPlanCapacity, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoard;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 8:53 下午
* @Modify:
*/
@Repository
public interface MesBoardRepository extends BaseRepository<MesBoard, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardShift;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 10:59 上午
* @Modify:
*/
@Repository
public interface MesBoardShiftRepository extends BaseRepository<MesBoardShift, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 11:07 上午
* @Modify:
*/
@Repository
public interface MesBoardShiftSectionCapacityRepository extends BaseRepository<MesBoardShiftSectionCapacity, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSection;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 11:00 上午
* @Modify:
*/
@Repository
public interface MesBoardShiftSectionRepository extends BaseRepository<MesBoardShiftSection, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardTypeBaseCfg;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 9:55 下午
* @Modify:
*/
@Repository
public interface MesBoardTypeBaseCfgRepository extends BaseRepository<MesBoardTypeBaseCfg, Long> {
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardType;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/21 11:11 上午
* @Modify:
*/
@Repository
public interface MesBoardTypeRepository extends BaseRepository<MesBoardType, Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesStepGroup;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesStepGroupRepository extends BaseRepository<MesStepGroup, Long> {
}

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

@ -2473,4 +2473,25 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(mesPartFormula.getIsValid(), "isValid", packBean);
return packBean;
}
/**
* 看板
*
* @param board
* @param organizeCode
* @return
*/
public static DdlPackBean getMesBoard(MesBoard board, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(board, organizeCode);
if (!StringUtils.isEmpty(board.getBoardCode())) {
DdlPreparedPack.getStringLikerPack(board.getBoardCode(), "boardCode", packBean);
}
if (!StringUtils.isEmpty(board.getBoardName())) {
DdlPreparedPack.getStringLikerPack(board.getBoardName(), "boardName", packBean);
}
if (!StringUtils.isEmpty(board.getBoardType())) {
DdlPreparedPack.getStringLikerPack(board.getBoardType(), "boardType", packBean);
}
return packBean;
}
}

1
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-model</artifactId>
<packaging>jar</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<dependencies>
<dependency>

1
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java
Unescape Escape View File

@ -18,6 +18,7 @@ import java.io.Serializable;
@Data
public class ClassFieldModel implements Serializable {
private static final long serialVersionUID = -8873901724079105728L;
@ApiParam(value ="包名")
private String packageName;

1
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java
Unescape Escape View File

@ -21,6 +21,7 @@ import java.util.List;
@Data
public class ClassModel implements Serializable {
private static final long serialVersionUID = -8024274383480419754L;
@ApiParam(value ="服务ID")
private int serverId;

120
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java
Unescape Escape View File

@ -0,0 +1,120 @@
package cn.estsh.i3plus.pojo.model.license;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import java.io.Serializable;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.Objects;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-2-10 下午5:10
* @Modify:
**/
@Data
public class ImppLicense implements Serializable {
private static final long serialVersionUID = 2365830603839063328L;
private static final String TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
/**
*
* 授权人名称
* 授权开始时间
* 授权结束时间
*
* 授权工厂
* 仓库
* 产线
* 用户
* 授权描述
* 同时最大在线数量
*
*/
/* 基础信息 */
@ApiParam(value ="授权ID")
private Long Id; // ID
@ApiParam(value ="授权应用ID")
private Long appId; // APP_ID
@ApiParam(value ="授权读取授权数据ID")
private Integer licenseSourceId; // 授权数据来源
public String getLicenseSourceTxt() {
return licenseSourceId == null ? null : CommonEnumUtil.LICENSE_SOURCE.valueOf(licenseSourceId);
}
/* 授权信息 */
@ApiParam(value ="授权开始时间")
private String licenseStartDateTime; // 授权开始时间
@ApiParam(value ="授权结束时间")
private String licenseEndDateTime; // 授权结束时间
@ApiParam(value ="授权组织数量")
private Integer licenseMaxOrganize; // 授权组织数量
@ApiParam(value ="授权仓库数量")
private Integer licenseMaxWarehouse; // 授权仓库数量
@ApiParam(value ="授权产线数量")
private Integer licenseMaxProductionLine; // 授权产线数量
@ApiParam(value ="授权用户数量")
private Integer licenseMaxUser; // 授权用户数量
@ApiParam(value ="授权同时在线数量")
private Integer licenseMaxUserSession; // 授权在线用户数量
@ApiParam(value ="授权描述信息")
private String licenseDescription; // 授权描述信息
@ApiParam(value ="深思授权信息")
private ImppLicenseSenseshield senseshield;
/* 业务人员信息 */
@ApiParam(value ="授权创建时间")
private Date licenseCreateDateTime; // 授权时间
@ApiParam(value ="授权创建人员ID")
private Long licenseCreateUserId; // 授权用户ID
@ApiParam(value ="授权创建人员名称")
private String licenseCreateUserName; // 授权人名称
@ApiParam(value ="授权更新人员ID")
private Long licenseUpdateUserId; // 授权更新人员ID
@ApiParam(value ="授权更新人员名称")
private String licenseUpdateUserName; // 授权人名称
@ApiParam(value ="授权更新人员时间")
private Date licenseUpdateDateTime; // 授权更新时间
/* 授权锁信息(软锁,usb锁) */
@ApiParam(value ="授权使用开始时间")
private String lockStartTime;
@ApiParam(value ="授权使用结束时间")
private String lockEndTime;
@ApiParam(value ="锁类型")
private String lockType;
/* 基础业务逻辑 */
@ApiParam(value ="到期时间")
private String maturityDateTime;
public String getMaturityDateTime() {
if(StringUtils.isBlank(maturityDateTime)){
return StringUtils.isNotBlank(lockEndTime) ? lockEndTime : licenseEndDateTime;
}
return maturityDateTime;
}
public void setSenseshield(ImppLicenseSenseshield senseshield) {
if(Objects.nonNull(senseshield)){
try {
Date lockEndTime = new Date((senseshield.getLast_update_timestamp() + senseshield.getSpan_time()) * 1000L);
Date licenseEndDateTime = new Date(this.licenseEndDateTime);
this.lockType = senseshield.getType();
this.maturityDateTime = DateFormatUtils.format(lockEndTime.getTime() > licenseEndDateTime.getTime() ? licenseEndDateTime: lockEndTime,TIME_FORMAT);
}catch (Exception e){
}
}
this.senseshield = senseshield;
}
}

55
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java
Unescape Escape View File

@ -0,0 +1,55 @@
package cn.estsh.i3plus.pojo.model.license;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-4-16 下午7:54
* @Modify:
**/
@Data
public class ImppLicenseSenseshield {
/**
* license_id : 170817
* enable : true
* guid : 6cece6946234ed4292617306ccd1191a
* first_use_time : 1587029768
* span_time : 315360000
* concurrent_type : win_user_session
* concurrent : 1000
* version : 0
* module : 0000000000000000
* last_update_timestamp : 1587029200
* last_update_timesn : 0
* rom_size : 1184
* raw_size : 1184
* pub_size : 0
* developer_id : 0800000000001005
* type : local
* sn : 9733c801000702075ed2000200270021
*/
private int license_id;
private boolean enable;
private String guid;
private int first_use_time;
private int span_time;
private String concurrent_type;
private int concurrent;
private int version;
private String module;
private int last_update_timestamp;
private int last_update_timesn;
private int rom_size;
private int raw_size;
private int pub_size;
private String developer_id;
private String type;
private String sn;
}

8
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
Unescape Escape View File

@ -1,12 +1,14 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.softswitch.bean.*;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.Objects;
/**
* @Description : 适配器model
@ -23,6 +25,9 @@ public class BsSuitCaseModel implements Serializable {
@ApiParam(value = "适配器")
private BsSuitCase bsSuitCase;
@ApiParam(value = "适配器同步处理Cloud微服务标识")
private Integer resultSoftType;
@ApiParam(value = "数据源适配套件")
private BsSuitCaseDataSource bsSuitCaseDataSource;
@ -49,5 +54,8 @@ public class BsSuitCaseModel implements Serializable {
public BsSuitCaseModel(BsSuitCase bsSuitCase) {
this.bsSuitCase = bsSuitCase;
if(Objects.nonNull(bsSuitCase.getResultSoftType())){
this.resultSoftType = bsSuitCase.getResultSoftType();
}
}
}

35
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java
Unescape Escape View File

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-4-18 上午10:26
* @Modify:
**/
@Data
public class SuitImppCloudModel {
@ApiParam(value = "适配器信息")
private BsSuitCaseModel model;
@ApiParam(value = "请求参数信息")
private Object param;
public SuitImppCloudModel() {
}
public SuitImppCloudModel(SuitServerModel serverModel) {
this.model = serverModel.getBsSuitCaseModel();
this.param = serverModel.getObj();
this.param = serverModel.getObj();
}
public SuitImppCloudModel(BsSuitCaseModel model, Object param) {
this.model = model;
this.param = param;
}
}

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

@ -0,0 +1,40 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.model.mes.ImportErrorModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
/**
* @Author: siliter.yuan
* @CreateDate: 2020/4/21 9:19 AM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("导入结果model")
public class ExcelImportModel implements Serializable {
@ApiParam("结果")
private boolean result;
@ApiParam("成功行数量")
private int successRowNum;
@ApiParam("工作薄名称")
private String sheetName;
@ApiParam("导入数据集合")
private List<ConcurrentHashMap<String, Object>> excelList;
@ApiParam("错误信息集合")
private List<ImportErrorModel> ImportErrorModels;
}

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -35,6 +36,14 @@ public class SysConfig extends BaseBean {
@ApiParam(value ="名称")
private String name;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="CONFIG_TYPE")
@ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1")
private Integer configType;

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

@ -0,0 +1,82 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-4-20 上午9:46
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_POJO_VERSION")
@Api(value="对象历史")
public class SysPojoVersion extends BaseBean {
private static final long serialVersionUID = -2456588444446248239L;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="REF_ID")
@ApiParam(value ="对象id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long refId;
@Column(name="REF_CLASS")
@ApiParam(value ="记录对象")
private String refClass;
@Column(name="VERSION_NO")
@ApiParam(value ="记录对象版本号")
private Integer versionNo = 0;
@Column(name="operateType")
@ApiParam(value ="操作类型")
private Integer operateType;
public String getOperateTypeTxt() {
return operateType == null ? null : CommonEnumUtil.DAO_OPERATE_TYPE.valueOf(operateType);
}
@Column(name="VERSION_METHOD_NAME")
@ApiParam(value ="操作方法名称")
private String versionMethodName;
@Column(name="POJO_DETAIL_ID")
@ApiParam(value ="对象明细id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long pojoDetailId;
@Lob
@Column(name="POJO_COMPARE")
@ApiParam(value ="记录对象对比差异")
private String pojoCompare;
@Transient
@ApiParam(value ="用户部门信息")
private SysPojoVersionDetail versionDetail;
}

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

@ -0,0 +1,56 @@
package cn.estsh.i3plus.pojo.platform.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;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-4-20 上午9:46
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_POJO_VERSION_DETAIL")
@Api(value="对象历史")
public class SysPojoVersionDetail extends BaseBean {
private static final long serialVersionUID = -2456588444446248239L;
@Column(name="POJO_VERSION_ID")
@ApiParam(value ="对象id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long pojoVersionId;
@Lob
@Column(name="POJO_BEFORE",length = 5000)
@ApiParam(value ="原始对象信息")
private String pojoBefore;
@Lob
@Column(name="POJO_AFTER",length = 5000)
@ApiParam(value ="修改之后对象信息")
private String pojoAfter;
@Lob
@Column(name="POJO_COMPARE",length = 5000)
@ApiParam(value ="记录对象对比差异")
private String pojoCompare;
}

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

@ -0,0 +1,56 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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 : wei.peng
* @CreateDate : 20-4-20 上午9:46
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_POJO_VERSION_PLAN")
@Api(value="对象历史")
public class SysPojoVersionPlan extends BaseBean {
private static final long serialVersionUID = -1120504360281638917L;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@Column(name="REF_CLASS")
@ApiParam(value ="记录对象")
private String refClass;
@Column(name="REF_CLASS_TITLE")
@ApiParam(value ="记录对象名称")
private String refClassTitle;
@Column(name="PLAN_STATUS")
@ApiParam(value ="记录对象状态")
private Integer planStatus;
@Column(name="PLAN_DESCRIPTION")
@ApiParam(value ="记录对象描述")
private String planDescription;
}

129
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
Unescape Escape View File

@ -0,0 +1,129 @@
package cn.estsh.i3plus.pojo.platform.platbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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;
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 : wei.peng
* @CreateDate : 20-4-9 下午8:41
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_CONSOLE")
@Api(value="系统异常表",description = "记录系统出现的异常")
public class SysLogConsole extends BaseBean {
/******** 服务器信息 ********/
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品名称")
private String softType;
@Column(name="LOG_HOST")
@ApiParam(value ="服务器IP")
private String logHost;
@Column(name="LOG_PID")
@ApiParam(value ="应用PID")
private Long logPid;
@Column(name="LOG_PORT")
@ApiParam(value ="应用端口")
private Integer logPort;
@Column(name="LOG_GORP")
@ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)")
private String logGorp;
@Column(name="LOG_LEVEL")
@ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)")
private String logLevel;
@Column(name="LOG_TYPE")
@ApiParam(value ="操作类型(post,put,get)")
private String logType;
/******** 用户信息 ********/
@Column(name="USER_HOST")
@ApiParam(value ="用户登录IP")
private String userHost;
@Column(name="USER_BROWSER")
@ApiParam(value ="用户登录浏览器")
private String userBrowser;
@Column(name="USER_OS")
@ApiParam(value ="用户登录操作系统")
private String userOs;
@Column(name="USER_ID")
@ApiParam(value ="账号ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="用户登录名称")
private String userLoginName;
/******** 日志信息 ********/
@Column(name="EXECUTE_THREAD_ID")
@ApiParam(value ="执行线程")
private String executeThreadId;
@Column(name="EXECUTE_CLASS_NAME")
@ApiParam(value ="执行Class")
private String executeClassName;
@Column(name="EXECUTE_METHOD")
@ApiParam(value ="执行方法")
private String executeMethod;
@Column(name="EXECUTE_LINE_NUMBER")
@ApiParam(value ="报错行数")
private Integer executeLineNumber;
@Column(name="EXECUTE_TITLE")
@ApiParam(value ="方法标题")
private String executeTitle;
@Column(name="EXECUTE_ARGS")
@ApiParam(value ="执行参数")
private String executeArgs;
@Column(name="EXECUTE_TIME")
@ApiParam(value ="执行耗时")
private Integer executeTime;
@Column(name="EXECUTE_STATUS")
@ApiParam(value ="执行状态")
private String executeStatus;
@Column(name="EXECUTE_MESSAGE")
@ApiParam(value ="执行日志信息")
private String executeMessage;
@Column(name="ERROR_STACK_TRACE",length = 5000)
@ApiParam(value ="执行异常堆栈信息")
private String errorStackTrace;
}

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

@ -43,7 +43,7 @@ public class SysLogTaskTime extends BaseBean {
@Column(name="SCHEDULER_SERVER_PORT")
@ApiParam(value ="调度服务器端口")
private String schedulerServerPort;
private Integer schedulerServerPort;
@Column(name="TASK_THREAD_ID")
@ApiParam(value ="任务线程id")

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionDetail;
/**
* @Description : 对象记录明细
* @Reference :
* @Author : wei.peng
* @Date : 2020-04-21 14:19:34
* @Modify :
**/
public interface SysPojoVersionDetailRepository extends BaseRepository<SysPojoVersionDetail, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan;
/**
* @Description : 对象记录拦截
* @Reference :
* @Author : wei.peng
* @Date : 2020-04-21 14:19:34
* @Modify :
**/
public interface SysPojoVersionPlanRepository extends BaseRepository<SysPojoVersionPlan, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion;
/**
* @Description : 对象记录
* @Reference :
* @Author : wei.peng
* @Date : 2020-04-21 14:19:34
* @Modify :
**/
public interface SysPojoVersionRepository extends BaseRepository<SysPojoVersion, Long> {
}

7
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java
Unescape Escape View File

@ -334,4 +334,11 @@ public class PtlHqlPack {
DdlPreparedPack.getNumEqualPack(areaRoute.getRouteType(), "routeType", packBean);
return packBean;
}
public static DdlPackBean getPtlArea(PtlArea area, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(area, organizeCode);
DdlPreparedPack.getStringLikerPack(area.getAreaNo(), "areaNo", packBean);
DdlPreparedPack.getStringLikerPack(area.getAreaName(), "areaName", packBean);
return packBean;
}
}

1
modules/i3plus-pojo-softswitch/pom.xml
Unescape Escape View File

@ -12,6 +12,7 @@
<artifactId>i3plus-pojo-softswitch</artifactId>
<packaging>jar</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<dependencies>

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

@ -108,6 +108,13 @@ public class BsSuitCase extends BaseBean {
@ApiParam(value = "是否推送MQ")
private Integer isPushMQ;
@Column(name = "RESULT_SOFT_TYPE")
@ApiParam(value = "同步调用微服务")
private Integer resultSoftType;
public String getResultSoftTypeTxt() {
return resultSoftType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(resultSoftType);
}
@Column(name = "SSL_KEY_ID")
@ApiParam(value = "证书id")
@JsonSerialize(using = ToStringSerializer.class)

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

@ -200,6 +200,54 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("是否寄售 1-是 2-否")
private Integer consignation;
@Transient
@ApiParam("收货物料编码")
public String rcPartNo;
@Transient
@ApiParam("发运物料编码")
public String outPartNo;
@Transient
@ApiParam("发运单据")
public String outRefSrc;
@Transient
@ApiParam("收货单据")
public String rcRefSrc;
@Transient
@ApiParam("发运条码")
public String outSn;
@Transient
@ApiParam("收货条码")
public String rcSn;
@Transient
@ApiParam("发运单位")
public String outUnit;
@Transient
@ApiParam("收货单位")
public String rcUnit;
@Transient
@ApiParam("发运数量")
public Double outQty;
@Transient
@ApiParam("收货数量")
public Double rcQty;
@Transient
@ApiParam("委外发运时间")
public String outDatetime;
@Transient
@ApiParam("委外收货时间")
public String rcDatetime;
public Integer getIsSnapshot() {
return isSnapshot == null ? 0 : isSnapshot.intValue();
}
@ -281,4 +329,35 @@ public class WmsMoveSn extends BaseBean {
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
public WmsMoveSn(Long id,String organizeCode,String vendorNo,String rcPartNo,String outPartNo, Double destQty) {
this.id = id;
this.organizeCode = organizeCode;
this.vendorNo = vendorNo;
this.rcPartNo = rcPartNo;
this.outPartNo = outPartNo;
this.destQty = destQty;
}
public WmsMoveSn(Long id,String organizeCode,String outRefSrc,String rcRefSrc,String outSn,String rcSn,
String rcPartNo,String outPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty,
String outDatetime,String rcDatetime ,String vendorNo, String modifyUser,String modifyDatetime) {
this.id = id;
this.organizeCode = organizeCode;
this.outRefSrc = outRefSrc;
this.rcRefSrc = rcRefSrc;
this.outSn = outSn;
this.rcSn = rcSn;
this.outPartNo = outPartNo;
this.rcPartNo = rcPartNo;
this.outUnit = outUnit;
this.rcUnit = rcUnit;
this.outQty = outQty;
this.rcQty = rcQty;
this.outDatetime = outDatetime;
this.rcDatetime = rcDatetime;
this.vendorNo = vendorNo;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
}

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

@ -163,6 +163,32 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("集装箱号")
private String containerNo;
@Transient
@ApiParam("采购订单状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description")
private Integer purchaseItemStatus;
@Transient
@ApiParam("供应商")
private String vendorNo;
@Transient
@ApiParam("供应商名称")
private String vendorName;
@Transient
@ApiParam("开始时间")
private String planStratDate;
@Transient
@ApiParam("结束时间")
private String planEndDate;
@Column(name = "REMARK")
@ApiParam("备注")
private String remark;
public Double getSnpVal() {
return snp;
}
@ -185,4 +211,38 @@ public class WmsPOMasterDetails extends BaseBean {
this.erpAreaNo = erpAreaNo;
this.organizeCode = organizeCode;
}
public WmsPOMasterDetails(
String organizeCode,
String orderNo,
Integer purchaseItemStatus,
String planDate,
String planTime,
String partNo,
String partNameRdd,
Double qty,
Double rcQty,
String vendorNo,
String createUser,
String createDatetime,
String modifyUser,
String modifyDatetime,
String remark
){
this.organizeCode = organizeCode;
this.orderNo = orderNo;
this.purchaseItemStatus = purchaseItemStatus;
this.planDate = planDate;
this.planTime = planTime;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
this.rcQty = rcQty;
this.vendorNo = vendorNo;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.remark = remark;
}
}

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

@ -0,0 +1,62 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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 : puxiao.liao
* @CreateDate : 2020-04-15 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_PURCHASE_PLAN_HISTORY")
@Api("采购计划历史")
public class WmsPurchasePlanHistory extends BaseBean {
private static final long serialVersionUID = -8147353212724381079L;
@Column(name = "ORDER_NO")
@ApiParam("单号")
private String orderNo;
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus;
@Column(name = "CAR_NO")
@ApiParam("车牌号")
private String carNo;
@Column(name = "CONTACT")
@ApiParam("联系人")
private String contact;
@Column(name = "CONTACT_TEL")
@ApiParam("联系电话")
private String contactTel;
@Column(name = "REMARK")
@ApiParam("备注")
private String remark;
}

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

@ -328,6 +328,18 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "是否需要报工")
private Integer isReportPartNo;
@Transient
@ApiParam(value = "库存地代码")
private String areaNo;
@Transient
@ApiParam(value = "物料规格")
private String partSpec;
@Transient
@ApiParam(value = "箱数")
private Long boxQtys;
public WmsStockSn() {
}
@ -421,4 +433,63 @@ public class WmsStockSn extends BaseBean {
this.createDatetime=createDatetime;
this.modifyDatetime = modifyDatetime;
}
public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
String areaNo,String partSpec,Integer qcStatus, Double qty, Long boxQtys,
String locateNo, String zoneNo, String whNo, String lotNo,String refSrc,
String dateCode, String packageNo, String createDatetime, String createUser,
String modifyDatetime, String modifyUser) {
this.id = id;
this.organizeCode = organizeCode;
this.sn = sn;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.snStatus = snStatus;
this.areaNo = areaNo;
this.partSpec = partSpec;
this.qcStatus = qcStatus;
this.qty = qty;
this.boxQtys = boxQtys;
this.locateNo = locateNo;
this.zoneNo = zoneNo;
this.whNo = whNo;
this.lotNo = lotNo;
this.refSrc = refSrc;
this.dateCode = dateCode;
this.packageNo = packageNo;
this.createDatetime = createDatetime;
this.createUser = createUser;
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
String areaNo,Integer qcStatus, Double qty,
String locateNo, String zoneNo, String whNo, String lotNo,String refSrc,
String dateCode, String packageNo, String createDatetime, String createUser,
String modifyDatetime, String modifyUser) {
this.id = id;
this.organizeCode = organizeCode;
this.sn = sn;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.snStatus = snStatus;
this.areaNo = areaNo;
this.qcStatus = qcStatus;
this.qty = qty;
this.locateNo = locateNo;
this.zoneNo = zoneNo;
this.whNo = whNo;
this.lotNo = lotNo;
this.refSrc = refSrc;
this.dateCode = dateCode;
this.packageNo = packageNo;
this.createDatetime = createDatetime;
this.createUser = createUser;
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
}

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java
Unescape Escape View File

@ -34,4 +34,7 @@ public class BasBeanFieldModel {
@ApiParam("实例字段名称")
public String propertyName;
@ApiParam("实例类全名")
public String entityClassName;
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.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.WmsPurchasePlanHistory;
import org.springframework.stereotype.Repository;
/**
* @Description : 采购计划历史dao层
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-04-15 10:30
* @Modify:
**/
@Repository
public interface WmsPurchasePlanHistoryRepository extends BaseRepository<WmsPurchasePlanHistory, Long> {
}

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

@ -3094,6 +3094,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result);
DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result);
DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result);
getStringBuilderPack(template, result);
return result;
}

Write Preview
Loading…
Cancel
Save