From 355cd49649d7c179a3dc08d3e68446444e6b8943 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 24 Sep 2019 18:04:40 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E6=B3=A8=E9=87=8A=20WebService=20?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6=E5=AE=A2=E6=88=B7=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 15e76a4..b07316c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -113,7 +113,7 @@ public class BlockSoftSwitchEnumUtil { /* WebService */ SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"), SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"), - CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), +// CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"), /* 数据源 */ From a601d5ddf345ddb1f57ad33d6c3ad6d1ac18e745 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 27 Sep 2019 10:07:43 +0800 Subject: [PATCH 02/33] =?UTF-8?q?orderBy=E6=96=B9=E6=B3=95=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 716a027..457b27d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -134,7 +134,7 @@ public abstract class BaseBean implements Serializable { String result = ""; if (orderByParam!=null&&orderByParam.trim().length()>0) { result = " order by " + orderByParam; - if(ascOrDesc!= null && ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { result += " asc"; }else{ result += " desc"; From 804574090f75703357673244300c1f82c2be1e05 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 27 Sep 2019 10:52:30 +0800 Subject: [PATCH 03/33] =?UTF-8?q?pcn=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 478 ++++++++++++++++++++- .../i3plus/pojo/mes/pcn/bean/MesPartCategory.java | 42 ++ .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 4 + .../pcn/repository/MesPartCategoryRepository.java | 16 + .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 65 +++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 + 6 files changed, 602 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index f9dbb36..a93ebf4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -350,14 +350,16 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_CENTER_RUNNING_STATUS { - RUNNING(1, "开线"), - STOPPED(2, "停线"); + RUNNING(1, "start", "开线"), + STOPPED(2, "stop", "停线"); private int value; + private String code; private String description; - WORK_CENTER_RUNNING_STATUS(int value, String description) { + WORK_CENTER_RUNNING_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -365,6 +367,10 @@ public class MesPcnEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -378,6 +384,16 @@ public class MesPcnEnumUtil { } return tmp; } + + 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; + } } /** @@ -386,10 +402,10 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - PERSON(10, "person", "人"), - EQUIPMENT(20, "equipment", "机"), - MATERIAL(30, "material", "料"), - ROUTE(40, "route", "法"), + PERSON(10, "people", "人"), + EQUIPMENT(20, "equipments", "设备"), + MATERIAL(30, "materials", "物料"), + ROUTE(40, "routes", "工艺"), ONLINE_SIGNAL(50, "onlineSignal", "开线信号"); private int value; @@ -423,6 +439,16 @@ public class MesPcnEnumUtil { } return tmp; } + + 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; + } } /** @@ -498,4 +524,442 @@ public class MesPcnEnumUtil { } + /** + * 设备连接类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EQP_CONNECT_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"), + OTHER(30,"OTHER"); + + private int value; + private String description; + + EQP_CONNECT_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; + } + } + + /** + * MesPlanOrder实体对应的status值 计划状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLAN_ORDER_STATUS { + + CREATE(10, "CREATED", "创建"), + DE_COMPOSE_ING(20, "DE_COMPOSE_ING", "分解中"), + DE_COMPOSE_ED(30, "DE_COMPOSE_ED", "分解完成"), + CLOSE(40, "CLOSE", "关闭"); + + private int value; + private String code; + private String description; + + PLAN_ORDER_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 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; + } + } + + /** + * MesWorkOrder实体对应的workOrderStatus值 工单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_STATUS { + + CREATE(10, "创建"), + LANDED(20, "下达"), + OPEN(30, "启动"), + PAUSE(40, "暂停"), + CANCEL(50, "取消"), + CLOSE(60, "关闭"); + + private int value; + private String description; + + WORK_ORDER_STATUS(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; + } + } + + /** + * MesWorkOrder实体对应的workOrderType值 工单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_TYPE { + + STANDARD_ORDER(10, "标准工单"), + BTS_ORDER(20, "BTS工单"), + ATTEMPT_ORDER(30, "试制工单"); + + private int value; + private String description; + + WORK_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String 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; + } + } + + /** + * MesPlanOrder实体对应的planType值 计划类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLAN_ORDER_TYPE { + + STANDARD_ORDER(10, "标准"); + + private int value; + private String description; + + PLAN_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String 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; + } + } + + /** + * MesPlanOrder实体对应的source值 计划来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PALN_ORDER_SOURCE { + + MES("MES", "来源于MES"), + SAP("SAP", "来源于SAP"); + + private String value; + private String description; + + PALN_ORDER_SOURCE(String value, String description) { + this.value = value; + this.description = description; + } + + public String 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.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的source值 计划来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_SOURCE { + + MES("MES", "来源于MES"), + AMES("AMES", "来源于AMES"), + SAP("SAP", "来源于SAP"), + CREATE("CREATE", "手工新增"), + RESOLVE("RESOLVE", "计划分解"); + + private String value; + private String description; + + WORK_ORDER_SOURCE(String value, String description) { + this.value = value; + this.description = description; + } + + public String 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.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesQueueOrder实体对应的status值 队列主表状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_STATUS { + + NORMAL(10, "正常"), + ONLINE(20, "已上线"), + OFFLINE(30, "已下线"), + CLOSE(40, "已关闭"), + ; + + private int value; + private String description; + + QUEUE_ORDER_STATUS(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; + } + } + + /** + * MesQueueOrderDetail实体对应的status值 队列详情状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_DETAIL_STATUS { + + NORMAL(10, "正常"), + CLOSE(20, "关闭"); + + private int value; + private String description; + + QUEUE_ORDER_DETAIL_STATUS(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; + } + } + + /** + * MesPartCategory实体对应的categoryType值 条码表条码质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_CATEGORY_TYPE { + + CATEGORY_ONE("Category1", "类型1"), + CATEGORY_TWO("Category2", "类型2"), + CATEGORY_THREE("Category3", "类型3"); + + private String value; + private String description; + + PART_CATEGORY_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.equals(values()[i].value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的approvalStatus值 审批状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_APPROVAL_STATUS { + + WAIT_APPROVAL(10, "待审批"), + COMPLETE_APPROVAL(20, "已审批"), + REJECT_APPROVAL(30, "驳回"); + + private int value; + private String description; + + WORK_ORDER_APPROVAL_STATUS(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 String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } + + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java new file mode 100644 index 0000000..77e74cb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java @@ -0,0 +1,42 @@ +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; + +/** + * @Description :零件种类 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PART_CATEGORY") +@Api("零件种类") +public class MesPartCategory extends BaseBean { + @Column(name="CATEGORY_CODE") + @ApiParam("分类代码") + private String categoryCode; + + @Column(name="CATEGORY_NAME") + @ApiParam("分类名称") + private String categoryName; + + @Column(name="CATEGORY_TYPE") + @ApiParam("分类类型") + private String categoryType; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 9ff0258..ea9de66 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean { public String prodCfgName; @Transient + @ApiParam("区域代码名称") + private String areaCodeName; + + @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") public String startTimeStart; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java new file mode 100644 index 0000000..eb12a69 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPartCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 4e0281a..61e57f3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -33,6 +33,20 @@ public class MesHqlPack { } /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** * MES PCN系统配置信息条件查询 * * @param mesConfig @@ -153,4 +167,55 @@ public class MesHqlPack { return packBean; } + /** + * 物料信息查询条件封装 + * + * @param mesPart + * @return + */ + public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + + if (StringUtils.isNotEmpty(mesPart.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); + } + + DdlPreparedPack.getOrderDefault(mesPart); + DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean); + return packBean; + } + + /** + * MES 客户信息查询条件封装 + * + * @param customer + * @return + */ + public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); + if (StringUtils.isNotEmpty(customer.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); + } + if (StringUtils.isNotEmpty(customer.getCustomerName())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); + } + + return packBean; + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index b22729f..8c0735a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean { public String prodCfgName; @Transient + @ApiParam("区域代码名称") + private String areaCodeName; + + @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") public String startTimeStart; From f1f712c9978c9f3dab378c25d55a9a017c798b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 27 Sep 2019 12:36:23 +0800 Subject: [PATCH 04/33] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E6=B5=81=E7=A8=8B=E6=98=8E?= =?UTF-8?q?=E7=BB=86BUG=EF=BC=9A=E5=AF=BC=E8=87=B4=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=94=99=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index e8455c4..fc0f62b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -163,10 +163,12 @@ public class WmsActionGroupDetails extends BaseBean { public WmsActionGroupDetails() { } - public WmsActionGroupDetails(Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper, + public WmsActionGroupDetails(Long id, Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper, Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId, String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow, - Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, String groupKey) { + Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, + String groupKey, String organizeCode) { + this.id = id; this.agId = agId; this.seq = seq; this.okSeq = okSeq; @@ -188,5 +190,6 @@ public class WmsActionGroupDetails extends BaseBean { this.isAutoOpenWindow = isAutoOpenWindow; this.searchKey = searchKey; this.groupKey = groupKey; + this.organizeCode = organizeCode; } } From c2a75d96da1bbcbd63972ea1fa385b07b3abec7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 27 Sep 2019 13:23:18 +0800 Subject: [PATCH 05/33] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5get?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index c9fab25..d101b27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -133,7 +133,7 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description") public Integer differenceType; - public Integer getDifferenceType() { + public Integer getDifferenceTypeVal() { return this.differenceType == null ? -1: this.differenceType; } From c0fc2c36bf79d81e3e009b48deaa5b1ef20fbf2a Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 27 Sep 2019 13:50:53 +0800 Subject: [PATCH 06/33] =?UTF-8?q?Socket=20=E9=80=82=E9=85=8D=E5=99=A8?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20MQ=20=20=E9=80=82=E9=85=8D=E5=99=A8?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/common/XStreamFactory.java | 2 +- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 10 +++- .../pojo/model/softswitch/BsSuitCaseModel.java | 4 ++ .../pojo/model/softswitch/SoftswitchIocModel.java | 10 ++++ .../pojo/model/softswitch/SuitServerModel.java | 2 + .../i3plus/pojo/softswitch/bean/BsSuitCaseMq.java | 54 ++++++++++++++++++++++ .../pojo/softswitch/bean/BsSuitCaseParam.java | 2 + .../repository/BsSuitCaseMqRepository.java | 16 +++++++ 8 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseMqRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index c220e6c..6378c45 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -15,7 +15,7 @@ import java.lang.reflect.Field; /** * @Description : Xml 工厂 - * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm + * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm * @Reference : * @Author : wei.peng * @CreateDate : 19-7-23 下午5:58 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index b07316c..9d71ce7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -120,7 +120,15 @@ public class BlockSoftSwitchEnumUtil { CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"), /* Restful */ - CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"); + CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"), + + /* Socket */ + SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"), + CLIENT_SOCKET_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.SOCKET,110001,"Socket Client Hello测试服务"), + + /* MQ */ + SERVER_MQ_RABBIT_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.MQ,250001,"RabbitMQ Server Hello测试服务"), + CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 810ec8a..447c70a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.*; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.springframework.beans.factory.annotation.Autowired; import java.io.Serializable; @@ -32,6 +33,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "Web Service 适配套件") private BsSuitCaseWebService webService; + @ApiParam(value = " MQ 适配套件") + private BsSuitCaseMq mq; + @ApiParam(value = "REST 适配套件") private BsSuitCaseREST bsSuitCaseREST; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java index 596233a..b5c8c0a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java @@ -11,6 +11,16 @@ import lombok.Data; **/ @Data public class SoftswitchIocModel { + /* Spring Ioc Bean 名称 */ private String beanName; + /* Spring Ioc 需要管理的Bean */ private Object obj; + /* 需要 管理 Bean 类型 */ + private Integer objType; + /* 需要 管理 Bean 状态 */ + private Integer objStatus; + /* 需要 管理 Bean 唯一 */ + private String objKey; + /* Bean 的描述信息 */ + private String objDescription; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index a285dad..2654ae6 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -27,6 +27,8 @@ public class SuitServerModel { /* 认证使用 以后使用 */ private String token; + // 请求ID + private String requestId; // 传输单对象 private Object obj; // 传输集合 diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java new file mode 100644 index 0000000..3d3452b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.softswitch.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 : MQ 适配套件 + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/9/9 上午11:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_MQ") +@Api(value = "MQ", description = "MQ 适配套件") +public class BsSuitCaseMq extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "USER_LOGIN_NAME") + @ApiParam(value = "登录名称") + private String userLoginName; + + @Column(name = "USER_LOGIN_PWD") + @ApiParam(value = "登录密码") + private String userLoginPwd; + + @Column(name = "VIRTUAL_HOST") + @ApiParam(value = "虚拟 Host") + private String virtualHost; + + @Column(name = "QUEUE_NAME") + @ApiParam(value = "队列名称") + private String queueName; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 2d598e5..772bee5 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.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 com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -26,6 +27,7 @@ import java.util.List; @Entity @DynamicInsert @DynamicUpdate +@XStreamAlias("param") @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SUIT_CASE_PARAM") @Api(value = "适配器出入参", description = "适配器出入参") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseMqRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseMqRepository.java new file mode 100644 index 0000000..b6e8864 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseMqRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseMq; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/9/26 下午3:25 + * @Modify: + **/ +@Repository +public interface BsSuitCaseMqRepository extends BaseRepository { +} From d830c78d038e29404aa317d570eb4216c1131b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 27 Sep 2019 14:08:07 +0800 Subject: [PATCH 07/33] =?UTF-8?q?FTP=E9=80=82=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 101 ++++++++++++++++++++- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- .../pojo/model/softswitch/BsSuitCaseModel.java | 3 + .../i3plus/pojo/softswitch/bean/BsSslKey.java | 9 +- .../i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 61 +++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitFile.java | 77 ++++++++++++++++ .../repository/BsSuitCaseFTPRepository.java | 14 +++ .../repository/BsSuitCaseRESTRepository.java | 16 ++++ .../repository/BsSuitFileRepository.java | 14 +++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 35 ++++++- 10 files changed, 326 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseFTPRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRESTRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitFileRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 15e76a4..7e88112 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -25,7 +25,8 @@ public class BlockSoftSwitchEnumUtil { DATASOURCE(30,"数据源套件"), WEB_SERVICE(40,"WebService套件"), MQ(50,"消息队列套件"), - WEB_SOCKET(60,"WebSocket套件"); + WEB_SOCKET(60,"WebSocket套件"), + FTP(70,"FTP套件"); private int value; private String description; @@ -120,7 +121,11 @@ public class BlockSoftSwitchEnumUtil { CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"), /* Restful */ - CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"); + CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"), + SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120001,"Client REST服务端适配器"), + + /* FTP */ + CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,15001,"Client FTP客户端适配器"); private int value; private String description; @@ -635,4 +640,96 @@ public class BlockSoftSwitchEnumUtil { return tmp; } } + + /** + * ftp传输编码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FTP_ENCODE { + CONN_SUCCESS(10, "UTF-8", "UTF-8"), + CONN_FAILURE(20, "GBK", "GBK"); + + private int value; + private String encode; + private String description; + + private FTP_ENCODE (int value,String encode, String description) { + this.value = value; + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getEncode() { + return encode; + } + + 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].encode; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].encode.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 FTP_ENCODE 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 valueOfEncode(int value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].encode; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].encode.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 9dc921e..1019b4e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -214,7 +214,7 @@ public class CommonEnumUtil { EXCEPTION(2, "异常"), EXCEPTION_DETAIL(3, "异常明细"), EXCEPTION_SOLUTION(4, "解决方案"), - EXCEPTION_ENUM(5, "枚举"), + ENUM(5, "枚举"), MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"), diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 810ec8a..ee83232 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -35,6 +35,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "REST 适配套件") private BsSuitCaseREST bsSuitCaseREST; + @ApiParam(value = "FTP 适配器") + private BsSuitCaseFTP bsSuitCaseFTP; + @ApiParam(value = "分页数据") private Pager pager; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java index 44820a8..dfab548 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.softswitch.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 com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -74,6 +73,14 @@ public class BsSslKey extends BaseBean { @ApiParam(value = "证书描述") private String keyDescription; + @Column(name = "KEY_USER_NAME") + @ApiParam(value = "证书账号") + private String keyUserName; + + @Column(name = "KEY_PASSWORD") + @ApiParam(value = "证书密码") + private String keyPassword; + @Transient @ApiParam(value = "证书参数集合") private List bsSslKeyParamList; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java new file mode 100644 index 0000000..6dba956 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.softswitch.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-09-25 17:43 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_FTP") +@Api(value = "FTP适配器", description = "FTP适配器") +public class BsSuitCaseFTP extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "file_Name") + @ApiParam(value = "文件名") + private String fileName; + + @Column(name = "ENCODE") + @ApiParam(value = "编码") + private Integer encode; + + @Column(name = "IS_READ_AND_EMPTY") + @ApiParam(value = "读取并清空") + private Integer isReadAndEmpty; + + @Column(name = "IS_READ_AND_DELETE") + @ApiParam(value = "读取并删除") + private Integer isReadAndDelete; + + @Column(name = "IS_NEED_TRAVERSAL") + @ApiParam(value = "是否需要遍历") + private Integer isNeedTraversal; + + @Column(name = "IS_INCREMENTAL_READ") + @ApiParam(value = "是否增量读取") + private Integer isIncrementalRead; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java new file mode 100644 index 0000000..8c228ba --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.softswitch.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-09-25 17:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_FILE") +@Api(value = "适配文件信息", description = "适配文件信息") +public class BsSuitFile extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "SUIT_CASE_NAME_RDD") + @ApiParam(value = "适配套件名称") + private String suitCaseName; + + @Column(name = "SUIT_CASE_CODE") + @ApiParam(value = "适配套件代码") + private String suitCaseCode; + + @Column(name = "FOLDER_PATH") + @ApiParam(value = "文件夹路径") + private String folderPath; + + @Column(name = "FILE_ID") + @ApiParam(value = "文件id") + private String fileId; + + @Column(name = "FILE_NAME") + @ApiParam(value = "文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam(value = "文件URL") + private String fileURL; + + @Column(name = "FILE_SIZE") + @ApiParam(value = "文件大小") + private int fileSize; + + @Column(name = "SUIT_DATE_TIME") + @ApiParam(value = "适配时间") + private String suitDateTime; + + @Column(name = "PROCESS_STATE") + @ApiParam(value = "处理状态") + private Integer processState; + + @Column(name = "PROCESS_TIME") + @ApiParam(value = "处理时间") + private String processTime; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseFTPRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseFTPRepository.java new file mode 100644 index 0000000..f59a30e --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseFTPRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseFTP; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-27 10:16 + * @Modify: + **/ +public interface BsSuitCaseFTPRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRESTRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRESTRepository.java new file mode 100644 index 0000000..53d3da9 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRESTRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseREST; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-23 15:39 + * @Modify: + **/ +@Repository +public interface BsSuitCaseRESTRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitFileRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitFileRepository.java new file mode 100644 index 0000000..91eb235 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitFileRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-27 10:17 + * @Modify: + **/ +public interface BsSuitFileRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index d999d66..e5e4f2b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -4,8 +4,19 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.softswitch.bean.*; -import org.apache.commons.lang3.StringUtils; +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource; +import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule; +import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; /** * @Description : @@ -350,4 +361,24 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + + + /** + * 适配文件条件封装 + * @param bsSuitFile 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSuitCaseFile(BsSuitFile bsSuitFile){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseName(),"suitCaseName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean); + DdlPreparedPack.timeBuilder(bsSuitFile.getSuitDateTime(), "suitDateTime", ddlPackBean, false, true); + + ddlPackBean.setOrderByStr(bsSuitFile.orderBy()); + + return ddlPackBean; + } } From edfc78995b5c851a37bd6122b17dfbf0249e407d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 27 Sep 2019 14:48:29 +0800 Subject: [PATCH 08/33] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA=E9=85=8D=E7=BD=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 44b70e6..c584ac5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1866,7 +1866,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMMON_SN { - PO_SN("PO_SN", "PO条码"); + PO_SN("PO_SN", "PO条码"), + VDA_SN("VDA_SN", "VDA条码"); private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 20705ab..c63c5fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -147,6 +147,22 @@ public class WmsPart extends BaseBean { @ApiParam("保质期天数") private Integer qualityDays; + @Column(name = "IS_REPORT_PARTNO") + @ApiParam("是否报工零件") + private Integer isReportPartNo; + + @Column(name = "REPORT_LOCATE_NO") + @ApiParam("报工库位") + private String reportLocateNo; + + @Column(name = "REPORT_ZONE_NO") + @ApiParam("报工存储区") + private String reportZoneNo; + + @Column(name = "PRODUCT_LINES") + @ApiParam("报工产线") + private String productLines; + @Transient @ApiParam("总数量") private Double qty; From 3ba6508b0c847884e73e398d3dde7b7b9b056e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 27 Sep 2019 14:50:43 +0800 Subject: [PATCH 09/33] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA=E9=85=8D=E7=BD=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsPrinterConfigure.java | 59 ++++++++++++++++++++++ .../repository/WmsPrinterConfigureRepository.java | 15 ++++++ 2 files changed, 74 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java new file mode 100644 index 0000000..7c8bf61 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 打印机配置表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-09-26 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PRINTER_CONFIGURE") +@Api("打印机配置表") +public class WmsPrinterConfigure extends BaseBean{ + + private static final long serialVersionUID = 1234639813072592779L; + @Column(name="PRINTER_NO") + @ApiParam("打印机编号") + private String printerNo; + + @Column(name="PRINTER_NAME") + @ApiParam("打印机名称") + private String printerName; + + @Column(name="IP") + @ApiParam("IP") + private String ip; + + @Column(name="PORT") + @ApiParam("端口") + private Integer port; + + @Column(name="OBJECT_DESCRIPTION") + @ApiParam(value ="描述") + private String objectDescription; + + @Column(name="POSITION") + @ApiParam("位置") + private String position; + + @Column(name="TYPE") + @ApiParam("类型") + private Integer type; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java new file mode 100644 index 0000000..83401e5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; +import cn.estsh.i3plus.pojo.wms.bean.WmsPrinterConfigure; + +/** + * @Description : 打印机配置 + * @Reference : + * @Author : jessica.chen + * @Date : 2019-09-26 12:03:00 + * @Modify : + **/ +public interface WmsPrinterConfigureRepository extends BaseRepository { +} From 26684524f1acb5dae1d21779bc45a17018b287c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 27 Sep 2019 16:37:17 +0800 Subject: [PATCH 10/33] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=92=8C=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BB=84=E4=BB=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 69 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPrintingQueue.java | 55 +++++++++++++++++ .../wms/repository/WmsPrintingQueueRepository.java | 17 ++++++ 3 files changed, 141 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 5cc62e7..7d6be83 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3449,4 +3449,73 @@ public class WmsEnumUtil { } } + /** + * 打印类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_TYPE { + SN(10, "SN"); + + private int value; + private String description; + + PRINT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 打印状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ETC_PRINT_STATUS { + NOT_HIT (10, "未打"), + ALREADY_HIT(20, "已打"); + + private int value; + private String description; + + ETC_PRINT_STATUS(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; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java new file mode 100644 index 0000000..9aac6f4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 待打印队列表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-09-27 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PRINTING_QUEUE") +@Api("待打印队列表") +public class WmsPrintingQueue extends BaseBean{ + + private static final long serialVersionUID = 1111639813072592779L; + @Column(name="PRINT_IDENTIFICATION") + @ApiParam("打印标识") + private String printIdentification; + + @Column(name="PRINT_TYPE") + @ApiParam("打印类型") + private Integer printType; + + @Column(name="PRINT_NO") + @ApiParam("打印机编号") + private String printNo; + + @Column(name="PRINT_MUMBER") + @ApiParam("打印机张数") + private Integer printNumber; + + @Column(name="TEMPLATE_NO") + @ApiParam("模板编号") + private String templateNo; + + @Column(name="PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java new file mode 100644 index 0000000..b63a0f8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsPrintingQueue; +import org.springframework.stereotype.Repository; + +/** + * @Description :待打印配置表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-09-27 14:49 + * @Modify: + **/ +@Repository +public interface WmsPrintingQueueRepository extends BaseRepository { +} From fb86682652a0481967403ac20e2616a96c7591b9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 27 Sep 2019 17:28:47 +0800 Subject: [PATCH 11/33] =?UTF-8?q?VDA=20=E7=94=9F=E4=BA=A7=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 111 +++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index c2f5c13..ae984f5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3448,4 +3448,115 @@ public class WmsEnumUtil { } } + /** + * 物料关系信息 关联类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_ASSOCIATE_TYPE { + LINE(10, "LINE", "产线"), + CUSTOMER(20, "CUSTOMER", "客户"), + VENDOR(30, "VENDOR", "供应商"); + + private int value; + private String code; + private String description; + + PART_ASSOCIATE_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 descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 条码操作记录信息 操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_OPERATE_TYPE { + REPORT(10, "REPORT", "生产报工"), + BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"); + + private int value; + private String code; + private String description; + + SN_OPERATE_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 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; + } + } + } \ No newline at end of file From eb70017396e5eb1b74ff7a0f143f0a093cd12c32 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 27 Sep 2019 17:50:23 +0800 Subject: [PATCH 12/33] =?UTF-8?q?Xml=20=E8=A7=A3=E6=9E=90=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=87=8D=E8=AF=95=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/common/XStreamFactory.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index 6378c45..0d742da 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -9,6 +9,8 @@ import com.thoughtworks.xstream.io.naming.NameCoder; import com.thoughtworks.xstream.io.naming.NoNameCoder; import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import com.thoughtworks.xstream.io.xml.XppDomDriver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.Writer; import java.lang.reflect.Field; @@ -23,8 +25,13 @@ import java.lang.reflect.Field; **/ public class XStreamFactory { + private static final Logger LOGGER = LoggerFactory.getLogger(XStreamFactory.class); + private static final XStream xStream = XStreamFactory.getXStream(); + /* 转换重试次数 */ + private static final int RETRY_NUM = 3; + public static final String CDATA_PREFIX = ""; @@ -120,7 +127,14 @@ public class XStreamFactory { public static String toXml(T t) { xStream.processAnnotations(t.getClass()); String headLine = "\n"; - return headLine + xStream.toXML(t); + for (int i = 1; i < RETRY_NUM; i++) { + try { + return headLine + xStream.toXML(t); + }catch (Exception e){ + LOGGER.error("Bean To Xml Error Message:{} Number:{}",e.getMessage(),i); + } + } + return null; } /** From c509f3c707ae005ec8ed4962b957ec25ed29e8ee Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 27 Sep 2019 18:06:29 +0800 Subject: [PATCH 13/33] =?UTF-8?q?VDA=20=E7=94=9F=E4=BA=A7=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsPartRelation.java | 51 +++++++++++++++ .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 75 ++++++++++++++++++++++ .../wms/repository/WmsPartRelationRepository.java | 16 +++++ .../repository/WmsSnOperateRecordRepository.java | 16 +++++ 4 files changed, 158 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRelationRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnOperateRecordRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java new file mode 100644 index 0000000..b31d80a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 物料关系表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-09-27 14:44 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_PART_RELATION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="物料关系表",description = "物料关系表") +public class WmsPartRelation extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "ASSOCIATE_CODE") + @ApiParam(value = "关联代码") + private String associateCode; + + @Column(name = "ASSOCIATE_NAME_ADD") + @ApiParam(value = "关联名称") + private String associateNameAdd; + + @Column(name = "ASSOCIATE_TYPE") + @ApiParam(value = "关联类型") + private Integer associateType; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java new file mode 100644 index 0000000..5639a23 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 条码操作记录表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-09-27 16:58 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SN_OPERATE_RECORD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="条码操作记录表",description = "条码操作记录表") +public class WmsSnOperateRecord extends BaseBean { + + @Column(name = "SN") + @ApiParam(value = "条码") + private String sn; + + @Column(name = "LINE_CODE") + @ApiParam(value = "产线代码") + private String lineCode; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") + private String locateNo; + + @Column(name = "QTY") + @ApiParam(value = "数量", example = "0") + private Double qty = 0d; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + private String shippingFlag; + + @Column(name = "OPERATE_TYPE") + @ApiParam(value = "操作类型") + private Integer operateType; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRelationRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRelationRepository.java new file mode 100644 index 0000000..e2108ed --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRelationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartRelation; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物料关系信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-09-27 15:18 + * @Modify: + **/ +@Repository +public interface WmsPartRelationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnOperateRecordRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnOperateRecordRepository.java new file mode 100644 index 0000000..fc4f25d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnOperateRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSnOperateRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : 条码操作记录信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-09-27 17:07 + * @Modify: + **/ +@Repository +public interface WmsSnOperateRecordRepository extends BaseRepository { +} From 183fd78eac8aff5d897e09838f2f1c435fd990af Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Sat, 28 Sep 2019 10:23:50 +0800 Subject: [PATCH 14/33] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 277 ++++++++++++++++++++- .../i3plus/pojo/mes/pcn/bean/MesDataObject.java | 4 + .../pojo/mes/pcn/bean/{MesDB.java => MesDb.java} | 2 +- .../i3plus/pojo/mes/pcn/bean/MesEquipment.java | 4 + .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 4 + .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 81 ++++++ .../pojo/mes/pcn/model/PLCInteracticeModel.java | 50 ++++ .../pojo/mes/pcn/model/PlcCacheKeyModel.java | 35 +++ .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 11 +- .../pcn/repository/MesDataObjectRepository.java | 13 + .../pojo/mes/pcn/repository/MesDbRepository.java | 13 + .../mes/pcn/repository/MesObjectCfgRepository.java | 13 + .../pojo/mes/pcn/repository/MesPlcRepository.java | 15 ++ .../estsh/i3plus/pojo/mes/bean/MesDataObject.java | 4 + .../pojo/mes/bean/{MesDB.java => MesDb.java} | 2 +- .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 4 + 16 files changed, 520 insertions(+), 12 deletions(-) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/{MesDB.java => MesDb.java} (97%) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesDB.java => MesDb.java} (97%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index f9dbb36..b19808e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.StringUtils; /** * @Description : @@ -350,14 +351,16 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_CENTER_RUNNING_STATUS { - RUNNING(1, "开线"), - STOPPED(2, "停线"); + RUNNING(1, "start", "开线"), + STOPPED(2, "stop", "停线"); private int value; + private String code; private String description; - WORK_CENTER_RUNNING_STATUS(int value, String description) { + WORK_CENTER_RUNNING_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -365,6 +368,10 @@ public class MesPcnEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -378,6 +385,16 @@ public class MesPcnEnumUtil { } return tmp; } + + 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; + } } /** @@ -386,10 +403,10 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - PERSON(10, "person", "人"), - EQUIPMENT(20, "equipment", "机"), - MATERIAL(30, "material", "料"), - ROUTE(40, "route", "法"), + PERSON(10, "people", "人"), + EQUIPMENT(20, "equipments", "设备"), + MATERIAL(30, "materials", "物料"), + ROUTE(40, "routes", "工艺"), ONLINE_SIGNAL(50, "onlineSignal", "开线信号"); private int value; @@ -423,6 +440,16 @@ public class MesPcnEnumUtil { } return tmp; } + + 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; + } } /** @@ -498,4 +525,240 @@ public class MesPcnEnumUtil { } + /** + * 设备连接类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EQP_CONNECT_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"), + OTHER(30, "OTHER"); + + private int value; + private String description; + + EQP_CONNECT_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; + } + } + + /** + * 数据库操作类型 开线检查的模块 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DB_OPERATION_TYPE { + + INSERT(10, "insert", "新增"), + SELECT(20, "select", "查询"), + UPDATE(30, "update", "更新"); + + private int value; + private String code; + private String description; + + DB_OPERATION_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String 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; + } + } + + /** + * 数据库连接方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_SOURCE_TYPE { + SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), + SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), + SOURCE_ORACLE(30, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), + SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); + + private int value; + private String code; + private String description; + private String driverClassName; + private int defaultPort; + private String defaultSchemaPattern; + + private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) { + this.value = value; + this.code = code; + this.description = description; + this.driverClassName = driverClassName; + this.defaultPort = port; + this.defaultSchemaPattern = defaultSchemaPattern; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public String getDriverClassName() { + return driverClassName; + } + + public int getDefaultPort() { + return defaultPort; + } + + public String getDefaultSchemaPattern() { + return defaultSchemaPattern; + } + + 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 DATA_SOURCE_TYPE 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; + } + + public String getJDBCUrl(String database,String host,Integer port){ + if(this.getValue() == SOURCE_MARIA_DB.getValue()){ + return getJDBCUrlMySQL(database,host,port); + }else if(this.getValue() == SOURCE_ORACLE.getValue()){ + return getJDBCUrlOracle(database,host,port); + }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ + return getJDBCUrlPostgreSQL(database,host,port); + }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ + return getJDBCUrlSQLServer(database,host,port); + } + return null; + } + + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ + if(StringUtils.isNotBlank(databaseProductName)){ + if(databaseProductName.indexOf(":mysql:") != -1){ + return SOURCE_MARIA_DB; + }else if(databaseProductName.indexOf(":oracle:") != -1){ + return SOURCE_ORACLE; + }else if(databaseProductName.indexOf(":postgresql:") != -1){ + return SOURCE_POSTGRE_SQL; + }else if(databaseProductName.indexOf(":sqlserver:") != -1){ + return SOURCE_SQL_SERVER; + } + } + return null; + } + + private String getJDBCUrlMySQL(String database,String host,Integer port){ + return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + } + + private String getJDBCUrlOracle(String database,String host,Integer port){ + return "jdbc:oracle:thin:@"+host+":"+port+":"+database; + } + + private String getJDBCUrlPostgreSQL(String database,String host,Integer port){ + return "jdbc:postgresql://"+host+":"+port+"/"+database; + } + + private String getJDBCUrlSQLServer(String database,String host,Integer port){ + return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database; + } + } + + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java index b964d08..b26dc90 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java @@ -39,4 +39,8 @@ public class MesDataObject extends BaseBean { @Column(name="DS_CODE") @ApiParam("数据源代码") private String dsCode; + + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java similarity index 97% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java index 18cd750..e86de81 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DB") @Api("地址清单") -public class MesDB extends BaseBean { +public class MesDb extends BaseBean { @Column(name="DS_CODE") @ApiParam("数据源代码") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java index df924c5..e6dd7ba 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java @@ -55,6 +55,10 @@ public class MesEquipment extends BaseBean { @ApiParam("区域代码") private String areaCode; + @Column(name="CONNECT_TYPE") + @ApiParam("连接类型") + private Integer connectType; + @Transient @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java index 1dec08d..48ec4d9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -52,4 +52,8 @@ public class MesObjectCfg extends BaseBean { @ApiParam("主键标记") private String fieldPk; + @Column(name="POJO_ATTR") + @ApiParam("对应的pojo属性") + private String pojoAttr; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java new file mode 100644 index 0000000..64a9e9c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -0,0 +1,81 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/25 8:07 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLC") +@Api("PLC配置表") +public class MesPlc extends BaseBean { + + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + + @Column(name = "PLC_NAME") + @ApiParam("PLC名称") + private String plcName; + + @Column(name = "PLC_MODEL") + @ApiParam("PLC型号") + private String plcModel; + + @Column(name = "PLC_IP") + @ApiParam("PLC IP") + private String plcIp; + + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "TAG_NAME") + @ApiParam("标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam("标签地址") + private String tagAddress; + + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + + @Column(name = "GROUP_NAME") + @ApiParam("分组名称") + private String groupName; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "ENABLED") + @ApiParam("是否启用 0 false 1 true") + private Integer enabled; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java new file mode 100644 index 0000000..f3b4227 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/25 7:41 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("PLC交互model") +public class PLCInteracticeModel { + + private String serverIp; + + private String serverPort; + + private String mwContext; + + private String protocol; + + private String plcCode; + + private String dataType; + + private String userName; + + private String password; + + private Integer enabled; + + private String realm; + + private String tag; + + private String value; + + private String comment; + + private String authenKey; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java new file mode 100644 index 0000000..ef2610f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/28 10:17 AM + * @Description: + **/ +@Data +@Api("PLC Redis Cache key") +public class PlcCacheKeyModel { + + private String channel; + + private String device; + + private String tag; + + public PlcCacheKeyModel(String channel, String device, String tag) { + this.channel = channel; + this.device = device; + this.tag = tag; + } + + public String getPlcCacheKey() { + return channel + ":" + device + ":" + tag; + } + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java index 64151f9..80e7374 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -48,6 +48,9 @@ public class WcCheckModel { @ApiParam("开线信号") private Integer onlineSignal; + @ApiParam("开线对象") + MesWcCheckRecord onlineSignalEqu; + @ApiParam("是否通过") private Integer isPass; @@ -57,12 +60,12 @@ public class WcCheckModel { @ApiParam("工单") private String workOrder; - @ApiParam("工单零件数量") - private Long qty; - @ApiParam("产品号") private String partNo; + @ApiParam("需要展示的数据") + private Map need2ShowMap; + public WcCheckModel initialWcCheckModel() { WcCheckModel wcCheckModel = new WcCheckModel(); @@ -76,6 +79,8 @@ public class WcCheckModel { wcCheckModel.setRoutesColumn(new HashMap<>()); wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); + onlineSignalEqu=new MesWcCheckRecord(); + wcCheckModel.setNeed2ShowMap(new HashMap<>()); Map dataColumnRelationMap = new HashMap<>(); dataColumnRelationMap.put("people", "peopleColumn"); diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java new file mode 100644 index 0000000..c37b6ed --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java @@ -0,0 +1,13 @@ +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.MesDataObject; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:59 PM + * @Description: + **/ +public interface MesDataObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java new file mode 100644 index 0000000..0b7d77e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java @@ -0,0 +1,13 @@ +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.MesDb; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesDbRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java new file mode 100644 index 0000000..c1a67b2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java @@ -0,0 +1,13 @@ +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.MesObjectCfg; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:59 PM + * @Description: + **/ +public interface MesObjectCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java new file mode 100644 index 0000000..add5aac --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java @@ -0,0 +1,15 @@ +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.MesPlc; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/26 7:47 PM + * @Description: + **/ +@Repository +public interface MesPlcRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index 4b4f28a..cf14ce8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -39,4 +39,8 @@ public class MesDataObject extends BaseBean { @Column(name="DS_CODE") @ApiParam("数据源代码") private String dsCode; + + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java similarity index 97% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java index 2ce7819..de939b5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DB") @Api("地址清单") -public class MesDB extends BaseBean { +public class MesDb extends BaseBean { @Column(name = "DS_CODE") @ApiParam("数据源代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index d5764ed..a4bb5eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -52,4 +52,8 @@ public class MesObjectCfg extends BaseBean { @ApiParam("主键标记") private String fieldPk; + @Column(name="POJO_ATTR") + @ApiParam("对应的pojo属性") + private String pojoAttr; + } From fb9340fc0923473a0d97a60bd2fb52697c32f146 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 28 Sep 2019 16:03:50 +0800 Subject: [PATCH 15/33] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=91=BC=E5=8F=AB?= =?UTF-8?q?=EF=BC=8C=E5=BC=80=E7=BA=BF=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9B=20=E5=AE=89=E7=81=AF=E9=99=84=E5=B1=9E=E8=A1=A8?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=B7=BB=E5=8A=A0=EF=BC=9B=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E6=98=BE=E7=A4=BA=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=8A=B6=E6=80=81=EF=BC=9B=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=89=A9=E7=90=86=E5=AE=89=E7=81=AF=EF=BC=8C=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 4 + .../i3plus/pojo/andon/bean/AndonQueueAttach.java | 46 +++++++++++ .../estsh/i3plus/pojo/andon/bean/MesWorkCell.java | 4 + .../repository/IAndonQueueAttachRepository.java | 17 ++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 96 +++++++++++++++++++++- 5 files changed, 165 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index a58c464..8567ff4 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -157,6 +157,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "解决人") private String resetUser; + @Column(name = "SOURCE_TYPE") + @ApiParam(value = "安灯来源类型") + private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue(); + @Transient @ApiParam(value = "解决人名字") private String resetUserName; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java new file mode 100644 index 0000000..778baae --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 安灯任务附属表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-09-27 19:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="ANDON_MANAGE_ATTACH") +@Api(value="安灯任务附属信息") +public class AndonQueueAttach extends BaseBean { + + @Column(name="PROD_INFO") + @ApiParam(value ="产品信息" , example ="-1") + private String prodInfo; + + @Column(name="LINE_INFO") + @ApiParam(value ="产线信息") + private String lineInfo; + + @Column(name="ANDON_ORDER_NO") + @ApiParam(value ="安灯任务编号") + private String andonOrderNo; + + @Column(name="STATUS_CODE") + @ApiParam(value ="安灯状态") + private String statusCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java index 7b95b63..e8f4a03 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java @@ -49,6 +49,10 @@ public class MesWorkCell extends BaseBean { private String areaCode; @Transient + @ApiParam(value ="工作单元中安灯队列标识") + private String workCellSignal; + + @Transient @ApiParam(value ="子集列表") @AnnoOutputColumn(hidden = true) private List childTreeList; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java new file mode 100644 index 0000000..d36bc9f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 安灯附属表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-09-28 + * @Modify: + **/ +@Repository +public interface IAndonQueueAttachRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index cc0ebe0..efbfada 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -58,6 +58,51 @@ public class AndonEnumUtil { } /** + * 标准类型 = 10，异常类型 = 20 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CELL_TYPE{ + NORMAL("10","标准类型"), + ABNORMAL("20","异常类型"); + + private String value; + private String description; + + WORK_CELL_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value,val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 审批状态：10=待审批，20=二级审批，30=三级审批，40=四级审批，100=已审批 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -199,7 +244,7 @@ public class AndonEnumUtil { /** * 按灯业务状态 - * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60 + * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60, 产品信息=70， 产品产量=80 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ @@ -208,7 +253,9 @@ public class AndonEnumUtil { READ_FLAG("30", "安灯读取状态"), STOP_FLAG("40", "停线状态"), DETAIL_TYPE("50", "安灯子类型"), - AC_CODE("60", "原因代码"); + AC_CODE("60", "原因代码"), + PROD_INFO("70", "产品信息"), + LINE_INFO("80", "产量信息"); private String value; private String description; @@ -362,6 +409,51 @@ public class AndonEnumUtil { } } + /** + * 安灯来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_SOURCE_TYPE{ + PHYSICAL("10","物理安灯"), + SOFT("20","软件安灯"); + + private String value; + private String description; + + ALARM_SOURCE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = ""; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 From 9a21e2d99fda3fc24e8c99579f279729d74407f5 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Sat, 28 Sep 2019 16:08:59 +0800 Subject: [PATCH 16/33] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/wmsCSOrderDetailsModel.java | 72 ++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java new file mode 100644 index 0000000..9957a5f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class wmsCSOrderDetailsModel implements Serializable { + + + /****** + * + * 库位编码 + */ + public String locateNo; + + /****** + * + * 订单编码 + */ + public String orderNo; + + + /****** + * + * 物料代码 + */ + public String partNo; + + /****** + * + * 物料名称 + */ + public String partNameRdd; + + /****** + * + * 冻结数量 + */ + public String qty; + + /****** + * + * 实盘数量 + */ + public String factQty; + + /****** + * + * 条码 + */ + public String sn; + + + /****** + * + * 仓库编码 + */ + public String whNo; + + /****** + * + * 区域编码 + */ + public String zoneNo; + + /****** + * + * 状态 + */ + public String wmStatus; +} From e20ee7b1ff1738bb81e89037882b7010e5a321ee Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 28 Sep 2019 19:18:20 +0800 Subject: [PATCH 17/33] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=94=BE=E8=A1=8C?= =?UTF-8?q?=E6=94=BE=E8=A1=8C=E8=AF=B4=E6=98=8E=E7=BB=B4=E6=8A=A4=EF=BC=8C?= =?UTF-8?q?=20=E5=AE=89=E7=81=AF=E5=93=8D=E5=BA=94=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E6=A0=87=E8=AF=86=EF=BC=8C=20=E7=94=A8=E6=88=B7=E7=BB=8F?= =?UTF-8?q?=E8=BF=87=E5=B7=A5=E5=8E=82=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 8567ff4..674dd65 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -283,6 +283,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "发送标志") private String sendFlag; + @Column(name = "SIGN_SEND_FLAG") + @ApiParam(value = "响应已通知标识") + private String signSendFlag; + /** * 处理类型：10=标准处理，20=自处理 */ @@ -329,6 +333,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "驳回意见") private String rejectOpinion; + @Column(name = "OPEN_INFO") + @ApiParam(value = "放行说明") + private String openInfo; + @Transient @ApiParam(value = "安灯状态集合") private List statusCodeList; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index f1fa3f0..b7aef8e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -264,6 +264,10 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "驳回意见") private String rejectOpinion; + @Column(name = "OPEN_INFO") + @ApiParam(value = "放行说明") + private String openInfo; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index efbfada..d3688eb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -717,7 +717,8 @@ public class AndonEnumUtil { CANCEL_ACTION("40", "撤销动作"), COMMIT_ACTION("50","提交动作"), PASS_ACTION("60","审批动作"), - REJECT_ACTION("70", "驳回动作"); + REJECT_ACTION("70", "驳回动作"), + OPEN_ACTION("80","放行动作"); private String value; private String description; From c2da7410ebfa51df5eae80713ef8e88307e49a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 28 Sep 2019 20:08:11 +0800 Subject: [PATCH 18/33] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 7d6be83..ef96bed 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -767,7 +767,11 @@ public class WmsEnumUtil { INSTOCK("INSTOCK", "入库"), MOVESTOCK("MOVESTOCK", "移库"), CS("CS", "盘点"), - VDARC("VDARC", "VDA收货"); + VDARC("VDARC", "VDA收货"), + VDAINSTOCK("VDAINSTOCK", "VDA入库"), + VDAMOVESTOCK("VDAMOVESTOCK", "VDA内部移库"), + VDA_FAST_STOCK("VDA_FAST_STOCK", "VDA采购快速入库"), + VDAREPORT("VDAREPORT", "VDA生产报工"); private String value; private String description; From aea18f89c6f0bf7bb84b81d55cc4eafe04889f87 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 29 Sep 2019 14:36:27 +0800 Subject: [PATCH 19/33] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=94=BE=E8=A1=8C?= =?UTF-8?q?=E8=AF=B4=E6=98=8E=E5=AD=97=E6=AE=B5=E7=BB=B4=E6=8A=A4openInfo?= =?UTF-8?q?=EF=BC=8C=20=E5=AE=89=E7=81=AF=E5=93=8D=E5=BA=94=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5signSendFlag?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 674dd65..dbdc07e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -392,7 +392,7 @@ public class AndonManageQueue extends BaseBean { * @param workCellCode * @param workCellNameRdd * @param alarmCode - * @param ecCode + * @param ecCodec * @param ecNameRdd * @param emCode * @param emNameRdd diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index b7aef8e..d66158f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -268,6 +268,10 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "放行说明") private String openInfo; + @Column(name = "SIGN_SEND_FLAG") + @ApiParam(value = "响应已通知标识") + private String signSendFlag; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; From 81d86d1bd2ac5ea4b8b99b33c644e35e457a5a05 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Sun, 29 Sep 2019 17:22:10 +0800 Subject: [PATCH 20/33] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java => i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java} (88%) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java similarity index 88% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java index 9957a5f..ff3329d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java @@ -1,11 +1,10 @@ -package cn.estsh.i3plus.pojo.model.wms; +package cn.estsh.i3plus.pojo.wms.bean.iotio; import lombok.Data; import java.io.Serializable; - @Data -public class wmsCSOrderDetailsModel implements Serializable { +public class WmsCSOrderDetailsModel implements Serializable { /****** From ff272afe2c18c1b4725e975992f0e89227f3e127 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 29 Sep 2019 17:57:13 +0800 Subject: [PATCH 21/33] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index e356a41..e955336 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -163,7 +163,7 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){ DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(mesWorkCell.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result); getStringBuilderPack(mesWorkCell, result); From 4fc72ca358135a97c1dfadc9a4e6137b90ab0d78 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Sun, 29 Sep 2019 19:57:20 +0800 Subject: [PATCH 22/33] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java index ff3329d..6e2b61d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java @@ -7,6 +7,14 @@ import java.io.Serializable; public class WmsCSOrderDetailsModel implements Serializable { + + /****** + * + * 工厂代码 + */ + public String organizeCode; + + /****** * * 库位编码 From 10ce1e165ecf9c90a65aa0985a03f600990ea593 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 29 Sep 2019 20:56:16 +0800 Subject: [PATCH 23/33] add order spread to aps --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 8 ++++ .../estsh/i3plus/pojo/aps/bean/ExportProject.java | 2 + .../estsh/i3plus/pojo/aps/bean/ImportProject.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 8 ++++ .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 2 + .../estsh/i3plus/pojo/aps/bean/OperResource.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 5 ++ .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 53 ++++++++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 9 ++++ .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 3 ++ .../estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 2 + .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 7 +++ .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 2 + .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 40 +++++++++++----- .../estsh/i3plus/pojo/aps/common/DateDuration.java | 16 +++---- .../estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java | 3 +- .../estsh/i3plus/pojo/aps/holders/EParentWork.java | 6 +++ .../i3plus/pojo/aps/holders/EProductOrder.java | 3 +- .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 1 + .../pojo/aps/repository/ParentWorkRepository.java | 9 ++++ .../src/main/resources/relations/BaseOrder.xml | 2 - .../src/main/resources/relations/ParentWork.xml | 5 ++ .../src/main/resources/relations/ProductOrder.xml | 2 + 27 files changed, 181 insertions(+), 23 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index cf27632..074435b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -5,11 +5,13 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; +import javax.persistence.MappedSuperclass; import java.util.Date; import java.util.List; @@ -21,6 +23,7 @@ import java.util.List; * @Modify: **/ @Data +@MappedSuperclass @Api("订单基类") public class BaseOrder extends BaseCode { @Column(name="COUNT") @@ -60,6 +63,7 @@ public class BaseOrder extends BaseCode { @FieldAnnotation(property = false) private Long materialId; + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); } @@ -73,18 +77,22 @@ public class BaseOrder extends BaseCode { BeanRelation.set(this, EBaseOrder.Material, material); } + @JsonBackReference public List getPrevRelations() { return BeanRelation.list(this, EBaseOrder.PrevRelations); } + @JsonBackReference public List getPostRelations() { return BeanRelation.list(this, EBaseOrder.PostRelations); } + @JsonBackReference public List getUpperOrders() { return BeanRelation.list(this, EBaseOrder.UpperOrders); } + @JsonBackReference public List getLowerOrders() { return BeanRelation.list(this, EBaseOrder.LowerOrders); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index 27d70a9..458c9a5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EExportProject; +import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -45,6 +46,7 @@ public class ExportProject extends BaseAPS { BeanRelation.set(this, EExportProject.Link, link); } + @JsonBackReference public List getDetails() { return BeanRelation.list(this, EExportProject.Details); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 731a820..35e8af3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EImportProject; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -43,6 +44,7 @@ public class ImportProject extends BaseAPS { BeanRelation.set(this, EImportProject.Link, link); } + @JsonBackReference public List getDetails() { return BeanRelation.list(this, EImportProject.Details); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 54d7fc4..89699c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -38,6 +39,7 @@ public class Inventory extends BaseOrder { @ApiParam(value ="多余量") private Double excessCount; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index a42d97e..fc3af62 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE; import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE; import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EMaterial; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -107,30 +108,37 @@ public class Material extends BaseCode { @ApiParam(value ="最大库存数量") private Double maxStockCount; + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); } + @JsonBackReference public List getOperInputs() { return BeanRelation.list(this, EMaterial.OperInputs); } + @JsonBackReference public List getOperOutputs() { return BeanRelation.list(this, EMaterial.OperOutputs); } + @JsonBackReference public List getWorkInputs() { return BeanRelation.list(this, EMaterial.WorkInputs); } + @JsonBackReference public List getWorkOutputs() { return BeanRelation.list(this, EMaterial.WorkOutputs); } + @JsonBackReference public List getWorkRelations() { return BeanRelation.list(this, EMaterial.WorkRelations); } + @JsonBackReference public List getOrders() { return BeanRelation.list(this, EMaterial.Orders); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 1ad9690..ef5aac9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EOperInput; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -78,6 +79,7 @@ public class OperInput extends BaseAPS { BeanRelation.set(this, EOperInput.Material, material); } + @JsonBackReference public List getWorkInputs() { return BeanRelation.list(this, EOperInput.WorkInputs); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 41a13fa..5e98d6e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOperOutput; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -65,6 +66,7 @@ public class OperOutput extends BaseAPS { BeanRelation.set(this, EOperOutput.Material, material); } + @JsonBackReference public List getWorkOutputs() { return BeanRelation.list(this, EOperOutput.WorkOutputs); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index f0859f7..b56b850 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EOperResource; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -86,6 +87,7 @@ public class OperResource extends BaseAPS { BeanRelation.set(this, EOperResource.Resource, res); } + @JsonBackReference public List getWorkResources() { return BeanRelation.list(this, EOperResource.WorkResources); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 4f6513a..9c6b580 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL; import cn.estsh.i3plus.pojo.aps.holders.EOperation; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -96,14 +97,17 @@ public class Operation extends BaseAPS { BeanRelation.set(this, EOperation.ProductRouting, routing); } + @JsonBackReference public List getOperInputs() { return BeanRelation.list(this, EOperation.OperInputs); } + @JsonBackReference public List getOperOutputs() { return BeanRelation.list(this, EOperation.OperOutputs); } + @JsonBackReference public List getOperResources() { return BeanRelation.list(this, EOperation.OperResources); } @@ -117,6 +121,7 @@ public class Operation extends BaseAPS { BeanRelation.set(this, EOperation.StandOperation, std); } + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EOperation.Works); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java new file mode 100644 index 0000000..d066cc9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EParentWork; +import com.fasterxml.jackson.annotation.JsonBackReference; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.List; + +/** + * @Description :父工作 + * 父工作用于记录工作分割前的信息。 + * 生产订单应关联父工作，父工作关联多个工作。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_PARENT_WORK") +@Api("父工作") +public class ParentWork extends BaseAPS { + @Column(name="count") + @ApiParam(value ="数量") + private Double count; + + @Column(name="PRODUCT_ORDER_ID") + @ApiParam(value ="订单") + @FieldAnnotation(property = false) + private Long productOrderId; + + public BaseOrder getProductOrder() { + return BeanRelation.get(this, EParentWork.ProductOrder); + } + + public void setProductOrder(ProductOrder order) { + this.productOrderId = order != null ? order.getId() : 0l; + BeanRelation.set(this, EParentWork.ProductOrder, order); + } + + @JsonBackReference + public List getWorks() { + return BeanRelation.list(this, EParentWork.Works); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 64f17c0..23bcbe8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EProductOrder; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :生产订单 @@ -85,6 +87,10 @@ public class ProductOrder extends BaseOrder { @ApiParam(value ="缺少量") private Double lackCount; + @Column(name="AUTO_SUPPLY") + @ApiParam(value ="物料计算时自动补充") + private Boolean autoSupply; + @Column(name="PRODUCT_ROUTING_ID") @ApiParam(value ="工艺路线") @FieldAnnotation(property = false) @@ -98,4 +104,7 @@ public class ProductOrder extends BaseOrder { this.productRoutingId = routing != null ? routing.getId() : 0l; BeanRelation.set(this, EProductOrder.ProductRouting, routing); } + + @JsonBackReference + public List getParentWorks() { return BeanRelation.list(this, EProductOrder.ParentWorks); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index ed21d2d..7cf68ed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -52,10 +53,12 @@ public class ProductRouting extends BaseCode { BeanRelation.set(this, EProductRouting.Material, material); } + @JsonBackReference public List getOperations() { return BeanRelation.list(this, EProductRouting.Operations); } + @JsonBackReference public List getProductOrders() { return BeanRelation.list(this, EProductRouting.ProductOrders); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index b1676d8..eab91d2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -46,6 +47,11 @@ public class PurchaseOrder extends BaseOrder { @ApiParam(value ="多余量") private Double excessCount; + @Column(name="AUTO_SUPPLY") + @ApiParam(value ="物料计算时自动补充") + private Boolean autoSupply; + + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index f5a85dd..e74a116 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -43,6 +44,7 @@ public class SalesOrder extends BaseOrder { @ApiParam(value ="提前期计算值") private String calcLeadTime; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 2dc7c4b..44daa75 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS; import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EWork; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -115,22 +116,27 @@ public class Work extends BaseCode { BeanRelation.set(this, EWork.Order, order); } + @JsonBackReference public List getWorkResources() { return BeanRelation.list(this, EWork.WorkResources); } + @JsonBackReference public List getWorkInputs() { return BeanRelation.list(this, EWork.WorkInputs); } + @JsonBackReference public List getWorkOutputs() { return BeanRelation.list(this, EWork.WorkOutputs); } + @JsonBackReference public List getWorkRelationInputs() { return BeanRelation.list(this, EWork.WorkRelationInputs); } + @JsonBackReference public List getWorkRelationOutputs() { return BeanRelation.list(this, EWork.WorkRelationOutputs); } @@ -144,6 +150,7 @@ public class Work extends BaseCode { BeanRelation.set(this, EWork.Operation, oper); } + @JsonBackReference public List getPlanFeedbacks() { return BeanRelation.list(this, EWork.PlanFeedbacks); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 2a5dc70..c74f140 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkInput; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -62,6 +63,7 @@ public class WorkInput extends BaseAPS { BeanRelation.set(this, EWorkInput.Work, work); } + @JsonBackReference public List getWorkRelations() { return BeanRelation.list(this, EWorkInput.WorkRelations); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 16ce459..49116dd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkOutput; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -63,6 +64,7 @@ public class WorkOutput extends BaseAPS { BeanRelation.set(this, EWorkOutput.Work, work); } + @JsonBackReference public List getWorkRelations() { return BeanRelation.list(this, EWorkOutput.WorkRelations); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index 016d92e..a0f477b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import java.util.*; +import java.util.function.Consumer; public class BeanInfo { private Class cls; @@ -103,6 +104,14 @@ public class BeanInfo { return null; } + public Class getRelationClass(Enum holder) { + RelationInfo relaInfo = getRelationInfo(holder); + if (relaInfo != null) { + return relaInfo.getBeanInfo().getBeanClass(); + } + return null; + } + public RELATION_TYPE getRelationType(Enum holder) { RelationInfo relaInfo = getRelationInfo(holder); if (relaInfo != null) { @@ -120,31 +129,40 @@ public class BeanInfo { return RELATION_TYPE.INVALID; } - public List> getAllHolders() { - List> holders = new ArrayList<>(); + private void foreach(Consumer fun) { for (Map.Entry, RelationInfo> entry : relations.entrySet()) { - holders.add(entry.getKey()); + fun.accept(entry.getValue()); + } + if (this.superBeanInfo != null) { + this.superBeanInfo.foreach(fun); } + } + + public List> getAllHolders() { + List> holders = new ArrayList<>(); + foreach((RelationInfo info)->{ + holders.add(info.getHolder()); + }); return holders; } public List> getOwnerHolders() { List> owners = new ArrayList<>(); - for (Map.Entry, RelationInfo> entry : relations.entrySet()) { - if (entry.getValue().isOwner()) { - owners.add(entry.getKey()); + foreach((RelationInfo info)->{ + if (info.isOwner()) { + owners.add(info.getHolder()); } - } + }); return owners; } public List> getNormalSigns() { List> holders = new ArrayList<>(); - for (Map.Entry, RelationInfo> entry : relations.entrySet()) { - if (!entry.getValue().isOwner()) { - holders.add(entry.getKey()); + foreach((RelationInfo info)->{ + if (!info.isOwner()) { + holders.add(info.getHolder()); } - } + }); return holders; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index f68cc74..af5476a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -25,7 +25,7 @@ public class DateDuration { public static final double PRECISION = 0.00001; private String value; - private int time = 0; + private long time = 0; private double rate = 0.0; private boolean bValid = false; @@ -60,7 +60,7 @@ public class DateDuration { * 对于无效的时间区间，返回0。单位为秒。 * @return */ - public int getTime() { + public long getTime() { return this.time; } @@ -68,7 +68,7 @@ public class DateDuration { * 设置新的时间区间。 * @return */ - public void setTime(int time) { + public void setTime(long time) { this.time = time; } @@ -92,25 +92,25 @@ public class DateDuration { return "0S"; } - int iMaxTimeUnit = 4; + long iMaxTimeUnit = 4; StringBuffer strExtraString = new StringBuffer(); - int extraTime = this.time; + long extraTime = this.time; if (iMaxTimeUnit >= 4) { - int i = extraTime / 86400; + long i = extraTime / 86400; if (i > 0) { strExtraString.append(i).append("D"); } extraTime -= i * 86400; } if (iMaxTimeUnit >= 3) { - int i = extraTime / 3600; + long i = extraTime / 3600; if (i > 0) { strExtraString.append(i).append("H"); } extraTime -= i * 3600; } if (iMaxTimeUnit >= 2) { - int i = extraTime / 60; + long i = extraTime / 60; if (i > 0) { strExtraString.append(i).append("M"); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java index 373afaf..89f6644 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java @@ -10,5 +10,6 @@ package cn.estsh.i3plus.pojo.aps.enums; public enum MATERIAL_TYPE { PRODUCT, // 成品 HALF_PRODUCT, // 半成品 - RAW_MATERIAL // 原材料 + RAW_MATERIAL, // 原材料 + VIRTUAL // 虚拟件 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java new file mode 100644 index 0000000..aa66b75 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java @@ -0,0 +1,6 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EParentWork { + ProductOrder, + Works +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java index 9ad0f8a..5b2f068 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EProductOrder { - ProductRouting + ProductRouting, + ParentWorks } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 507848d..59568c1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EWork { Order, + ParentWork, WorkResources, WorkInputs, WorkOutputs, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java new file mode 100644 index 0000000..f71fb80 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ParentWork; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ParentWorkRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml index 65c1fe1..3b1c1f3 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml @@ -8,6 +8,4 @@ - - \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml new file mode 100644 index 0000000..5db40d1 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml index 40fa8d7..983dd3b 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml @@ -1,3 +1,5 @@ + + \ No newline at end of file From 82fe491bd33951e2f142e51d3bc07d4796505a3f Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 30 Sep 2019 09:25:26 +0800 Subject: [PATCH 24/33] =?UTF-8?q?#1050=20=E5=B7=A5=E4=BD=8D=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 93 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 + .../i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 4 + .../estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 5 ++ .../pojo/mes/pcn/model/PlcCacheKeyModel.java | 5 +- .../pojo/mes/pcn/model/StationRequestBean.java | 4 + .../pcn/repository/MesWcEquipmentRepository.java | 13 +++ .../i3plus/pojo/mes/bean/MesProdRouteCfg.java | 4 + .../cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 4 + 10 files changed, 135 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 6795c79..13a75d7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -905,7 +905,8 @@ public class MesEnumUtil { STEP_CONTENT("stepContent", "工步内容"), MODULE_CONTENT("moduleContent", "组件内容"), CUSTOM_COMPONENT("customComponent", "定制内容"), - TASK_COMPLETE("taskComplete", "整个扫描完成"); + TASK_COMPLETE("taskComplete", "整个扫描完成"), + RENEW_REQUEST_PARAMS("renewRequestParams","回传刷新StationResultBean"); private String value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 1fba6f6..c40458a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1160,4 +1160,97 @@ public class MesPcnEnumUtil { } } + /** + * MesRoute 流程的类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_TYPE { + + SCAN(10, "扫描流程"), + MONITOR(20, "监控流程"); + + private int value; + private String description; + + ROUTE_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 String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } + + /** + * redis过期时间 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXPIRE_TIME { + + NEVER(-1, "不过期"), + ONE_HOUR(3600, "一小时"), + ONE_MIN(60, "一分钟"); + + private int value; + private String description; + + EXPIRE_TIME(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 String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index 64a9e9c..f25e3b5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -78,4 +78,8 @@ public class MesPlc extends BaseBean { @Column(name = "ENABLED") @ApiParam("是否启用 0 false 1 true") private Integer enabled; + + @Column(name = "PLC_CFG") + @ApiParam("PLC的值的设定") + private String plcCfg; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java index d76b0d8..8295380 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java @@ -38,4 +38,8 @@ public class MesProdRouteCfg extends BaseBean { @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java index 1a2949f..315c1f4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -38,4 +38,9 @@ public class MesRoute extends BaseBean { @Column(name = "POSITION") @ApiParam("GOJS位置") private String position; + + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java index ef2610f..46c84c5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java @@ -21,14 +21,13 @@ public class PlcCacheKeyModel { private String tag; - public PlcCacheKeyModel(String channel, String device, String tag) { - this.channel = channel; + public PlcCacheKeyModel( String device, String tag) { this.device = device; this.tag = tag; } public String getPlcCacheKey() { - return channel + ":" + device + ":" + tag; + return device + ":" + tag; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java index 9ee5b73..cf69df3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -57,4 +58,7 @@ public class StationRequestBean implements Serializable { */ @ApiParam("业务类型") private String busiType; + + @ApiParam("工单号") + private String workOrderNo; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java new file mode 100644 index 0000000..e1e757d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java @@ -0,0 +1,13 @@ +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.MesWcEquipment; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/28 12:04 PM + * @Description: + **/ +public interface MesWcEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index d66c490..8ef8f1e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -38,4 +38,8 @@ public class MesProdRouteCfg extends BaseBean { @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index fadd550..603403b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -38,4 +38,8 @@ public class MesRoute extends BaseBean { @Column(name = "POSITION") @ApiParam("GOJS位置") private String position; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; } From 692110b92b0c40786e1bf538ea231f7275e81f12 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Mon, 30 Sep 2019 12:10:44 +0800 Subject: [PATCH 25/33] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=B5=81=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E7=BB=B4=E6=8A=A4=E3=80=91=E5=A2=9E=E5=8A=A0=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=A4=84=E7=90=86=E6=A8=A1=E5=BC=8F=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 84ecce4..8736d15 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3632,5 +3632,63 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 物流规则 处理模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTING_RULE_MODE { + CREATE_TASK(10, "CREATE_TASK", "生成任务"), + AUTO_OPT(20, "AUTO_OPT", "自动操作"), + MENU_OPT(30, "MENU_OPT", "手工操作"), + AUTO_OPT_NON_TRANS(20, "AUTO_OPT_NON_TRANS", "自动操作无交易"); + + private int value; + private String code; + private String description; + + ROUTING_RULE_MODE(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 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; + } + } } \ No newline at end of file From 8beee972a9b54aac9fa7c01ece6050ae7cc5599e Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Mon, 30 Sep 2019 12:14:08 +0800 Subject: [PATCH 26/33] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=B5=81=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E7=BB=B4=E6=8A=A4=E3=80=91=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A8=A1=E5=BC=8F=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 8736d15..016db6d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3643,7 +3643,6 @@ public class WmsEnumUtil { AUTO_OPT(20, "AUTO_OPT", "自动操作"), MENU_OPT(30, "MENU_OPT", "手工操作"), AUTO_OPT_NON_TRANS(20, "AUTO_OPT_NON_TRANS", "自动操作无交易"); - private int value; private String code; private String description; From e90c59ccf2f04d98b87ca0b58fc0dbb0920a9618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 30 Sep 2019 13:31:59 +0800 Subject: [PATCH 27/33] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E5=BD=93=E6=9F=A5=E8=AF=A2=E5=88=B0=E5=A4=9A=E6=9D=A1=E5=AD=90?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=97=B6=E6=9F=A5=E8=AF=A2=E7=9A=84SQL?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BF=94=E5=9B=9EitemQty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 82a84e2..cd708d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -92,11 +92,14 @@ public class WmsBom extends BaseBean { return this.itemQty == null ? 0 : this.itemQty.doubleValue(); } - public WmsBom(){} - public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum) { + public WmsBom() { + } + + public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty) { this.itemPartNo = itemPartNo; this.itemPartNam = itemPartNam; this.itemUnit = itemUnit; this.bomNum = bomNum; + this.itemQty = itemQty; } } From 4ceba7144cf0ac3a16f1073104813ea4e789fa5f Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Mon, 30 Sep 2019 14:06:36 +0800 Subject: [PATCH 28/33] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=B5=81=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E4=BF=AE=E6=94=B9=E3=80=91=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=80=BC=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 016db6d..a1fa720 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3642,7 +3642,7 @@ public class WmsEnumUtil { CREATE_TASK(10, "CREATE_TASK", "生成任务"), AUTO_OPT(20, "AUTO_OPT", "自动操作"), MENU_OPT(30, "MENU_OPT", "手工操作"), - AUTO_OPT_NON_TRANS(20, "AUTO_OPT_NON_TRANS", "自动操作无交易"); + AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"); private int value; private String code; private String description; From 5a5b7b882e273de03118752ea10c704c36aa5e34 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Mon, 30 Sep 2019 14:13:55 +0800 Subject: [PATCH 29/33] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 84ecce4..e659006 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3351,7 +3351,10 @@ public class WmsEnumUtil { public enum INVENTORY_DIFFERENCE_TYPE { INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"), INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"), - INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"); + INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"), + INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"), + INVENTORY_FIT(50, "INVENTORY_FIT", "库位一致"), + INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘"); private int value; private String code; From 980cb2a56b45e5e6504f9463b62ad27d765f42f2 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 30 Sep 2019 16:50:05 +0800 Subject: [PATCH 30/33] add product order spread to aps --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 8 +++--- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 8 +----- .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 14 ++++++++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 32 ++++++++++++++++------ .../estsh/i3plus/pojo/aps/holders/EOperation.java | 3 +- .../estsh/i3plus/pojo/aps/holders/EParentWork.java | 1 + .../src/main/resources/relations/ParentWork.xml | 2 ++ .../src/main/resources/relations/Work.xml | 2 +- 8 files changed, 47 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 074435b..a6f4432 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -34,12 +34,12 @@ public class BaseOrder extends BaseCode { @ApiParam(value ="优先级") private Integer priority; - @Column(name="最晚结束时刻") - @ApiParam(value ="工作筛选") + @Column(name="LET") + @ApiParam(value ="最晚结束时刻") private Date let; - @Column(name="最早开始时刻计算值") - @ApiParam(value ="工作筛选") + @Column(name="CALC_EST") + @ApiParam(value ="最早开始时刻计算值") private Date calcEst; @Column(name="CALC_LET") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 9c6b580..620909a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import org.springframework.context.annotation.Bean; import javax.persistence.Column; import javax.persistence.Entity; @@ -108,7 +107,7 @@ public class Operation extends BaseAPS { } @JsonBackReference - public List getOperResources() { + public List getOperResources() { return BeanRelation.list(this, EOperation.OperResources); } @@ -120,9 +119,4 @@ public class Operation extends BaseAPS { this.standOperationId = std != null ? std.getId() : 0l; BeanRelation.set(this, EOperation.StandOperation, std); } - - @JsonBackReference - public List getWorks() { - return BeanRelation.list(this, EOperation.Works); - } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index d066cc9..a81d45f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -37,6 +37,11 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Long productOrderId; + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(property = false) + private Long operationId; + public BaseOrder getProductOrder() { return BeanRelation.get(this, EParentWork.ProductOrder); } @@ -46,6 +51,15 @@ public class ParentWork extends BaseAPS { BeanRelation.set(this, EParentWork.ProductOrder, order); } + public Operation getOperation() { + return BeanRelation.get(this, EParentWork.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EParentWork.Operation, oper); + } + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EParentWork.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 44daa75..ee20430 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -107,6 +107,11 @@ public class Work extends BaseCode { @FieldAnnotation(property = false) private Long operationId; + @Column(name="PARENT_WORK_ID") + @ApiParam(value ="父工作") + @FieldAnnotation(property = false) + private Long parentWorkId; + public BaseOrder getOrder() { return BeanRelation.get(this, EWork.Order); } @@ -116,6 +121,24 @@ public class Work extends BaseCode { BeanRelation.set(this, EWork.Order, order); } + public Operation getOperation() { + return BeanRelation.get(this, EWork.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EWork.Operation, oper); + } + + public ParentWork getParentWork() { + return BeanRelation.get(this, EWork.ParentWork); + } + + public void setParentWork(ParentWork parentWork) { + this.parentWorkId = parentWork != null ? parentWork.getId() : 0l; + BeanRelation.set(this, EWork.ParentWork, parentWork); + } + @JsonBackReference public List getWorkResources() { return BeanRelation.list(this, EWork.WorkResources); @@ -141,15 +164,6 @@ public class Work extends BaseCode { return BeanRelation.list(this, EWork.WorkRelationOutputs); } - public Operation getOperation() { - return BeanRelation.get(this, EWork.Operation); - } - - public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; - BeanRelation.set(this, EWork.Operation, oper); - } - @JsonBackReference public List getPlanFeedbacks() { return BeanRelation.list(this, EWork.PlanFeedbacks); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java index 42f06cc..85a4795 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java @@ -5,6 +5,5 @@ public enum EOperation { OperInputs, OperOutputs, OperResources, - StandOperation, - Works + StandOperation } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java index aa66b75..334c388 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java @@ -2,5 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EParentWork { ProductOrder, + Operation, Works } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml index 5db40d1..9572cad 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml @@ -1,5 +1,7 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 1bb7816..5bb1d26 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -10,7 +10,7 @@ - + From d8c740819cdc15a2280bfb6c17de9bcc38b75dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 30 Sep 2019 18:41:40 +0800 Subject: [PATCH 31/33] =?UTF-8?q?FTP=E9=80=82=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 4 ++-- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 9 +++++++- .../i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 27 ++++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitFile.java | 3 ++- .../pojo/softswitch/bean/BsSuitSchedule.java | 4 ++++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 2 +- 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 31c96aa..1a64e2d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -133,7 +133,7 @@ public class BlockSoftSwitchEnumUtil { CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"), /* FTP */ - CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,15001,"Client FTP客户端适配器"); + CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"); private int value; private String description; @@ -663,7 +663,7 @@ public class BlockSoftSwitchEnumUtil { private FTP_ENCODE (int value,String encode, String description) { this.value = value; - this.value = value; + this.encode = encode; this.description = description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 1019b4e..a39b0e4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; /** * @Description : @@ -170,6 +169,14 @@ public class CommonEnumUtil { public static String valueOfDescription(int val) {return valueOf(val);} public static int descriptionOfValue(String desc) {return descOf(desc);} + public static boolean valueOfBoolean(int val) { + if(val == TRUE.value){ + return true; + }else { + return false; + } + } + } /** diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index 6dba956..db6e129 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -12,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 : @@ -46,16 +49,40 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "读取并清空") private Integer isReadAndEmpty; + public boolean isReadAndEmpty(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndEmpty); + } + @Column(name = "IS_READ_AND_DELETE") @ApiParam(value = "读取并删除") private Integer isReadAndDelete; + public boolean isReadAndDelete(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndDelete); + } + @Column(name = "IS_NEED_TRAVERSAL") @ApiParam(value = "是否需要遍历") private Integer isNeedTraversal; + public boolean isNeedTraversal(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isNeedTraversal); + } + @Column(name = "IS_INCREMENTAL_READ") @ApiParam(value = "是否增量读取") private Integer isIncrementalRead; + public boolean isIncrementalRead(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead); + } + + @Transient + @ApiParam(value = "是否增量读取") + private String tempSuitFilePath; + + @Transient + @ApiParam(value = "适配文件列表") + public List bsSuitFileList; + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index 8c228ba..d6a3655 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -48,7 +48,8 @@ public class BsSuitFile extends BaseBean { @Column(name = "FILE_ID") @ApiParam(value = "文件id") - private String fileId; + @JsonSerialize(using = ToStringSerializer.class) + private Long fileId; @Column(name = "FILE_NAME") @ApiParam(value = "文件名称") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java index 378a7cd..3f0cee2 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -39,6 +39,10 @@ public class BsSuitSchedule extends BaseBean { @ApiParam(value = "适配套件名称") private String suitCaseNameRdd; + @Column(name = "SUIT_CASE_CODE") + @ApiParam(value = "适配套件代码") + private String suitCaseCode; + @Column(name = "SCHEDULE_NAME") @ApiParam(value = "任务名称") private String scheduleName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index e5e4f2b..0f00093 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -179,7 +179,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean); From 72c9a5892d6db514c139b7bbe63160c44b836597 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 8 Oct 2019 10:47:48 +0800 Subject: [PATCH 32/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java index 9283664..243e1b4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="MES_CUSTOMER") -@Api("客户产线代码") +@Api("客户信息") public class MesCustomer extends BaseBean { @Column(name="CUSTOMER_CODE") @ApiParam("客户代码") From 9b6887dd406226010ee1721421251ad779fae9a8 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 8 Oct 2019 11:14:56 +0800 Subject: [PATCH 33/33] =?UTF-8?q?#1050=20=E5=B7=A5=E4=BD=8D=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 4 +--- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java index 8295380..d345465 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java @@ -39,7 +39,5 @@ public class MesProdRouteCfg extends BaseBean { @ApiParam("流程代码") private String routeCode; - @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") - private Integer routeType; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java index 315c1f4..90fc4d3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -35,12 +35,13 @@ public class MesRoute extends BaseBean { @ApiParam("流程名称") private String routeName; + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; + @Column(name = "POSITION") @ApiParam("GOJS位置") private String position; - @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") - private Integer routeType; }