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 9475667e74 9361512fb8
commit 84698f3042
139 changed files with 4380 additions and 493 deletions
Show Stats Download Patch File Download Diff File

45
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java
Unescape Escape View File

@ -31,6 +31,27 @@ public class Pager {
@ApiParam("翻页操作")
private String pageMethod;
/* 默认最小数量分页 */
private static final Pager min;
/* 默认最大数量分页 */
private static final Pager max;
/* 默认数量分页 */
private static final Pager defaultPager;
static {
min = new Pager();
min.setCurrentPage(1);
min.setPageSize(10);
max = new Pager();
max.setCurrentPage(1);
max.setPageSize(65535);
defaultPager = new Pager();
defaultPager.setCurrentPage(1);
defaultPager.setPageSize(100);
}
public Pager() {
}
@ -231,6 +252,30 @@ public class Pager {
return currentPage > 1;
}
/**
* 获取默认最小分页数量
* @return
*/
public static Pager defaultMinPager(){
return min;
}
/**
* 默认最大分页数量
* @return
*/
public static Pager defaultMaxPager(){
return max;
}
/**
* 默认分页数量
* @return
*/
public static Pager defaultPager(){
return defaultPager;
}
@Override
public String toString() {
return "Pager{" +

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

@ -1069,6 +1069,88 @@ public class BlockFormEnumUtil {
/**
* 元素编辑信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_EDIT_STATUS {
ON(1, "ON", "开启"),
OFF(2, "OFF", "关闭"),
READONLY(3, "READONLY", "只读");
private int value;
private String code;
private String description;
private PROPERTY_EDIT_STATUS(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 valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
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 PROPERTY_EDIT_STATUS valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 属性字段排序规则
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@ -689,8 +689,9 @@ public class BlockSoftSwitchEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FTP_ENCODE {
CONN_SUCCESS(10, "UTF-8", "UTF-8"),
CONN_FAILURE(20, "GBK", "GBK");
UTF8(10, "UTF-8", "UTF-8"),
GBK(20, "GBK", "GBK"),
ISO88591(30, "ISO-8859-1", "ISO-8859-1");
private int value;
private String encode;

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

@ -1234,4 +1234,47 @@ public class ImppEnumUtil {
return null;
}
}
/**
* 密码策略
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CHECK_TEXT {
PASSWORD_VERIFY(1, "保存策略"),
PASSWORD_LOGIN(2, "登录策略");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private CHECK_TEXT(int value, String description) {
this.value = value;
this.description = 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 CHECK_TEXT valueOfEnum(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
}

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

@ -123,7 +123,7 @@ public class MdmEnumUtil {
public enum MDM_SYNC_TYPE{
INSERT(1, "新增"),
UPDATE(2, "修改"),
DELETE(2, "删除");
DELETE(3, "删除");
private int value;
private String description;

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

@ -70,8 +70,9 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TYPE {
MONITOR_MODULE(10, "监听组件"),
REVEAL_MODULE(10, "展示组件"),
BUTTON_MODULE(30, "按钮组件");
REVEAL_MODULE(20, "展示组件"),
BUTTON_MODULE(30, "按钮组件"),
TIMING_MODULE(40, "定时组件");
private int value;
private String description;
@ -706,7 +707,7 @@ public class MesEnumUtil {
EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
private String value;
private String description;
@ -1143,6 +1144,16 @@ public class MesEnumUtil {
return tmp;
}
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 Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
@ -1903,7 +1914,12 @@ public class MesEnumUtil {
MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"),
MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"),
MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"),
MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑");
MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"),
MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"),
NEW_SCATTER_BOM(460, "scatterBomCfgExcelService", "新散件BOM导入"),
ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"),
SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"),
MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑");
private int value;
private String service;
@ -3246,7 +3262,8 @@ public class MesEnumUtil {
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"),
REPAIR(70, "返修插单");
REPAIR(70, "返修插单"),
FICTIVE(80, "虚拟工单");
private int value;
private String description;
@ -3633,7 +3650,8 @@ public class MesEnumUtil {
QUALIFIED(10, "合格"),
DEFECTED(20, "不合格"),
SCRAPED(30, "报废"),
DISMANTLED(40, "已拆解");
DISMANTLED(40, "已拆解"),
PRE_CHECK(50, "待检测");
private int value;
private String description;
@ -3830,7 +3848,8 @@ public class MesEnumUtil {
QUALIFIED(10, "number", "数字"),
DEFECTED(20, "text", "字符串"),
SCRAPED(30, "select", "可选值"),
BUTTON(40, "button", "按钮");
BUTTON(40, "button", "按钮"),
WINDOW(50, "window", "开窗");
private int value;
private String code;
@ -4894,7 +4913,8 @@ public class MesEnumUtil {
public enum PART_TRAIT {
NORMAL(10, "正常件"),
FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"),
FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成");
FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"),
FICTIVE(40, "虚拟件");
private int value;
private String description;
@ -5083,6 +5103,16 @@ public class MesEnumUtil {
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -6278,4 +6308,124 @@ public class MesEnumUtil {
return tmp;
}
}
/**
* 停机类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOP_MACHINE_TYPE {
TIMER_TIME_OUT(10, "计时器超时停机"),
DELAY_HELP(20, "延时帮助停机"),
URGENT_STOP(30, "急停停机");
private int value;
private String description;
STOP_MACHINE_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 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 OPTION_CODE {
EXISTENCE("+", "存在"),
NON_EXISTENCE("-", "不存在"),
BRACKET_OPERATION("()", "括号运算"),
AND("&", " 与"),
OR("|", "或");
private String value;
private String description;
OPTION_CODE(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 value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 条码生成模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GENERATE_TYPE {
RELEASE_GENERATION(10, "下达生成"),
STATION_GENERATION(20, "工位生成");
private Integer value;
private String description;
GENERATE_TYPE(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -18,8 +18,9 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TYPE {
MONITOR_MODULE(10, "监听组件"),
REVEAL_MODULE(10, "展示组件"),
BUTTON_MODULE(30, "按钮组件");
REVEAL_MODULE(20, "展示组件"),
BUTTON_MODULE(30, "按钮组件"),
TIMING_MODULE(40, "定时组件");
private int value;
private String description;
@ -716,7 +717,8 @@ public class MesPcnEnumUtil {
QUALIFIED(10, "合格"),
DEFECTED(20, "不合格"),
SCRAPED(30, "报废"),
DISMANTLED(40, "已拆解");
DISMANTLED(40, "已拆解"),
PRE_CHECK(50, "待检测");
private int value;
private String description;
@ -2023,7 +2025,8 @@ public class MesPcnEnumUtil {
NORMAL(10, "正常"),
CLOSE(20, "关闭"),
FINISH(30, "完成");
FINISH(30, "完成"),
OFF_LINE_REWORK(40, "线下返修");
private int value;
private String description;
@ -2477,7 +2480,7 @@ public class MesPcnEnumUtil {
public enum PACKAGE_PRINT_STATUS {
UNPRINTED(10, "未打印"),
PRINTED(20, "打印");
PRINTED(20, "已打印");
private int value;
private String description;
@ -4163,4 +4166,153 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
* MES_生产队列散件清单 选配类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_OPTION_TYPE {
OPTION_PART(1, "选配件"),
BOM_DISASSEMBLY(2, "BOM拆解");
private int value;
private String description;
MES_OPTION_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;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 绑定模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum KEY_BIND_MODE {
PRODUCE_BOM_BIND(10, "产品BOM绑定"),
SCATTER_BOM_BIND(20, "散件BOM绑定");
private int value;
private String description;
KEY_BIND_MODE(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;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 不良品处理类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BAD_HANDLE_TYPE {
BACK_SPRAY(10, "BACK_SPRAY", "返喷"),
SCRAPPED(20, "SCRAPPED", "报废"),
POLISH(30, "POLISH", "抛光"),
DETERMINED(40, "DETERMINED", "待定");
private int value;
private String code;
private String description;
BAD_HANDLE_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);
}
}
}

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

@ -514,7 +514,8 @@ public class WmsEnumUtil {
NC_LOCATE(60, "N", "NC库"),
SPILLAGE_LOCATE(70, "Y", "溢料库"),
TRANSIT_LOCATE(80, "T", "在途库"),
UTENSIL_LOCATE(90, "U", "器具库");
UTENSIL_LOCATE(90, "U", "器具库"),
OPERATION_PALTFORM(100, "W", "工作台");
private int value;
private String code;
@ -726,7 +727,12 @@ public class WmsEnumUtil {
TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
LOADING_ORDER(530, "LOADING_ORDER", "装车单"),
SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途");
SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"),
FORK_INSTORE(550, "FORK_INSTORE", "叉车入库"),
CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "AGV料车出库"),
CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"),
AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"),
FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库");
private int value;
private String code;
private String description;
@ -769,6 +775,19 @@ public class WmsEnumUtil {
return tmp;
}
public static OUT_MOVEMENT_BUSI_TYPE codeOfs(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -921,7 +940,8 @@ public class WmsEnumUtil {
VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"),
TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料");
TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料"),
INTELLIGENT("INTELLIGENT", "智能化");
private String value;
private String description;
@ -3361,6 +3381,7 @@ public class WmsEnumUtil {
public enum SRC_STATUS {
ZMMES("ZMMES", "知明MES"),
TBMES("TBMES", "MES接口"),
TGMES("TGMES", "泰国MES"),
AMP("AMP", "AMP系统"),
DR("DR", "直送拉动");
@ -3379,6 +3400,16 @@ public class WmsEnumUtil {
public String getDescription() {
return description;
}
public static String descriptionOfValue(String value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
public static Map<String, Object> getEnumByName(String enumName) throws Exception {
@ -4133,7 +4164,8 @@ public class WmsEnumUtil {
MENU_OPT(30, "MENU_OPT", "手工操作"),
AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"),
CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"),
UPDATE_TASK(60, "UPDATE_TASK", "复用任务");
UPDATE_TASK(60, "UPDATE_TASK", "复用任务"),
AUTO_INSTORE_DOCMOVE(70, "AUTO_INSTORE", "自动入库移库单");
private int value;
private String code;
private String description;
@ -7550,16 +7582,16 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCAN_CATEGORY {
ASN(10, "wmsDoMovementMasterRepository", "ASN"),
PO(20, "wmsDoMovementMasterRepository", "PO"),
SO(30, "wmsDoMovementMasterRepository", "SO"),
MOVE(40, "wmsDoMovementMasterRepository", "移库单"),
IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"),
SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"),
QC(70, "wmsDoMovementMasterRepository", "质检单"),
ASN(10, "wmsDocMovementMasterRepository", "ASN"),
PO(20, "wmsDocMovementMasterRepository", "PO"),
SO(30, "wmsDocMovementMasterRepository", "SO"),
MOVE(40, "wmsDocMovementMasterRepository", "移库单"),
IN_STOCK(50, "wmsDocMovementMasterRepository", "入库单"),
SHIPPING(60, "wmsDocMovementMasterRepository", "发运单"),
QC(70, "wmsQCMasterRepository", "质检单"),
CS(80, "wmsCSOrderMasterRepository", "盘点单"),
SN(90, "wmsStockSnRepository", "条码"),
PO_SN(100, "wmsPoSnRepository", "收货条码");
PO_SN(100, "wmsPoSnRepository,wmsASNMasterDetailsRepository", "收货条码");
private int value;
private String code;
@ -7635,4 +7667,663 @@ public class WmsEnumUtil {
return null;
}
}
/**
* 策略等级
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRACTICS_GRADE {
ONE_TRACTICS_GRADE(10, "ONE_TRACTICS_GRADE", "1级策略"),
TWO_TRACTICS_GRADE(20, "TWO_TRACTICS_GRADE", "2级策略"),
THREE_TRACTICS_GRADE(30, "THREE_TRACTICS_GRADE", "3级策略");
private int value;
private String code;
private String description;
TRACTICS_GRADE(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);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 TRACTICS_GRADE codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* 策略组
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRACTICS_GROUP {
INSTOCK(10, "INSTOCK", "上架"),
PICKING(20, "PICKING", "拣货");
private int value;
private String code;
private String description;
TRACTICS_GROUP(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);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 TRACTICS_GROUP codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* 上架:策略项:1级策略
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INSTOCK_TRACTICS_ITEM_ONE {
COI_RECOMMEND(10, "COI_RECOMMEND", "COI推荐"),
ADJACENT_RECOMMEND(20, "ADJACENT_RECOMMEND", "高频推荐(相邻)"),
AREA_RECOMMEND(30, "AREA_RECOMMEND", "区域随机推荐"),
INERTIA_RECOMMEND(40, "INERTIA_RECOMMEND", "惯性推荐"),
ARTIFICIAL_RECOMMEND(50, "ARTIFICIAL_RECOMMEND", "人工指定");
private int value;
private String code;
private String description;
INSTOCK_TRACTICS_ITEM_ONE(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);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 INSTOCK_TRACTICS_ITEM_ONE codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* 上架:策略项:2级策略
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INSTOCK_TRACTICS_ITEM_TWO {
FULL_RECOMMEND(10, "FULL_RECOMMEND", "放满推荐"),
EMPTY_RECOMMEND(20, "EMPTY_RECOMMEND", "空位推荐");
private int value;
private String code;
private String description;
INSTOCK_TRACTICS_ITEM_TWO(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);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 INSTOCK_TRACTICS_ITEM_TWO codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* 上架:策略项:3级策略
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INSTOCK_TRACTICS_ITEM_THREE {
FCL_RECOMMEND(10, "FCL_RECOMMEND", "整箱推荐"),
EMPTY_BOX_RECOMMEND(20, "EMPTY_BOX_RECOMMEND", "零箱推荐"),
WHOLE_BOX_RECOMMEND(30, "WHOLE_BOX_RECOMMEND", "整零箱推荐");
private int value;
private String code;
private String description;
INSTOCK_TRACTICS_ITEM_THREE(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);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 INSTOCK_TRACTICS_ITEM_THREE codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* 拣货:策略项:1级策略
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PICKING_TRACTICS_ITEM_ONE {
ABSOLUTE_PATH(10, "ABSOLUTE_PATH", "绝对路径"),
RELATIVE_PATH(20, "RELATIVE_PATH", "相对路径"),
LOCATE_ORDER_BY(30, "LOCATE_ORDER_BY", "库位编号排序");
private int value;
private String code;
private String description;
PICKING_TRACTICS_ITEM_ONE(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);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 PICKING_TRACTICS_ITEM_ONE codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* 库位坐标是否允许偏移
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DOWN_OR_UP {
IS_TRUE(10, "IS_TRUE", "允许"),
IS_FALSE(20, "IS_FALSE", "不允许");
private int value;
private String codeValue;
private String description;
DOWN_OR_UP(int value, String codeValue, String description) {
this.value = value;
this.codeValue = codeValue;
this.description = description;
}
public int getValue() {
return value;
}
public String getCodeValue() {
return codeValue;
}
public String getDescription() {
return description;
}
}
/**
* 动作类型
* 10-锁定库存，20-解锁库存、30-锁定库位、40-解锁库位、50-锁定料车、60-解锁料车、70-生成任务、
* 80-取消任务、90-递进交换
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STRATEGY_ACTION_TYPE {
LOCKING_IN_STOCK(10, "LOCKING_IN_STOCK", "锁定库存"),
UNLOCK_IN_STOCK(20, "UNLOCK_IN_STOCK", "解锁库存"),
LOCKING_LOCATE(30, "LOCKING_LOCATE", "锁定库位"),
UNLOCK_LOCATE(40, "UNLOCK_LOCATE", "解锁库位"),
LOCKING_FEED_CAR(50, "LOCKING_FEED_CAR", "锁定料车"),
UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"),
GENERATE_TASK(70, "GENERATE_TASK", "生成任务"),
CANCEL_TASK(80, "CANCEL_TASK", "取消任务"),
PROGRESSIVE_EXCHANGE(90, "PROGRESSIVE_EXCHANGE", "递进交换");
private int value;
private String code;
private String description;
STRATEGY_ACTION_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 String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 STRATEGY_ACTION_TYPE codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* 自动化策略 数量控制
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AUTO_STRATEGY_QTY_CONTROL {
LESS_SEND(10, "少发"),
MANY_SEND(20, "多发"),
CONSISTENT(30, "一致");
private int value;
private String description;
AUTO_STRATEGY_QTY_CONTROL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static AUTO_STRATEGY_QTY_CONTROL codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
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 AUTO_FORK_TASK_TYPE {
MOVE(10, "W05", "W05");
private int value;
private String code;
private String description;
AUTO_FORK_TASK_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);
}
}
}

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

@ -243,6 +243,9 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
T getByProperty(String[] propertyNames, Object[] values);
@Deprecated
T getByPropertyPager(String[] propertyNames, Object[] values,Pager pager);
int listCount();
int findByPropertyCount(String propertyName, Object value);

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

@ -46,6 +46,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
private Class<T> persistentClass;
private SnowflakeIdMaker snowflakeIdMaker;
/* 默认查询数据条数 */
private static final Pager DEFAULT_PAGER = new Pager(10,10);
public BaseRepositoryImpl(Class<T> clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) {
super(clz, em);
@ -390,7 +392,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> listPager(Pager pager) {
if (pager.getTotalRows() > 0) {
if (pager != null) {
return entityManager.createQuery("from " + persistentClass.getName())
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
@ -506,10 +508,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public T getByProperty(DdlPackBean packBean) {
try {
List<T> list = findByHqlWhere(packBean);
return list.size() != 0 ? list.get(0) : null;
List<T> list = findByHqlWherePage(packBean,DEFAULT_PAGER);
return list != null && list.size() != 0 ? list.get(0) : null;
}catch(NoResultException ne){
LOGGER.error("数据不存在，DdlPackBean：{}",packBean);
return null;
@ -521,21 +522,18 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public T getByProperty(String propertyName, Object value) {
String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName;
try {
List<T> list = entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList();
return list.size() != 0 ? list.get(0) : null;
}catch(NoResultException ne){
LOGGER.error("数据不存在，prop：{},value：{}",propertyName,value,ne);
return null;
}catch(NonUniqueResultException ex){
LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}",propertyName,value,ex);
throw new RuntimeException("存在多条记录：" + ex.getMessage());
}
return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER);
}
@Override
public T getByProperty(String[] propertyNames, Object[] values) {
return getByPropertyPager(propertyNames, values, DEFAULT_PAGER);
}
@Override
public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) {
pager = pager == null ? DEFAULT_PAGER: pager;
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
@ -561,7 +559,10 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
try{
List<T> list = queryObject.getResultList();
List<T> list = queryObject
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
return list.size() != 0 ? list.get(0) : null;
}catch(NoResultException ne){
LOGGER.error("数据不存在",ne);
@ -602,7 +603,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
try {
if(!StringUtil.isEmpty(vendorNoStr)){
String queryString = "from " + persistentClass.getSimpleName() + " as model where model.vendorNo= :vendorNo";
list=entityManager.createQuery(queryString)
list=entityManager.createQuery(queryString)
.setParameter("vendorNo", vendorNoStr)
.getResultList();
}
@ -648,7 +649,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff;
return entityManager.createQuery(queryString)
.setParameter(propertyName, value)
@ -660,7 +661,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
@ -791,7 +792,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) {
if(pager.getTotalRows() > 0){
if(pager != null){
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
@ -826,7 +827,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Deprecated
@Override
public List<T> findByHqlWherePage(String hqlWhere, Pager pager) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
@ -845,7 +846,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlWherePage(DdlPackBean packBean, Pager pager) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
+ " as model where 1=1 " + packBean.getPackedHql());
@ -923,7 +924,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlPage(String hqlWhere, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
@ -942,7 +943,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlPage(DdlPackBean packBean, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
+ " as model where 1=1 " + packBean.getPackedHql());
@ -960,7 +961,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
@ -988,7 +989,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List findBySqlPage(String sql, Pager pager) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
return entityManager.createNativeQuery(sql)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
@ -1000,7 +1001,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<?> findBySqlPage(String sql, Class entity, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
return entityManager.createNativeQuery(sql,entity)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
@ -1113,7 +1114,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
StringBuffer queryString = new StringBuffer();
queryString.append(hql + " as model where 1=1 ");
@ -1152,7 +1153,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<Object[]> findByHqlPageObjects(String hql, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
}else{
return new ArrayList<Object[]>();
@ -1161,7 +1162,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<Object[]> findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
@ -1182,7 +1183,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<Object[]> findBySqlObjListByPager(String sql, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
return entityManager.createNativeQuery(sql)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())

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

@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
@ -108,4 +110,8 @@ public class BfMethodDetailProperty extends BaseBean {
@Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD")
@ApiParam(value ="关联对象元素属性Code")
private String secElementPropertyCodeRdd;
@Transient
@ApiParam(value ="表单功能明细关联属性")
private List<BfMethodDetailPropertyRef> refList;
}

64
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java
Unescape Escape View File

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.form.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.Table;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-03-21 21:03
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_METHOD_DETAIL_PROPERTY")
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
public class BfMethodDetailPropertyRef extends BaseBean {
private static final long serialVersionUID = -7541677357317732343L;
@Column(name="DETAIL_PROPERTY_ID")
@ApiParam(value ="功能明细关联属性id")
@JsonSerialize(using = ToStringSerializer.class)
private Long detailPropertyId;
@Column(name="PRI_ELEMENT_PROPERTY_ID")
@ApiParam(value ="主对象元素属性id")
@JsonSerialize(using = ToStringSerializer.class)
private Long priElementPropertyId;
@Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD")
@ApiParam(value ="主对象元素属性名称")
private String priElementPropertyNameRdd;
@Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD")
@ApiParam(value ="主对象元素属性code")
private String priElementPropertyCodeRdd;
@Column(name="SEC_ELEMENT_PROPERTY_ID")
@ApiParam(value ="关联对象元素属性id")
@JsonSerialize(using = ToStringSerializer.class)
private Long secElementPropertyId;
@Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD")
@ApiParam(value ="关联对象元素属性名称")
private String secElementPropertyNameRdd;
@Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD")
@ApiParam(value ="关联对象元素属性Code")
private String secElementPropertyCodeRdd;
}

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

@ -1,14 +0,0 @@
//package cn.estsh.i3plus.pojo.form.repository;
//
//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
//import cn.estsh.i3plus.pojo.form.bean.BfElementConstraintProperty;
//
///**
// * @Description : 元素约束属性
// * @Reference :
// * @Author : yunhao
// * @CreateDate : 2019-03-21 20:27
// * @Modify:
// **/
//public interface BfElementConstraintPropertyRepository extends BaseRepository<BfElementConstraintProperty, Long> {
//}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfMethodDetailPropertyRef;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-06-16 16:56
* @Modify:
**/
public interface BfMethodDetailPropertyRefRepository extends BaseRepository<BfMethodDetailPropertyRef, Long> {
}

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

@ -394,7 +394,6 @@ public final class FormHqlPack {
return ddlPackBean;
}
/**
* 数据对象查询条件拼接
* @param bfCascade
@ -409,4 +408,17 @@ public final class FormHqlPack {
return ddlPackBean;
}
/**
* 数据对象查询条件拼接
* @param bfMethodDetailPropertyRef
* @return
*/
public static DdlPackBean packHqlBfMethodDetailPropertyRef(BfMethodDetailPropertyRef bfMethodDetailPropertyRef){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetailPropertyRef);
DdlPreparedPack.getNumEqualPack(bfMethodDetailPropertyRef.getDetailPropertyId(), "detailPropertyId", ddlPackBean);
return ddlPackBean;
}
}

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

@ -30,12 +30,13 @@ public abstract class BaseMdmBean extends BaseBean {
@Transient
@ApiModelProperty("是否主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
@Column(name = "MDM_VERSION")
@ApiModelProperty("mdm数据版本")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
private Long mdmVersion;
public long getMdmVersionVal() {
@ -50,21 +51,26 @@ public abstract class BaseMdmBean extends BaseBean {
@Column(name = "IS_MDM_PUBLISHED")
@ApiModelProperty("是否发布")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
private Integer isMdmPublished;
@Column(name = "MDM_OPERATE_TYPE")
@ApiModelProperty("操作类型")
@AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class)
@AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true)
private Integer mdmOperateType;
public Integer getMdmOperateTypeVal() {
return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType;
}
public String getMdmOperateTypeTxt(){
return MdmEnumUtil.MDM_OPERATE_TYPE.valueOfDescription(getMdmOperateTypeVal());
}
@Column(name = "MDM_REF_ID")
@ApiModelProperty("关联id")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
private Long mdmRefId;
//排序方式

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

@ -28,22 +28,22 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean {
@Transient
@ApiModelProperty("是否主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Transient
@ApiModelProperty("主数据Class")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Class<BaseMdmBean> mdmMasterClass = BaseMdmBean.class;
@AnnoOutputColumn(hidden = true)
protected static Class<BaseMdmBean> mdmMasterClass = BaseMdmBean.class;
@Transient
@ApiModelProperty("软件模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Integer mdmSoftType;
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
protected static Integer mdmSoftType;
@Column(name = "MDM_MASTER_ID")
@ApiModelProperty("主数据id")
@JsonSerialize(using = ToStringSerializer.class)
private Long mdmMasterId;
public Long mdmMasterId;
}

10
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java
Unescape Escape View File

@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
**/
public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> {
public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
this.mdmMasterBean = mdmMasterBean;
this.mdmBusiBean = mdmBusiBean;
}
@ApiModelProperty("主数据")
private M mdmMasterBean;
@ -20,11 +25,6 @@ public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends Base
public BaseMdmBusiModelBean() {
}
public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
this.mdmMasterBean = mdmMasterBean;
this.mdmBusiBean = mdmBusiBean;
}
/**
* 获取主数据m
*

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

@ -31,10 +31,18 @@ public class MdmSyncData implements Serializable {
return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType;
}
public String getSyncTypeTxt(){
return syncType == null ? "无":MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType);
}
@ApiModelProperty("同步模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class)
private Integer syncSoftType;
public String getSyncSoftTypeTxt(){
return syncSoftType == null ? "无":CommonEnumUtil.SOFT_TYPE.valueOfDescription(syncSoftType);
}
@ApiModelProperty("是否是主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
private Integer isMasterData;
@ -43,6 +51,10 @@ public class MdmSyncData implements Serializable {
return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData;
}
public String getIsMasterDataTxt(){
return isMasterData == null ? "无":CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData);
}
@ApiModelProperty("同步数据class")
private String syncDataClass;

4
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java
Unescape Escape View File

@ -36,12 +36,12 @@ public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean {
@Transient
@ApiModelProperty("主数据Class")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(hidden = true)
public static Class mdmMasterClass = MdmGear.class;
@Transient
@ApiModelProperty("软件模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
@Column(name = "CORE_NUM")

13
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
import java.util.List;
@ -43,7 +44,17 @@ public class MdmHqlPack {
DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean);
DdlPreparedPack.timeBuilder(mdmGear.getCreateDatetime(),"createDatetime",ddlPackBean,false,true);
DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
return ddlPackBean;
}
public static DdlPackBean packHqlMdmGearCoreExtd(MdmGearCoreBusiExtd mdmGear) {
DdlPackBean ddlPackBean = getMdmPackBean(mdmGear);
DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
DdlPreparedPack.getNumEqualPack(mdmGear.getMdmMasterId(),"mdmMasterId",ddlPackBean);
DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
return ddlPackBean;
}

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

@ -527,7 +527,7 @@ public class DdlMdmModelPreparedPack {
public static void getInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) {
if (data != null) {
packBean.addColumnQuery(entityType, "in_"+columnName,
" and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data);
" and " + entityType.getAlias() + "." + columnName + " in ( :" + entityType.getAlias() + "_in_" + columnName + " ) ", data);
}
}

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

@ -0,0 +1,74 @@
package cn.estsh.i3plus.pojo.mes.pcn.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 :工位投料履历信息
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED_RECORD")
@Api("工位投料履历信息")
public class MesCellFeedRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971379489107783L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "RAW_TYPE")
@ApiParam("原料类型")
private String rawType;
@Column(name = "RAW_SN")
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@ApiParam("原材料数量")
private Double rawQty;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeedRecord;
/**
* @Description : 工位投料履历持久化类
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-17 09:53
* @Modify:
**/
public interface MesCellFeedRecordRepository extends BaseRepository<MesCellFeedRecord, Long> {
}

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

@ -0,0 +1,90 @@
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.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :不良信息接口表
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-28
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_DEFECT_DATA")
@Api("不良信息接口数据")
public class IfDefectData extends BaseBean implements Serializable {
private static final long serialVersionUID = 4320604250440221049L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serailNumber;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private Integer defectActionType;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Lob
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_TYPE")
@ApiParam("动作代码")
private String actionType;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

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

@ -40,9 +40,13 @@ public class IfPackageDetail extends BaseBean implements Serializable {
private String partName;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "PACKAGE_NO")
@ApiParam("包装条码")
private String packageNo;
@ -100,11 +104,11 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@ApiParam("容器编号")
private String ctNo;
@Column(name = "SN_TYPE")
@Column(name = "SAMPLE_TYPE")
@ApiParam("条码类型")
private String snType;
private String sampleType;
@Column(name = "SHIPPING_FLAG")
@Column(name = "CUST_DELIVERY_LOCATION")
@ApiParam("客户发往地")
private String shippingFlag;
private String custDeliveryLocation;
}

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

@ -123,4 +123,8 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
}

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -30,6 +31,7 @@ import java.io.Serializable;
@Api("工位投料信息")
public class MesCellFeed extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971369479107782L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@ -66,6 +68,13 @@ public class MesCellFeed extends BaseBean implements Serializable {
@ApiParam("供应商代码")
private String supplierCode;
@Transient
@ApiParam("工单号")
private String orderNo;
@Transient
@ApiParam(value = "原料类型名称")
private String rawTypeName;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;

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

@ -0,0 +1,78 @@
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 :工位投料履历信息
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED_RECORD")
@Api("工位投料履历信息")
public class MesCellFeedRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971369489107783L;
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "RAW_TYPE")
@ApiParam("原料类型")
private String rawType;
@Column(name = "RAW_SN")
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@ApiParam("原材料数量")
private Double rawQty;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
}

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

@ -54,7 +54,7 @@ public class MesCustomer extends BaseBean implements Serializable {
@ApiParam("客户电话")
private String telephone;
@Column(name = "SHIPPING_FLAG")
@Column(name = "CUST_DELIVERY_LOCATION")
@ApiParam("客户发往地")
private String shippingFlag;
private String custDeliveryLocation;
}

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

@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable {
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "DEFECT_FLAG_VALUE")
@ApiParam("缺陷标识值")
private String defectFlagValue;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;

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

@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -81,14 +80,17 @@ public class MesDefectRecord extends BaseBean implements Serializable {
@ApiParam("备注")
private String memo;
// @Column(name = "WORK_ORDER_NO")
// @ApiParam("工单号")
// private String workOrderNo;
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private Integer defectActionType;
@Transient
private List<MesDefect> mesDefectList;
@Transient
@ApiParam("后移数量")
private Integer backwardNum;
public int getRepairStatusVal() {
return this.repairStatus == null ? 0 : this.repairStatus;
}

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

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
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:
* @Reference:
* @Author: wangjie
* @CreateDate: 2019\11\5 10:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EXTEND_OBJECT_CFG")
@Api("扩展对象结构")
public class MesExtendObjectCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -6773040095905972250L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name = "FIELD_CODE")
@ApiParam("扩展字段代码")
private String fieldCode;
@Column(name = "FIELD_NAME")
@ApiParam("扩展字段名称")
private String fieldName;
@Column(name = "FIELD_TYPE")
@ApiParam("扩展字段类型")
@AnnoOutputColumn(refClass = MesEnumUtil.DATA_FORMAT.class, refForeignKey = "value", value = "description")
private Integer fieldType;
@Column(name = "FIELD_LENGTH")
@ApiParam("扩展字段长度")
private String fieldLength;
@Column(name = "DEFAULT_VALUE")
@ApiParam("默认值")
private String defaultValue;
@Column(name = "FIELD_DESC")
@ApiParam("扩展字段描述")
private String fieldDesc;
}

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

@ -44,4 +44,8 @@ public class MesFiCfg extends BaseBean implements Serializable {
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private Double fiQty;
@Column(name = "CHECK_ITEM_TYPE")
@ApiParam("检测项类型")
private String checkItemType;
}

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

@ -0,0 +1,41 @@
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 :MES_模具_零件对照表
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_MOULD_PART")
@Api("MES_模具_零件对照表")
public class MesMouldPart extends BaseBean implements Serializable {
private static final long serialVersionUID = -773118210589936438L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "MOULD_CODE")
@ApiParam("模具代码")
private String mouldCode;
}

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

@ -43,7 +43,7 @@ public class MesPackSpec extends BaseBean implements Serializable {
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "包装数量", example = "0")
private Double qty;
private Double qty = 0d;
@Column(name = "QTY2")
@ColumnDefault("0")

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

@ -110,13 +110,18 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("容器编号")
private String ctNo;
@Column(name = "SN_TYPE")
@Column(name = "SAMPLE_TYPE")
@ApiParam("条码类型")
private String snType;
private String sampleType = "10";
@Transient
@ApiParam("客户发往地")
private String shippingFlag;
private String custDeliveryLocation;
// 赋值模板代码
@Column(name = "PACKAGE_LABEL_TEMPLATE")
@ApiParam("包装标签模板")
private String packageLabelTemplate;
public MesPackage() {
}

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

@ -48,6 +48,10 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("零件规格")
private String partSpec;
@Column(name = "PART_SPEC_QTY")
@ApiParam("标准包规数量")
private Double partSpecQty;
@Column(name = "CATEGORY_CODE1")
@ApiParam("分类1")
private String categoryCode1;
@ -96,6 +100,26 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("物料特性")
private Integer partTrait;
@Column(name = "COLOR_CODE")
@ApiParam("颜色代码")
private String colorCode;
@Column(name = "SHELVES_AMOUNT")
@ApiParam("挂架数")
private Integer shelvesAmount;
@Column(name = "QUANTITY_PER_RACK")
@ApiParam("挂架可放零件数")
private Integer quantityPerRack;
@Column(name = "PAINT_TANK_CODE")
@ApiParam("供漆罐代码")
private String paintTankCode;
@Column(name = "PRE_PART_NO")
@ApiParam("打磨件物料号")
private String prePartNo;
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -56,4 +57,15 @@ public class MesPartCheck extends BaseBean implements Serializable {
@ApiParam("校验表达式描述")
private String recordNumDesc;
@Transient
@ApiParam("复核结果")
private Integer reviewResult = 1;
@Transient
@ApiParam("对象名称")
private String objectCodeName;
@Transient
@ApiParam("产线")
private String workCenterCode;
}

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

@ -38,6 +38,14 @@ public class MesPartFormula extends BaseBean implements Serializable {
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "FORMULA_DESC")
@ApiParam("配方描述")
private String formulaDesc;
@Column(name = "QTY")
@ApiParam("配方零件总数")
private Integer qty;
@Column(name = "FORMULA_TYPE")
@ApiParam("配方类型")
private Integer formulaType;

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

@ -0,0 +1,37 @@
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;
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "MES_PART_PROD_CFG_TYPE")
@EqualsAndHashCode(callSuper = true)
@Api("MES_物料项目关系")
public class MesPartProdCfgType extends BaseBean implements Serializable {
private static final long serialVersionUID = -640972198237355570L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
}

44
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.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;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/7/30 9:30 AM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_SAMPLE")
@Api("产品样本配置")
public class MesPartSample extends BaseBean implements Serializable {
private static final long serialVersionUID = -9190123981329081945L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
}

50
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.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 javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :MES_生产节拍
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLAN_TAKT")
@Api("MES_生产节拍")
public class MesPartTakt extends BaseBean implements Serializable {
private static final long serialVersionUID = -7731182105899332278L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("零件名称")
private String partName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "PLAN_TAKT")
@ApiParam("节拍")
private Integer planTakt;
}

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

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;

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

@ -100,21 +100,30 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
@ApiParam(value = "动作类型")
private Integer actionType;
@Transient
@ApiParam(value = "是否绑定关键件名称")
private String isBindKeyName;
@Transient
@ApiParam(value = "动作类型名称")
private String actionTypeName;
@Transient
@ApiParam("产品条码零件名称")
private String partName;
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料零件名称")
private String itemPartName;
@Transient
@ApiParam("生产队列号")
private String orderNo;
@Transient
@ApiParam("产品条码")
private String productSn;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;

50
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.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 :产品工作中心配置
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_WORK_CENTER")
@Api("产品工作中心配置")
public class MesProdWorkCenter extends BaseBean implements Serializable {
private static final long serialVersionUID = 9215737252535074536L;
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "IS_DEFAULT")
@ApiParam("是否默认")
private Integer isDefault;
@Column(name = "PART_SN")
@ApiParam("料箱条码")
private String partSn;
}

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

@ -26,7 +26,7 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_CATEGORY")
@Api("系统业务动作")
@Api("MES_产品位置")
public class MesProduceCategory extends BaseBean implements Serializable {
private static final long serialVersionUID = -992595557921651448L;
@ -37,4 +37,8 @@ public class MesProduceCategory extends BaseBean implements Serializable {
@Column(name = "PRODUCE_CTGY_NAME")
@ApiParam("产品类型名称")
private String produceCategoryName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
}

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

@ -140,6 +140,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("产品标签模板")
private String prodLabelTemplate;
@Column(name = "CUST_LABEL_TEMPLATE")
@ApiParam("客户标签模板")
private String custLabelTemplate;
@Column(name = "LOT_NO")
@ApiParam("生产批次")
private String lotNo;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")
@ -173,7 +181,9 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("条码类型名称")
private String snTypeName;
@Transient
@ApiParam("条码打印状态名称")
private String printStatusName;
public MesProduceSn() {
}

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

@ -104,6 +104,10 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("客户发运地")
private String custDelieryLocation;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@ApiParam(value = "检测结果")
@Transient
private String reulstStatus;
@ -112,10 +116,6 @@ public class MesQcOrder extends BaseBean implements Serializable {
@Transient
private String serialNumber;
@ApiParam(value = "产线")
@Transient
private String workCenterCode;
@ApiParam(value = "工单号")
@Transient
private String mesWorkNo;

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

@ -65,11 +65,11 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
private String workType;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品类型代码")
@ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "PRODUCE_CATEGORY_NAME_RDD")
@ApiParam("产品类型名称")
@ApiParam("产品位置名称")
private String produceCategoryNameRdd;
@Column(name = "PPT_CODE")
@ -104,6 +104,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("组件编号")
private String assyNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Transient
@ApiParam("队列序号")
private Double queueSeq;

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

@ -0,0 +1,88 @@
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;
/**
* @author adair.song
* @date 2020/06/17 13:12
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "MES_SCATTER_BOM_CFG")
@EqualsAndHashCode(callSuper = true)
@Api("MES_散件BOM配置")
public class MesScatterBomCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 521506217898252289L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "CUSTOMER_PART_NO")
@ApiParam("客户零件号")
private String customerPartNo;
@Column(name = "PART_LOCATION1")
@ApiParam("产品位置1")
private String partLocation1;
@Column(name = "PART_LOCATION2")
@ApiParam("产品位置2")
private String partLocation2;
@Column(name = "PART_LOCATION3")
@ApiParam("产品位置3")
private String partLocation3;
@Column(name = "PART_LOCATION4")
@ApiParam("产品位置4")
private String partLocation4;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "CATEGORY_CODE2")
@ApiParam("类型2")
private String categoryCode2;
@Column(name = "CATEGORY_CODE3")
@ApiParam("类型3")
private String categoryCode3;
@Column(name = "IS_BIND_KEY")
@ApiParam("是否关键件")
private Integer isBindKey = 1;
@Column(name = "CHECK_GROUP")
@ApiParam("校验分组号")
private String checkGroup;
@Column(name = "OPTION_CODE")
@ApiParam("选项代码")
private String optionCode;
@Column(name = "RECIPE_ITEM")
@ApiParam("配方项")
private String recipeItem;
@Column(name = "RECIPE_SEQ")
@ApiParam("配方序号")
private String recipeSeq;
}

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

@ -130,6 +130,22 @@ public class MesStationBom extends BaseBean implements Serializable {
@ApiParam("主任务编号")
private String orderNo;
@Transient
@ApiParam("产品类型代码")
private String produceCategoryCode;
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;
@Transient
@ApiParam("字符长度")
private Integer length;
@Transient
@ApiParam("校验内容")
private String checkContent;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

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

@ -11,7 +11,10 @@ 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;
import java.util.Map;
/**
* @Description :工步参数
@ -49,4 +52,32 @@ public class MesStepParam extends BaseBean implements Serializable {
@Column(name = "PARAM_ATTRIBUTE")
@ApiParam("参数属性 text select")
private String paramAttribute;
@Column(name = "EXHIBITION_KEY")
@ApiParam("展示key")
private String exhibitionKey;
@Column(name = "EXHIBITION_VALUE")
@ApiParam("展示value")
private String exhibitionValue;
@Column(name = "OBJECT_CODE")
@ApiParam("参数对象")
private String objectCode;
@Column(name = "TYPE")
@ApiParam("type")
private Integer type = 0;
@Transient
@ApiParam("可选值的数据")
private List<Map<String, Object>> enumList;
@Transient
@ApiParam("key的值")
private Object geValue;
@Transient
@ApiParam("value的值")
private Object geDescription;
}

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

@ -24,7 +24,7 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SUB_PART")
@Api("数据同步死信")
@Api("替代料")
public class MesSubPart extends BaseBean implements Serializable {
private static final long serialVersionUID = 4636507477301700549L;

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

@ -79,6 +79,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable {
@ApiParam("显示颜色")
private String color;
@Column(name = "VIN_CODE")
@ApiParam("Vin")
private String vinCode;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品位置代码")
private String produceCategoryCode;
public double getQueueSeqVal() {
return this.queueSeq == null ? 0 : this.queueSeq;
}

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

@ -62,6 +62,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
@ApiParam("产能")
private Integer productionCapacity;
@Column(name = "GENERATE_TYPE")
@ApiParam("条码生成模式")
private Integer generateType;
@Transient
@ApiParam(value = "子集列表")
private List<MesWorkCell> childTreeList;

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

@ -2,16 +2,19 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
import com.alibaba.fastjson.JSONObject;
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 org.springframework.util.StringUtils;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description:
@ -153,6 +156,11 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("首检生成数量")
private Double fiGenerateQty;
@Lob
@Column(name = "EXTEND")
@ApiParam("扩展数据")
private String extend;
@Column(name = "RESERVED1")
@ApiParam("预留字段1")
private String reserved1;
@ -169,9 +177,9 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("预留字段4")
private String reserved4;
@Column(name = "RESERVED5")
@ApiParam("预留字段5")
private String reserved5;
@Column(name = "PARENT_PART_NO")
@ApiParam("父阶物料号")
private String parentPartNo;
@Version
@Column(name = "LOCK_VERSION")
@ -264,6 +272,22 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam(value = "完成按钮编号")
public String comButtonCode;
@Transient
@ApiParam(value = "扩展数据MAP")
public Map<String, Object> extendMap;
@Transient
@ApiParam("工单源序号")
private Double srcSeq;
@Transient
@ApiParam("零件号集合")
private String partNoList;
@Transient
@ApiParam("零件名称集合")
private String partNameList;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -295,4 +319,16 @@ public class MesWorkOrder extends BaseBean implements Serializable {
public int getApprovalStatusVal() {
return this.approvalStatus == null ? 0 : this.approvalStatus;
}
public Map<String, Object> getExtendMap() {
try {
if (!StringUtils.isEmpty(this.extend)) {
return JSONObject.parseObject(this.extend, Map.class);
} else {
return null;
}
} catch (Exception e) {
return null;
}
}
}

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

@ -151,6 +151,11 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
@ApiParam("首检生成数量")
private Double fiGenerateQty;
@Lob
@Column(name = "EXTEND")
@ApiParam("扩展数据")
private String extend;
@Column(name = "RESERVED1")
@ApiParam("预留字段1")
private String reserved1;
@ -167,10 +172,6 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
@ApiParam("预留字段4")
private String reserved4;
@Column(name = "RESERVED5")
@ApiParam("预留字段5")
private String reserved5;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value = "工作中心名称")

53
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java
Unescape Escape View File

@ -0,0 +1,53 @@
package cn.estsh.i3plus.pojo.mes.bean.template;
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;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/6/17 8:39 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_DEFECT")
@Api("MES_工位缺陷")
public class MesWorkCellDefect extends BaseBean implements Serializable {
private static final long serialVersionUID = -528051790747923632L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "PART_ASSEMBLE")
@ApiParam("物料集")
private String partAssemble;
@Transient
@ApiParam("缺陷名称")
private String defectCodeName;
}

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

@ -37,20 +37,27 @@ public class ButtonDynamicModel {
private String paramValue;
public ButtonDynamicModel(Long id, String buttonCode, String buttonName){
public ButtonDynamicModel(Long id, String buttonCode, String buttonName) {
this.id = id;
this.buttonCode = buttonCode;
this.buttonName = buttonName;
}
public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){
public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode) {
this.buttonCode = buttonCode;
this.buttonName = buttonName;
this.paramCode = paramCode;
}
public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){
public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode, String paramValue) {
this.buttonCode = buttonCode;
this.buttonName = buttonName;
this.paramCode = paramCode;
this.paramValue = paramValue;
}
public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue) {
this.id = id;
this.buttonCode = buttonCode;
this.windowNo = windowNo;

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

@ -30,4 +30,6 @@ public class CellFeedModel {
private String scanQty;
private String lineRemainQty;
}

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

@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@Api("数据复核model")
public class DataReviewStepModel {
public class DataReviewModel {
@ApiParam("关键件")
private String itemPartNo;
@ -25,5 +25,4 @@ public class DataReviewStepModel {
@ApiParam("对象代码")
private String objectCode;
}

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

@ -1,181 +0,0 @@
//package cn.estsh.i3plus.pojo.mes.model;
//
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiParam;
//import lombok.AllArgsConstructor;
//import lombok.Data;
//import lombok.NoArgsConstructor;
//import org.apache.poi.ss.usermodel.CellStyle;
//import org.springframework.util.StringUtils;
//
//import java.io.Serializable;
//import java.math.BigDecimal;
//
///**
// * @Author: wangjie
// * @CreateDate: 2019/8/21 9:19 AM
// * @Description:
// **/
//@Data
//@NoArgsConstructor
//@AllArgsConstructor
//@Api("EXCEL参数model")
//public class ExcelDataParamModel<T> implements Serializable {
//
// public ExcelDataParamModel(Class<T> clazz){
// this.clazz = clazz;
// }
//
// @ApiParam("获取相对应的类，用来映射数据,如果不设置此值，那么整个数据将会用String[]作为数据，不再通过映射拿取数据")
// private Class<T> clazz;
//
// @ApiParam("对应类的映射字段名，String类型")
// private String[] strField;
//
// @ApiParam("对应类的标题，需要一一对应")
// private String[] titleStr;
//
// @ApiParam("大标题")
// private String title;
//
// @ApiParam("文件名，如果传入的ExcelDataParamModel是一个List的时候，以sheetNo = 1为文件名，如果sheetNo为空，则默认随机")
// private String fileName;
//
// @ApiParam("后缀")
// private String sufix;
//
// @ApiParam("大标题样式")
// private CellStyle bigTitleCellStyle;
//
// @ApiParam("标题样式")
// private CellStyle titleCellStyle;
//
// @ApiParam("数据样式")
// private CellStyle cellStyle;
//
// @ApiParam("sheet名")
// private String sheetName;
//
// @ApiParam("每个格子的宽度")
// private BigDecimal[] cellWidth;
//
// @ApiParam("如果传入的ExcelDataParamModel是List的时候，默认以sheetNo排序")
// private Integer sheetNo;
//
// @ApiParam("导出数据转换器")
// private QueryDataInterface queryDataInterface;
//
// public Class<T> getClazz() {
// return clazz;
// }
//
// public String[] getStrField() {
// return strField;
// }
//
// public String[] getTitleStr() {
// return titleStr;
// }
//
// public String getTitle() {
// if(StringUtils.isEmpty(this.title)){
// return "无效的标题";
// }else{
// return title;
// }
// }
//
// public String getFileName() {
// if(StringUtils.isEmpty(this.fileName)){
// return "未命名";
// }else{
// return this.fileName;
// }
// }
//
// public CellStyle getBigTitleCellStyle() {
// return bigTitleCellStyle;
// }
//
// public CellStyle getTitleCellStyle() {
// return titleCellStyle;
// }
//
// public CellStyle getCellStyle() {
// return cellStyle;
// }
//
// public String getSheetName() {
// return sheetName;
// }
//
// public Integer getSheetNo() {
// return sheetNo;
// }
//
// public BigDecimal[] getCellWidth() {
// return cellWidth;
// }
//
// public String getSufix() {
// return sufix;
// }
//
// public QueryDataInterface getQueryDataInterface() {
// return queryDataInterface;
// }
//
// public void setClazz(Class<T> clazz) {
// this.clazz = clazz;
// }
//
// public void setStrField(String[] strField) {
// this.strField = strField;
// }
//
// public void setTitleStr(String[] titleStr) {
// this.titleStr = titleStr;
// }
//
// public void setTitle(String title) {
// this.title = title;
// }
//
// public void setFileName(String fileName) {
// this.fileName = fileName;
// }
//
// public void setSufix(String sufix) {
// this.sufix = sufix;
// }
//
// public void setBigTitleCellStyle(CellStyle bigTitleCellStyle) {
// this.bigTitleCellStyle = bigTitleCellStyle;
// }
//
// public void setTitleCellStyle(CellStyle titleCellStyle) {
// this.titleCellStyle = titleCellStyle;
// }
//
// public void setCellStyle(CellStyle cellStyle) {
// this.cellStyle = cellStyle;
// }
//
// public void setSheetName(String sheetName) {
// this.sheetName = sheetName;
// }
//
// public void setCellWidth(BigDecimal[] cellWidth) {
// this.cellWidth = cellWidth;
// }
//
//
// public void setSheetNo(Integer sheetNo) {
// this.sheetNo = sheetNo;
// }
//
// public void setQueryDataInterface(QueryDataInterface queryDataInterface) {
// this.queryDataInterface = queryDataInterface;
// }
//
//}

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

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: siliter.yuan
* @CreateDate: 2020\06\22 15:58
* @Modify:
**/
@Data
public class MesPaintSnPrintModel implements Serializable {
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("产品条码")
private String produceSn;
@ApiParam("包装编号")
private String packageNo;
@ApiParam("工单号")
private String workOrderNo;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("工厂代码")
private String organizeCode;
@ApiParam("打印模板")
private MesLabelTemplate labelTemplate;
}

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

@ -40,6 +40,9 @@ public class MesStationBomModel {
@ApiParam("报废数")
private Integer scrapQty;
@ApiParam(value = "是否可重复")
private Integer isRepeat;
public MesStationBomModel() {
}
@ -72,4 +75,19 @@ public class MesStationBomModel {
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
}
public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName, Integer isRepeat) {
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
this.qty = qty;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.organizeCode = organizeCode;
this.isFeed = isFeed;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
this.isRepeat = isRepeat;
}
}

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

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Map;
/**
* @author Wynne.Lu
* @date 2020/6/16 14:21
* @desc 打包样本
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("打包样本")
public class PackageSampleModel {
@ApiParam(name = "已打包数量")
private Double alreadyPackageCount;
@ApiParam(name = "标准打包数量")
private Double standardPackageCount;
@ApiParam(name = "样本类型")
private Map<String, String> sampleTypeMap;
@ApiParam(name = "样本类型代码")
private String lastSampleTypeCode;
@ApiParam(name = "选择的样本类型")
private String chooseSampleTypeCode;
@ApiParam(name = "强制执行工步")
private String forceStepCode;
@ApiParam(name = "强制打包密码")
private String password;
@ApiParam(name = "工厂")
private String organizeCode;
@ApiParam(name = "工单号")
private String workOrderNo;
}

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

@ -0,0 +1,30 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@Data
public class PackageSnLabelTemplateDataModel {
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partName;
// 工单表.包装规格描述
@ApiParam("包装规格")
private Double packSpecQty;
@ApiParam("生产日期")
private String prodDate;
@ApiParam("工单班次")
private String workOrderShift;
@ApiParam("操作人员名称")
private String operatorName;
@ApiParam("工厂名称")
private String organizeName;
}

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

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description: 条码解绑实体
* @Reference:
* @Author: siliter.yuan
* @CreateDate: 2020-06-28-11:44
* @Modify:
**/
@Data
public class PackageSnModel {
@ApiParam("包装条码")
private String packageNo;
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partName;
@ApiParam("批次")
private String lotNo;
@ApiParam("创建人")
private String createUser;
@ApiParam("创建时间")
private String createDateTime;
}

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

@ -0,0 +1,60 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import java.util.List;
/**
* @Author: siliter.yuan
* @CreateDate: 2020/6/28 8:06 PM
* @Description:
**/
@Data
@Api("涂装检测MODEL")
public class PaintCheckModel {
@ApiParam("工作中心")
private String workCenterCode;
@ApiParam("工作单元")
private String workCellCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("颜色")
private String color;
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("界面编号")
private String windowNo;
@ApiParam("缺陷类型")
private String defectType;
@ApiParam("缺陷描述")
private String defectDesc;
@ApiParam("缺陷标识值")
private String defectFlagValue;
@ApiParam("不良品处理类型")
private Integer defectActionType;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@ApiParam("界面组件参数数据")
List<MesWindowModuleParam> windowModuleParamList;
}

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

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Author: siliter.yuan
* @CreateDate: 2020/6/21 8:06 PM
* @Description:
**/
@Data
@Api("涂装上线MODEL")
public class PaintOnLineModel {
@ApiParam("工作中心")
private String workCenterCode;
@ApiParam("工作单元")
private String workCellCode;
@ApiParam("工单号")
private String workOrderNo;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("颜色")
private String color;
@ApiParam("工单数量")
private Double orderNum;
@ApiParam("包装数量")
private Double packageNum;
@ApiParam("项目名称")
private String productName;
@ApiParam("创建时间")
private String createDateTime;
@ApiParam("圈数")
private Integer rounds;
@ApiParam("过程条码")
private String serialNumber;
}

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

@ -0,0 +1,64 @@
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.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Description : 涂装工单条码-展示组件model
* @Reference :
* @Author : adair.song
* @CreateDate : 2020-06-21 11:02
* @Modify:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("涂装工单条码展示组件model")
public class PaintWorkOrderSnModel extends BaseBean {
@ApiParam("工单号")
private String orderNo;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("颜色代码")
private String colorCode;
@ApiParam("颜色名称")
private String colorName;
@ApiParam("工单数量")
private Double workOrderQty;
@ApiParam("包装数量")
private Double packageQty;
@ApiParam("项目名称")
private String prodCfgTypeName;
@ApiParam("圈数")
private Integer groupNum;
@ApiParam("工单状态")
private Integer workOrderStatus;
// 父阶物料号 -- 涂装客户标签打印
@ApiParam("父阶物料号")
private String parentPartNo;
// 父阶物料名称 -- 涂装二次条码打印
@ApiParam("父阶物料名称")
private String parentPartName;
private List<ProdPackModel> prodPackageList;
}

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

@ -0,0 +1,74 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : 涂装工单条码-展示组件(产品包装)model
* @Reference :
* @Author : adair.song
* @CreateDate : 2020-06-21 11:02
* @Modify:
**/
@Data
@Api("产品包装model")
public class ProdPackModel implements Serializable {
// 产品条码表--产品条码
@ApiParam("产品条码")
public String productSn;
// 包装主表--包装编号
@ApiParam("一检箱条码")
public String packageNo;
// 包装明细表--创建时间
@ApiParam("一检校验时间")
public String createDatetime;
// 包装主表--打印状态(10：未打印 20：已打印)
@ApiParam("箱条码状态")
public Integer printStatus;
// 涂装客户标签打印
@ApiParam("客户标签")
public String custSn;
// 涂装客户标签打印
@ApiParam("当前工序")
public String processCode;
// 涂装客户标签打印
@ApiParam("更新时间")
public String modifyDateTime;
@ApiParam("工单号")
public String workOrderNo;
@ApiParam("组织代码")
public String organizeCode;
@ApiParam("物料号")
public String parentPartNo;
public ProdPackModel() {
}
public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) {
this.productSn = productSn;
this.packageNo = packageNo;
this.createDatetime = createDatetime;
this.printStatus = printStatus;
}
public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) {
this.productSn = productSn;
this.packageNo = packageNo;
this.custSn = custSn;
this.processCode = processCode;
this.modifyDateTime = modifyDateTime;
}
}

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

@ -81,12 +81,16 @@ public class QueueOrderModel implements Serializable {
@ApiParam("JIT队列批次")
private String jitLotNo;
@ApiParam("vin")
private String vinCode;
@ApiParam("客户JIT队列编号")
private String jitActualNo;
@ApiParam("产品位置")
private String produceCategoryCode;
public QueueOrderModel() {
}
@ -231,9 +235,9 @@ public class QueueOrderModel implements Serializable {
this.serialNumber=serialNumber;
}
//料架分组队列展示组件
//料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo
public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) {
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
this.orderNo = orderNo;
@ -242,13 +246,16 @@ public class QueueOrderModel implements Serializable {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.organizeCode = organizeCode;
this.vinCode = vinCode;
this.produceCategoryCode = produceCategoryCode;
}
public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) {
public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) {
this.id = id;
this.queueGroupNo = queueGroupNo;
this.jitLotNo = jitLotNo;
this.vinCode = vinCode;
this.organizeCode = organizeCode;
this.produceCategoryCode = produceCategoryCode;
}
}

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

@ -138,9 +138,24 @@ public class StationRequestBean implements Serializable {
@ApiParam("工步弹框状态")
private Boolean stepDialogStatus = false;
@ApiParam("是否按时完成")
private Integer isOnTimeComplete = 1;
@ApiParam("工位剩余时间")
private Long remainWorkTime;
@ApiParam("是否操作超时")
private Integer isTimeOut = 2;
@ApiParam("特殊展示数据")
private Map<String, Object> specialDisplayMap = new HashMap<>();
@ApiParam("物料名称")
private String partName;
@ApiParam("状态机代码")
private String smCode;
@Override
public String toString() {
return "StationRequestBean{" +

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

@ -101,4 +101,11 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("包装数量")
private Integer pgCodeNum;
@ApiParam("批次")
private String lotNo;
@ApiParam("备注")
private String memo;
@ApiParam("产品配置名称")
private String prodCfgCodeName;
}

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

@ -0,0 +1,65 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 总装生产工单导入模板
* @Reference :
* @author: jessica.chen
* @date: 2020/6/12 17:10
* @Modify:
*/
@Data
@Api(value="总装生产工单导入模板",description = "总装生产工单导入模板")
public class ZzMesWorkOrderModel extends BaseBean {
private static final long serialVersionUID = 5790342327875846646L;
@ApiParam(value = "日期")
@AnnoOutputColumn
private String workDate;
@ApiParam(value = "班次")
@AnnoOutputColumn
private String shiftName;
@ApiParam(value = "项目名称")
@AnnoOutputColumn(required = false)
private String prodCfgTypeName;
@ApiParam(value = "SAP物料号")
@AnnoOutputColumn
private String partNo;
@ApiParam(value = "产品名称")
@AnnoOutputColumn(required = false)
private String partName;
@ApiParam(value = "产线代码")
private String workCenterCode;
@ApiParam(value = "计划数")
@AnnoOutputColumn
private String qty;
@ApiParam(value = "标包")
@AnnoOutputColumn(required = false)
private String snp;
@ApiParam(value = "包装规格")
@AnnoOutputColumn
private String packageSpec;
@ApiParam(value = "备注")
@AnnoOutputColumn(required = false)
private String memo;
@ApiParam(value = "行数")
@AnnoOutputColumn(required = false)
private Integer rows;
}

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.IfDefectData;
import org.springframework.stereotype.Repository;
/**
* @Description : if不良信息接口
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-28 16:49
* @Modify:
**/
@Repository
public interface IfDefectDataRepository extends BaseRepository<IfDefectData, Long> {
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.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.MesCellFeedRecord;
/**
* @Description : 工位投料履历持久化类
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-17 09:53
* @Modify:
**/
public interface MesCellFeedRecordRepository extends BaseRepository<MesCellFeedRecord, Long> {
}

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.IfDismantleRecord;
import cn.estsh.i3plus.pojo.mes.bean.MesContainer;
import org.springframework.stereotype.Repository;
/**
* @Description:
@ -11,5 +12,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesContainer;
* @CreateDate: 2019\11\18 10:33
* @Modify:
**/
@Repository
public interface MesContainerRepository extends BaseRepository<MesContainer, Long> {
}

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.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.MesContainerType;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/6/24 3:34 下午
* @Modify:
*/
@Repository
public interface MesContainerTypeRepository extends BaseRepository<MesContainerType, Long> {
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.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.MesExtendObjectCfg;
/**
* @Description:
* @Reference:
* @Author: wangjie
* @CreateDate: 2019\11\18 10:34
* @Modify:
**/
public interface MesExtendObjectCfgRepository extends BaseRepository<MesExtendObjectCfg, Long> {
}

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

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

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.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.MesPartProdCfgType;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : adair.song
* @CreateDate: 2020\06\17 14:01
*/
@Repository
public interface MesPartProdCfgTypeRepository extends BaseRepository<MesPartProdCfgType,Long> {
}

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

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

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

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

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.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.MesProdWorkCenter;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: wangjie
* @CreateDate:2019-04-24-17:13
* @Modify:
**/
@Repository
public interface MesProdWorkCenterRepository extends BaseRepository<MesProdWorkCenter, Long> {
}

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.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.MesScatterBomCfg;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : adair.song
* @CreateDate: 2020\06\17 14:01
*/
@Repository
public interface MesScatterBomCfgRepository extends BaseRepository<MesScatterBomCfg,Long> {
}

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.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.template.MesWorkCellDefect;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/6/17 8:46 下午
* @Modify:
*/
@Repository
public interface MesWorkCellDefectRepository extends BaseRepository<MesWorkCellDefect, Long> {
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.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.template.MesWorkCellDefect;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/6/17 8:46 下午
* @Modify:
*/
@Repository
public interface MesWorkCellDefectsRepository extends BaseRepository<MesWorkCellDefect, Long> {
}

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

@ -9,9 +9,12 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
import cn.estsh.i3plus.pojo.mes.bean.*;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.List;
/**
* @Description:
* @Reference: Mes 条件封装
@ -1512,7 +1515,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean);
}
if (mesQcCheckStandard.getCheckType() != null) {
DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
DdlPreparedPack.getNumEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
@ -1524,7 +1527,6 @@ public class MesHqlPack {
}
/**
* <<<<<<< Updated upstream
* MES 缺陷查询条件封装
*
* @param mesDefect
@ -2003,11 +2005,14 @@ public class MesHqlPack {
* @param organizeCode
* @return
*/
public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) {
public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode, List<String> serialNumbers) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode);
if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) {
DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean);
}
if (!CollectionUtils.isEmpty(serialNumbers)) {
DdlPreparedPack.getInPackList(serialNumbers, "serialNumber", packBean);
}
if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
}
@ -2982,4 +2987,147 @@ public class MesHqlPack {
}
return packBean;
}
/**
* MES AGV停机记录信息条件查询
* @param stopRecord
* @return
*/
public static DdlPackBean getMesAgvRecoredData(MesAgvStopRecord stopRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumEqualPack(stopRecord.getStopType(), "stopType", packBean);
DdlPreparedPack.getStringLikerPack(stopRecord.getProductSn(), "productSn", packBean);
DdlPreparedPack.getStringEqualPack(stopRecord.getPartNo(), "partNo", packBean);
if (!StringUtils.isEmpty(stopRecord.getStopStartTime()) || !StringUtils.isEmpty(stopRecord.getStopEndTime())) {
DdlPreparedPack.timeBuilder(stopRecord.getCreateDateTimeStart(), stopRecord.getCreateDateTimeEnd(),
"stopStartTime", packBean, true);
}
return packBean;
}
/**
* MES 工位缺陷查询条件封装
*
* @param workCellDefect
* @param organizeCode
* @return
*/
public static DdlPackBean getMesWorkCellDefect(MesWorkCellDefect workCellDefect, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(workCellDefect, organizeCode);
if (!StringUtils.isEmpty(workCellDefect.getDefectCode())) {
DdlPreparedPack.getStringLikerPack(workCellDefect.getDefectCode(), "defectCode", packBean);
}
if (!StringUtils.isEmpty(workCellDefect.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(workCellDefect.getWorkCellCode(), "workCellCode", packBean);
}
if (!StringUtils.isEmpty(workCellDefect.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(workCellDefect.getWorkCenterCode(), "workCenterCode", packBean);
}
return packBean;
}
/**
* 散件BOM
*
* @param scatterBomCfg
* @param organizeCode
* @return
*/
public static DdlPackBean getMesScatterBomCfg(MesScatterBomCfg scatterBomCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(scatterBomCfg, organizeCode);
if (!StringUtils.isEmpty(scatterBomCfg.getPartNo())) {
DdlPreparedPack.getStringLikerPack(scatterBomCfg.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(scatterBomCfg.getCustomerPartNo())) {
DdlPreparedPack.getStringLikerPack(scatterBomCfg.getCustomerPartNo(), "customerPartNo", packBean);
}
if (!StringUtils.isEmpty(scatterBomCfg.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(scatterBomCfg.getWorkCellCode(), "workCellCode", packBean);
}
return packBean;
}
/**
* 物料项目关系
*
* @param partProdCfgType
* @param organizeCode
* @return
*/
public static DdlPackBean getMesPartProdCfgType(MesPartProdCfgType partProdCfgType, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(partProdCfgType, organizeCode);
if (!StringUtils.isEmpty(partProdCfgType.getPartNo())) {
DdlPreparedPack.getStringLikerPack(partProdCfgType.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(partProdCfgType.getCustCode())) {
DdlPreparedPack.getStringLikerPack(partProdCfgType.getCustCode(), "custCode", packBean);
}
if (!StringUtils.isEmpty(partProdCfgType.getProdCfgTypeCode())) {
DdlPreparedPack.getStringLikerPack(partProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
}
return packBean;
}
/**
* 编码规则映射表
*
* @param encodeRuleMap
* @param organizeCode
* @return
*/
public static DdlPackBean getMesEncodeRuleMap(MesEncodeRuleMap encodeRuleMap, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(encodeRuleMap, organizeCode);
if (!StringUtils.isEmpty(encodeRuleMap.getTypeCode())) {
DdlPreparedPack.getStringLikerPack(encodeRuleMap.getTypeCode(), "typeCode", packBean);
}
if (!StringUtils.isEmpty(encodeRuleMap.getTypeName())) {
DdlPreparedPack.getStringLikerPack(encodeRuleMap.getTypeName(), "typeName", packBean);
}
if (!StringUtils.isEmpty(encodeRuleMap.getBusinessCode())) {
DdlPreparedPack.getStringLikerPack(encodeRuleMap.getBusinessCode(), "businessCode", packBean);
}
return packBean;
}
/**
* 扩展对象配置
* @param extendObjectCfg
* @param organizeCode
* @return
*/
public static DdlPackBean getMesExtendObjectCfg(MesExtendObjectCfg extendObjectCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(extendObjectCfg, organizeCode);
if (!StringUtils.isEmpty(extendObjectCfg.getObjectCode())) {
DdlPreparedPack.getStringLikerPack(extendObjectCfg.getObjectCode(), "objectCode", packBean);
}
if (!StringUtils.isEmpty(extendObjectCfg.getFieldCode())) {
DdlPreparedPack.getStringLikerPack(extendObjectCfg.getFieldCode(), "fieldCode", packBean);
}
if (!StringUtils.isEmpty(extendObjectCfg.getFieldName())) {
DdlPreparedPack.getStringLikerPack(extendObjectCfg.getFieldName(), "fieldName", packBean);
}
if (!StringUtils.isEmpty(extendObjectCfg.getFieldType())) {
DdlPreparedPack.getNumEqualPack(extendObjectCfg.getFieldType(), "fieldType", packBean);
}
return packBean;
}
/**
* 产品工作中心配置
* @param prodWorkCenter
* @param organizeCode
* @return
*/
public static DdlPackBean getMesProdWorkCenter(MesProdWorkCenter prodWorkCenter, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(prodWorkCenter, organizeCode);
if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
}
return packBean;
}
}

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

@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.*;
@ -111,12 +110,28 @@ public class MesPcnHqlPack {
return packBean;
}
/**
* 获取工作中心下所有的投料履历数据
*
* @param mesCellFeedRecord
* @param org
* @return
*/
public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
return packBean;
}
/**
* 获取原材料扫描信息的对应工序BOM
*
* @param stationBom
* @param rawPartSn
* @param rawPartNo
* @return
*/
public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) {
@ -341,6 +356,10 @@ public class MesPcnHqlPack {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) {
DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
}
// 时间段查询
if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
@ -600,4 +619,49 @@ public class MesPcnHqlPack {
return endIndex;
}
/**
* 涂装一次箱条码打印获取工单 查询条件封装
*
* @param mesWorkOrder
* @return
*/
public static DdlPackBean getWorkOrderList(MesWorkOrder mesWorkOrder, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkOrder, organizeCode);
if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
}
// 时间段查询
if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getStartTimeStart(),
mesWorkOrder.getStartTimeEnd(),
"startTime", packBean, true);
}
if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getEndTimeStart(),
mesWorkOrder.getEndTimeEnd(),
"endTime", packBean, true);
}
if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getCreateDateTimeStart(),
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
}

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

@ -102,6 +102,9 @@ public class PrintOrderDataModel implements Serializable {
@Transient
public String createDateTime;
@Transient
public String receiveDateTime;
public int getBusiDataType() {
if (busiDataType != null) {
return busiDataType.intValue();

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

@ -116,6 +116,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
@ApiParam(value = "分组KEY")
public String groupKey;
@ApiParam(value = "工厂代码")
private String organizeCode;
public WmsActionResponseBean(Boolean codeStatus, String message) {
this.codeStatus = codeStatus;
this.message = message;

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

@ -17,6 +17,7 @@ public class WmsJobParamModel implements Serializable {
private static final long serialVersionUID = 5784492509251527816L;
private String organizeCode;//工厂代码
private List<String> zonesNoList;//存储区编号
private String src;//单据来源枚举
private Integer snType;//条码类型（虚拟，实物）
private String devOpsEmail;//运维人员邮箱
private Integer minuteDiff;//处理周期(分钟)

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

@ -54,10 +54,16 @@ public class SysUser extends BaseBean {
@ApiParam(value ="工号")
private String userEmpNo;
@Deprecated // 废弃密码新 , 使用ID作为密码信息, 改密码作为数据传输使用
@Column(name="USER_LOGIN_PASSWORD")
@ApiParam(value ="登陆密码")
private String userLoginPassword;
@Column(name="USER_LOGIN_PASSWORD_ID")
@ApiParam(value ="密码ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userLoginPasswordId;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
private Integer userType;
@ -78,6 +84,7 @@ public class SysUser extends BaseBean {
@ApiParam(value ="登录次数",example = "0")
private Integer userLoginNum;
@Deprecated
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="账号最后登录时间")
private String userLoginLastDateTime;

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

@ -0,0 +1,54 @@
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.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-6-4 下午3:38
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_USER_PASSWORD")
@Api(value="账号密码")
public class SysUserPassword extends BaseBean {
private static final long serialVersionUID = 4536854582252378921L;
@Column(name="USER_ID")
@ApiParam(value ="人员ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name="USER_PASSWORD")
@ApiParam(value ="用户密码")
private String userPassword;
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="账号最后登录时间")
private String userLoginLastDateTime;
public SysUserPassword() {
}
public SysUserPassword(Long userId, String userPassword) {
this.userId = userId;
this.userPassword = userPassword;
}
}

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

@ -10,9 +10,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
@ -23,7 +23,7 @@ import javax.persistence.Table;
* @Modify:
**/
@Data
@Entity
@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

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

@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -23,7 +24,7 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
@Entity
@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

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

@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -26,7 +27,7 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
@Entity
@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

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

@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -26,7 +27,7 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
@Entity
@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save