From d223ff242dd9614bf81c7a31bfe21b767874c291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 23 Feb 2021 14:29:53 +0800 Subject: [PATCH 01/16] =?UTF-8?q?BUG14132=20#=E6=B5=81=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E5=AE=B6=E5=9C=A8=E9=87=8D=E7=BD=AE=E4=B9=8B=E5=90=8E=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E4=BA=86=E4=B8=80=E4=B8=AA=E6=96=B0=E7=9A=84=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BD=86=E6=98=AF=E6=B2=A1=E6=9C=89=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=89=8D=E7=AB=AF=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=90=8E=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6=E7=AD=89=E6=B6=88?= =?UTF-8?q?=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index b1335f6..de87f69 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -243,6 +243,10 @@ public class WmsStockQuan extends BaseBean { return this.lockVersion == null ? 0 : this.lockVersion; } + public boolean getShowNoDiffStock() { + return this.showNoDiffStock == null ? false : this.showNoDiffStock; + } + public WmsStockQuan() { } From f01ae5106be5f92dd8fa3bbd6898080a3c6ebda7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 26 Feb 2021 16:32:43 +0800 Subject: [PATCH 02/16] =?UTF-8?q?14165=20=E8=BF=94=E4=BF=AE=E9=98=9F?= =?UTF-8?q?=E5=88=97=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesQueueOrderDetailRecord.java | 148 +++++++++++++++++++++ .../i3plus/pojo/mes/model/SnPrintDataModel.java | 2 + .../MesQueueOrderDetailRecordRepository.java | 13 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 4 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java new file mode 100644 index 0000000..01a4829 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java @@ -0,0 +1,148 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUEUE_ORDER_DETAIL_RECORD", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "QUEUE_GROUP_NO"), + @Index(columnList = "PRODUCE_CATEGORY_CODE") +}) +@Api("生产队列明细记录表") +public class MesQueueOrderDetailRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 7840873844253353896L; + + @Column(name = "ORDER_NO") + @ApiParam("主队列编号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("队列明细序号") + private Double seq; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "WORK_TYPE") + @ApiParam("生产类型") + private String workType; + + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品位置") + private String produceCategoryCode; + + @Column(name = "PRODUCE_CATEGORY_NAME_RDD") + @ApiParam("产品位置名称") + private String produceCategoryNameRdd; + + @Column(name = "PPT_CODE") + @ApiParam("产品类型名称") + private String pptCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + + @Column(name = "IS_GROUP_PRINTED") + @ApiParam("料架是否已打印") + private Integer isGroupPrinted = 2; + + @Column(name = "PRODUCE_COLOR") + @ApiParam("产品颜色") + private String produceColor; + + @Column(name = "PRODUCE_COLOR_CODE") + @ApiParam("产品颜色代码") + private String produceColorCode; + + @Column(name = "OPTION_CODE") + @ApiParam("选项代码") + private String optionCode; + + @Column(name = "ASSY_NO") + @ApiParam("组件编号") + private String assyNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + + @Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("已生产数量") + private Double finsihQty; + + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; + + @Column(name = "GROUP_SEQ") + @ApiParam("分组序号") + private String groupSeq; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "IS_EMPTY") + @ApiParam("是否放空") + private Integer isEmpty; + + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲标识") + private String jisBackflushStatus; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java index 257a159..fc055aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java @@ -20,6 +20,8 @@ public class SnPrintDataModel { @ApiParam("打印数据") private List valueList; + @ApiParam("打印数据") + private List templateData; @ApiParam("打印模板及参数") private MesLabelTemplate labelTemplate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRecordRepository.java new file mode 100644 index 0000000..3978ab8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderDetailRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/2/26 10:18 AM + * @Modify: + */ +public interface MesQueueOrderDetailRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index b8071c8..08737c7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2120,7 +2120,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) { - DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean); + DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); From dbeb6baac759b0106d17823cb7010e34096606af Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 26 Feb 2021 17:13:37 +0800 Subject: [PATCH 03/16] =?UTF-8?q?14185=2020027--=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF-=E6=95=B0=E6=8D=AE=E5=AF=B9=E8=B1=A1=EF=BC=8C?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=95=B0=E6=8D=AE=E6=BA=90=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=95=88-=202021-02-28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 08737c7..508ef73 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1906,6 +1906,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) { DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean); } + if (!StringUtils.isEmpty(mesDataObject.getDsCode())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getDsCode(), "dsCode", packBean); + } return packBean; } From 6318ca6afcc2232589740f4558f5e33e3a5890b5 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 1 Mar 2021 10:09:25 +0800 Subject: [PATCH 04/16] =?UTF-8?q?feat(form):=20=E5=8A=A8=E6=80=81=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 199 ++++++++++++++------- .../pojo/form/bean/BfMethodDetailProperty.java | 51 +++--- .../pojo/form/bean/BfMethodDetailPropertyRef.java | 2 +- .../i3plus/pojo/model/platform/LogFieldModel.java | 39 ++++ .../i3plus/pojo/model/platform/SysLogModel.java | 57 ++++++ .../{SystemLoginModel.java => SysLoginModel.java} | 2 +- .../pojo/platform/platbean/SysLogOperate.java | 38 ++-- 7 files changed, 286 insertions(+), 102 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java rename modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/{SystemLoginModel.java => SysLoginModel.java} (96%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 602ffd8..b53e93c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -337,6 +337,7 @@ public class BlockFormEnumUtil { return tmp; } } + /** * 元素属性显示状态信息 */ @@ -988,7 +989,6 @@ public class BlockFormEnumUtil { } - /** * 元素组织隔离 */ @@ -1209,19 +1209,19 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROPERTY_VIRTUAL_OPERATE_TYPE { - STRING_SPLICE(10, "SPLICE", "字符串拼接",String.class), - NUM_ADD(20, "ADD", "加法计算",Double.class), - NUM_LESS(30, "MIN", "减法计算",Double.class), - NUM_MAKE(40, "MUL", "乘法计算",Double.class), - NUM_DIVISION(50, "DIVISION", "除法计算",Double.class), - JOIN_TABLE(60, "JOIN_TABLE", "连表查询",String.class); + STRING_SPLICE(10, "SPLICE", "字符串拼接", String.class), + NUM_ADD(20, "ADD", "加法计算", Double.class), + NUM_LESS(30, "MIN", "减法计算", Double.class), + NUM_MAKE(40, "MUL", "乘法计算", Double.class), + NUM_DIVISION(50, "DIVISION", "除法计算", Double.class), + JOIN_TABLE(60, "JOIN_TABLE", "连表查询", String.class); private int value; private String code; private String description; private Class clzFullName; - private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description,Class clzFullName) { + private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description, Class clzFullName) { this.value = value; this.code = code; this.description = description; @@ -1298,23 +1298,23 @@ public class BlockFormEnumUtil { return tmp; } - public Object getPropertyVirtual(Object ... objs){ - if(this.getValue() == STRING_SPLICE.getValue()){ + public Object getPropertyVirtual(Object... objs) { + if (this.getValue() == STRING_SPLICE.getValue()) { return getPropertyVirtualString(objs); - }else if(this.getValue() == NUM_ADD.getValue()){ + } else if (this.getValue() == NUM_ADD.getValue()) { return getPropertyVirtualDoubleAdd(objs); - }else if(this.getValue() == NUM_LESS.getValue()){ + } else if (this.getValue() == NUM_LESS.getValue()) { return getPropertyVirtualDoubleLess(objs); - }else if(this.getValue() == NUM_MAKE.getValue()){ + } else if (this.getValue() == NUM_MAKE.getValue()) { return getPropertyVirtualDoubleMake(objs); - }else if(this.getValue() == NUM_DIVISION.getValue()){ + } else if (this.getValue() == NUM_DIVISION.getValue()) { return getPropertyVirtualDoubleDivision(objs); } return objs; } - private String getPropertyVirtualString(Object ... objs){ - if(objs != null && objs.length > 0){ + private String getPropertyVirtualString(Object... objs) { + if (objs != null && objs.length > 0) { StringBuffer result = new StringBuffer(); for (Object o : objs) { result.append(o == null ? "" : o.toString()); @@ -1324,15 +1324,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleAdd(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleAdd(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result += Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1341,15 +1341,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleLess(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleLess(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result -= Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1358,15 +1358,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleMake(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleMake(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result *= Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1375,15 +1375,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleDivision(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleDivision(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result /= Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1394,7 +1394,6 @@ public class BlockFormEnumUtil { } - /** * 执行类型信息 */ @@ -1751,8 +1750,8 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRIGGER_EVENT { - CLICK(10, "CLICK", "单击"); -// DB_LCLICK(20, "DB_LCLICK", "双击"), + CLICK(10, "CLICK", "单击"), + DOUBLE_CLICK(20, "DOUBLE_CLICK", "双击"); // MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"), // MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入"); @@ -1830,6 +1829,88 @@ public class BlockFormEnumUtil { } /** + * 触发反应枚举 + * 功能明细管理中，关联属性的操作， 可以通过事件刷新其他元素，或者通过事件打开另一个功能明细 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_ACTION { + REFRESH(10, "REFRESH", "刷新元素"), + SHOW_METHOD(20, "SHOW_METHOD", "展示其他功能明细"); + + private int value; + private String code; + private String description; + + private TRIGGER_ACTION(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static TRIGGER_ACTION valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 表单功能明细 触发效果信息 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1988,8 +2069,8 @@ public class BlockFormEnumUtil { /** * 数据状态 - * 1 启用 - * 2 禁用 + * 1 启用 + * 2 禁用 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { @@ -2105,7 +2186,7 @@ public class BlockFormEnumUtil { private String code; private String description; - private ELEMENT_TREE_DIRECTION (int value, String code, String description) { + private ELEMENT_TREE_DIRECTION(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -2153,7 +2234,7 @@ public class BlockFormEnumUtil { return tmp; } - public static ELEMENT_TREE_DIRECTION valueOf(int val) { + public static ELEMENT_TREE_DIRECTION valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -2185,7 +2266,7 @@ public class BlockFormEnumUtil { private String code; private String description; - private DATA_SOURCE_STATUS (int value, String code, String description) { + private DATA_SOURCE_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -2204,7 +2285,6 @@ public class BlockFormEnumUtil { } - public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2261,14 +2341,14 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ELEMENT_CONSTRAINT_TYPE { - UNIQUE(10, "唯一约束"); + UNIQUE(10, "唯一约束"); // 后续扩展联合主键 // PRIMARY_KEY(20, "主键约束") private int value; private String description; - private ELEMENT_CONSTRAINT_TYPE (int value, String description) { + private ELEMENT_CONSTRAINT_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -2308,13 +2388,13 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FORM_TRIGGER_SOURCE { - INTERCEPTOR(10, "拦截器"), - BUTTON(20, "按钮"); + INTERCEPTOR(10, "拦截器"), + BUTTON(20, "按钮"); private int value; private String description; - private FORM_TRIGGER_SOURCE (int value, String description) { + private FORM_TRIGGER_SOURCE(int value, String description) { this.value = value; this.description = description; } @@ -2354,16 +2434,16 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROCEDURE_COL_TYPE { - IN_PARAM(1, "入参"), - INOUT_PARAM(2, "出入参"), -// ?(3, "按钮"), - OUT_PARAM(4, "出参"), - RETURN_PARAM(5, "返回值"); + IN_PARAM(1, "入参"), + INOUT_PARAM(2, "出入参"), + // ?(3, "按钮"), + OUT_PARAM(4, "出参"), + RETURN_PARAM(5, "返回值"); private int value; private String description; - private PROCEDURE_COL_TYPE (int value, String description) { + private PROCEDURE_COL_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -2405,19 +2485,18 @@ public class BlockFormEnumUtil { * PROCEDURE_INOUT_PARAM（30）：入参-存储过程的出入参（sqlserver没有出参，都算出入参） * PROCEDURE_OUT_PARAM（40）：入参-存储过程，函数的出参 * PROCEDURE_RETURN（50）：入参-存储过程，函数的返回值（mysql存储过程没有返回值，sqlserver有） - * */ public enum ORIGIN_PROPERTY_TYPE { - NORMAL_PROPERTY(10, "正常属性"), - PROCEDURE_IN_PARAM(20, "入参"), - PROCEDURE_INOUT_PARAM(30, "出入参"), - PROCEDURE_OUT_PARAM(40, "出参"), - PROCEDURE_RETURN(50, "返回值"); + NORMAL_PROPERTY(10, "正常属性"), + PROCEDURE_IN_PARAM(20, "入参"), + PROCEDURE_INOUT_PARAM(30, "出入参"), + PROCEDURE_OUT_PARAM(40, "出参"), + PROCEDURE_RETURN(50, "返回值"); private final int value; private final String description; - private ORIGIN_PROPERTY_TYPE (int value, String description) { + private ORIGIN_PROPERTY_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -2452,7 +2531,7 @@ public class BlockFormEnumUtil { public static ORIGIN_PROPERTY_TYPE procColTypeValOf(int procColTypeVal) { ORIGIN_PROPERTY_TYPE result = NORMAL_PROPERTY; - switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))){ + switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))) { case IN_PARAM: result = PROCEDURE_IN_PARAM; break; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index 06adc7a..bd5d622 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -28,59 +28,64 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_METHOD_DETAIL_PROPERTY") -@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") +@Table(name = "BF_METHOD_DETAIL_PROPERTY") +@Api(value = "表单功能明细关联属性", description = "表单功能明细关联属性") public class BfMethodDetailProperty extends BaseBean { private static final long serialVersionUID = -7541677357317732343L; - @Column(name="METHOD_ID") - @ApiParam(value ="功能id") + @Column(name = "METHOD_ID") + @ApiParam(value = "功能id") @JsonSerialize(using = ToStringSerializer.class) private Long methodId; // 关联功能明细表id - @Column(name="PRI_METHOD_DETAIL_ID") - @ApiParam(value ="主功能明细id") + @Column(name = "PRI_METHOD_DETAIL_ID") + @ApiParam(value = "主功能明细id") @JsonSerialize(using = ToStringSerializer.class) private Long priMethodDetailId; - @Column(name="PRI_METHOD_DETAIL_NAME_RDD") - @ApiParam(value ="主功能明细名称") + @Column(name = "PRI_METHOD_DETAIL_NAME_RDD") + @ApiParam(value = "主功能明细名称") private String priMethodDetailNameRdd; - @Column(name="PRI_ELEMENT_ID") - @ApiParam(value ="主对象元素id") + @Column(name = "PRI_ELEMENT_ID") + @ApiParam(value = "主对象元素id") @JsonSerialize(using = ToStringSerializer.class) private Long priElementId; - @Column(name="PRI_ELEMENT_NAME_RDD") - @ApiParam(value ="主对象元素名称") + @Column(name = "PRI_ELEMENT_NAME_RDD") + @ApiParam(value = "主对象元素名称") private String priElementNameRdd; // 枚举:BlockFormEnumUtil.TRIGGER_EVENT - @Column(name="PRI_ELEMENT_EVENT") - @ApiParam(value ="主对象元素事件") + @Column(name = "PRI_ELEMENT_EVENT") + @ApiParam(value = "主对象元素事件") private Integer priElementEvent; - @Column(name="SEC_METHOD_DETAIL_ID") - @ApiParam(value ="关联功能明细id") + // 枚举:BlockFormEnumUtil.TRIGGER_ACTION + @Column(name = "PRI_ELEMENT_ACTION") + @ApiParam(value = "主对象元素动作") + private Integer priElementAction; + + @Column(name = "SEC_METHOD_DETAIL_ID") + @ApiParam(value = "关联功能明细id") @JsonSerialize(using = ToStringSerializer.class) private Long secMethodDetailId; - @Column(name="SEC_METHOD_DETAIL_NAME_RDD") - @ApiParam(value ="关联功能明细名称") + @Column(name = "SEC_METHOD_DETAIL_NAME_RDD") + @ApiParam(value = "关联功能明细名称") private String secMethodDetailNameRdd; - @Column(name="SEC_ELEMENT_ID") - @ApiParam(value ="关联对象元素id") + @Column(name = "SEC_ELEMENT_ID") + @ApiParam(value = "关联对象元素id") @JsonSerialize(using = ToStringSerializer.class) private Long secElementId; - @Column(name="SEC_ELEMENT_NAME_RDD") - @ApiParam(value ="关联对象元素名称") + @Column(name = "SEC_ELEMENT_NAME_RDD") + @ApiParam(value = "关联对象元素名称") private String secElementNameRdd; @Transient - @ApiParam(value ="表单功能明细关联属性") + @ApiParam(value = "表单功能明细关联属性") private List refList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java index 0a5e8be..6f48488 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_METHOD_DETAIL_PROPERTY") +@Table(name="BF_METHOD_DETAIL_PROPERTY_REF") @Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") public class BfMethodDetailPropertyRef extends BaseBean { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java new file mode 100644 index 0000000..517507e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/2/20 下午4:39 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Api("日志字段模型") +public class LogFieldModel implements Serializable { + private static final long serialVersionUID = 6303989757683476327L; + + @ApiParam("日志时间") + private String time; + + @ApiParam("线程") + private String thread; + + @ApiParam("日志等级") + private String level; + + @ApiParam("执行堆栈") + private String stack; + + @ApiParam("日志信息") + private String message; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java new file mode 100644 index 0000000..fd2b237 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/2/20 下午12:55 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Api("系统日志模型") +public class SysLogModel implements Serializable { + private static final long serialVersionUID = -2982120258911167575L; + + @ApiParam("查询日期") + private String queryDate; + + @ApiParam("查询开始时间") + private String queryBeginTime; + + @ApiParam("查询结束时间") + private String queryEndTime; + + @ApiParam("索引名称") + private String indexName; + + @ApiParam("索引类型") + private Integer indexType; + + @ApiParam("聚合时间") + private Integer aggsDuration; + + @ApiParam("日志等级") + private Integer level; + + @ApiParam("执行线程") + private String thread; + + @ApiParam("服务器环境变量HostId") + private String hostId; + + @ApiParam("日志信息") + private List logs; + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLoginModel.java similarity index 96% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLoginModel.java index 32c8d93..965ae38 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLoginModel.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Api("系统登录模型") -public class SystemLoginModel { +public class SysLoginModel { @ApiParam(value = "登录名") private String loginName; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 3558410..9c3dfc0 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -17,55 +17,59 @@ import javax.persistence.Table; /** * @Description : 用户操作日志表 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 16:58:42.720 - * @Modify : + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:42.720 + * @Modify : **/ @Data @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_OPERATE") -@Api(value="操作日志表",description = "操作日志表") +@Table(name = "SYS_LOG_OPERATE") +@Api(value = "操作日志表", description = "操作日志表") public class SysLogOperate extends BaseBean { private static final long serialVersionUID = 1515035521283176727L; - @ApiParam(value ="系统模块（枚举）", example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "系统模块（枚举）", example = "1") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description") private Integer softType; + public String getSoftTypeTxt() { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @ApiParam(value ="操作类型" , example = "-1") - @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "操作类型", example = "-1") + @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class, refForeignKey = "value", value = "description") private Integer operateType; - public String getOperateTypeTxt(){ + public String getOperateTypeTxt() { return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType); } - @ApiParam(value ="操作信息" , access ="操作信息") + @ApiParam(value = "操作信息", access = "操作信息") private String operateMessage; - @ApiParam(value ="登录用户名称" , access ="登录用户名称") + @ApiParam(value = "登录用户名称", access = "登录用户名称") private String userLoginName; - @ApiParam(value ="请求IP" , access ="请求IP") + @ApiParam(value = "请求IP", access = "请求IP") private String remoteIp; - @ApiParam(value ="请求路径" , access ="请求路径") + @ApiParam(value = "本机名/Ip", access = "本机名/Ip") + private String serverHost; + + @ApiParam(value = "请求路径", access = "请求路径") private String requestUrl; // @Column(name="HTTP_METHOD") // @ApiParam(value ="http请求方法" , access ="http请求方法") // private String httpMethod; - @ApiParam(value ="方法入参" , access ="方法入参") + @ApiParam(value = "方法入参", access = "方法入参") private String logArgs; - @ApiParam(value ="执行耗时") + @ApiParam(value = "执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; } From 5e290e81b8c204e26732245582dc6b9052192cfd Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 1 Mar 2021 11:09:35 +0800 Subject: [PATCH 05/16] number rule --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index 9071712..fa7ef4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -76,4 +76,16 @@ public class MesNumberRule extends BaseBean implements Serializable { @ApiParam("拼接固定字符,多个逗号分隔") private String spiltRule; + public Integer getBeginValVal() { + return this.beginVal == null ? 1 : this.beginVal; + } + + public Integer getSerialnoIncrementVal() { + return this.serialnoIncrement == null ? 1 : this.serialnoIncrement; + } + + public Integer getSerialnoLengthVal() { + return this.serialnoLength == null ? 1 : this.serialnoLength; + } + } From 4d814247944500af00e9c393f994189598af52f1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 1 Mar 2021 14:44:22 +0800 Subject: [PATCH 06/16] numberrule --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index fa7ef4a..95710bd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -76,15 +76,15 @@ public class MesNumberRule extends BaseBean implements Serializable { @ApiParam("拼接固定字符,多个逗号分隔") private String spiltRule; - public Integer getBeginValVal() { + public Integer getBeginVal() { return this.beginVal == null ? 1 : this.beginVal; } - public Integer getSerialnoIncrementVal() { + public Integer getSerialnoIncrement() { return this.serialnoIncrement == null ? 1 : this.serialnoIncrement; } - public Integer getSerialnoLengthVal() { + public Integer getSerialnoLength() { return this.serialnoLength == null ? 1 : this.serialnoLength; } From 919db8451e6b4fd4d731f38793b1a32e38856845 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 1 Mar 2021 16:53:48 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 22 +++++++++++++------ .../cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 4 +--- .../i3plus/pojo/aps/bean/MaterialSetTime.java | 14 ++++++------ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 18 ++++++++++++++++ .../i3plus/pojo/aps/model/ImportErrorInfo.java | 25 ++++++++++++++++++++++ 5 files changed, 66 insertions(+), 17 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 834acc7..59e4f4a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; @@ -28,23 +31,28 @@ import java.util.List; @Entity @Table(name = "APS_IMPORT_DETAIL") @Api("数据导入明细") +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ImportDetail extends BaseAPS { private static final long serialVersionUID = 1264030397500660450L; - @Column(name="group_Name") - @ApiParam(value ="组名称") + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(notEmpty = true, mainkey = true) + private String name; + + @Column(name="GROUP_NAME") + @ApiParam(value ="分组名称") @FieldAnnotation(notEmpty = true) private String groupName; @Column(name="LINK_TYPE") @ApiParam(value ="链接类型") - @FieldAnnotation(defaultValue = "EXCEL") + @FieldAnnotation(defaultValue = "EXCEL", notEmpty = true) private ApsEnumUtil.DATA_LINK_TYPE linkType; @Column(name="PATH") @ApiParam(value ="IP/文件路径") - @FieldAnnotation(notEmpty = true) private String path; @Column(name="OUT_NAME") @@ -73,7 +81,7 @@ public class ImportDetail extends BaseAPS { @Column(name="IMPORT_TYPE") @ApiParam(value ="导入类型") - @FieldAnnotation(defaultValue = "REPLACE") + @FieldAnnotation(defaultValue = "DIFF") private ApsEnumUtil.IMPORT_DETAIL_TYPE importType; @Column(name="SKIP_ROWS") @@ -87,8 +95,8 @@ public class ImportDetail extends BaseAPS { private Integer orderNumber; @Column(name="PROJECT_ID") - @ApiParam(value ="导入项目ID") - @FieldAnnotation(relation = "Project") + @ApiParam(value ="导入项目") + @FieldAnnotation(relation = "Project", property = false) private Long projectId; public ImportProject getProject() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index 24134ab..7f1f95d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -51,6 +51,7 @@ public class ImportField extends BaseAPS { @Column(name="MAX_LENGTH") @ApiParam(value = "最大长度", example = "0") + @FieldAnnotation(defaultValue = "255") private Integer maxLength; @Column(name="RELATION_TABLE") @@ -61,9 +62,6 @@ public class ImportField extends BaseAPS { @ApiParam("关联字段") private String relationField; - @Transient - private transient boolean hasDeal = false; - @Column(name="IMPORT_DETAIL_ID") @ApiParam(value ="导入明细ID") @FieldAnnotation(relation = "ImportDetail", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index b15a445..d77217c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -28,17 +28,17 @@ public class MaterialSetTime extends BaseAPS { private static final long serialVersionUID = -7996431489447641539L; @Column(name="RES_CODE") @ApiParam(value ="资源编码") - @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true, mainkey = true) private String resCode; @Column(name="PREV_MATERIAL") @ApiParam(value ="前物料编码") - @FieldAnnotation(notEmpty = true) + @FieldAnnotation(notEmpty = true, mainkey = true) private String prevMaterial; @Column(name="POST_MATERIAL") @ApiParam(value ="后物料编码") - @FieldAnnotation(notEmpty = true) + @FieldAnnotation(notEmpty = true, mainkey = true) private String postMaterial; @Column(name="TIME") @@ -46,8 +46,8 @@ public class MaterialSetTime extends BaseAPS { @FieldAnnotation(notEmpty = true) private String time; - @Column(name="PRIORITY") - @ApiParam(value ="优先级") - @FieldAnnotation(defaultValue = "10") - private Integer priority; +// @Column(name="PRIORITY") +// @ApiParam(value ="优先级") +// @FieldAnnotation(defaultValue = "10", mainkey = true) +// private Integer priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index a440ae8..1b91d43 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -313,6 +313,24 @@ public class BeanRelation { } /** + * 移除对象所有关系 + * + * @param bean + */ + public static void remove(BaseBean bean) { + if (bean == null) { + return; + } + BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); + if (beanInfo != null) { + List> holders = beanInfo.getAllHolders(); + for (Enum holder :holders) { + remove(bean, holder); + } + } + } + + /** * 移除关联 * * @param bean diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java new file mode 100644 index 0000000..c81550d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ImportErrorInfo.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : 导入校验错误信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-02-25 + * @Modify: + **/ +@Data +@Api("导入校验错误信息") +public class ImportErrorInfo { + private List headers = new ArrayList<>(); + private List> errorData = new ArrayList<>(100); + + public boolean hasErrorData() { + return !errorData.isEmpty(); + } +} From d7da6437b312276dab269f0f77a5db4afcf6b9c7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 1 Mar 2021 20:33:50 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9C=BAdao=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index e28f314..b3600b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -115,9 +115,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { public MesStateMachineStatus() { } - public MesStateMachineStatus(String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType, + public MesStateMachineStatus(Long id, String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType, String triggerEvent, String triggerWhere, Long triggerAmgId, Long inAmgId, Long outAmgId, Integer statusType, Integer seq, Integer isInit, String routeCode, String processCode) { + this.id = id; this.smCode = smCode; this.statusCode = statusCode; this.nextStatus = nextStatus; From 5b3046f48239fed9c2ddd097aace36b4b8c0f5ac Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 2 Mar 2021 09:50:24 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 70b41fe..21f9178 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -486,6 +486,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("项目名称") String prodCfgTypeName; + @Transient + @ApiParam("完成时间") + public String complateDateTime; + + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index aa83a19..838218f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -377,4 +377,9 @@ public class WmsMoveMaster extends BaseBean { public int getBusiTypeCodeVal() { return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue(); } + + public WmsMoveMaster(String createDatetime, String createUser) { + this.createDatetime = createDatetime; + this.createUser = createUser; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java index d56ff82..9490b59 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java @@ -7,18 +7,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; /** - * @Description : 零件装换信息 + * @Description : 零件转换信息 * @Reference : * @Author : puxiao.liao * @CreateDate : 2020-08-19 14:50 From 44af0f4e803a782038e214bc5aa6a2953a94d3ae Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 2 Mar 2021 11:07:21 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesBoardImage.java | 47 ---------------------- .../mes/repository/MesBoardImageRepository.java | 14 ------- 2 files changed, 61 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java deleted file mode 100644 index cfd1a27..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @CreateDate: 2020/10/13 - * @Author: simon.song - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_BOARD_IMAGE") -@Api("MES_看板图片") -public class MesBoardImage extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3511836584646450267L; - - @Column(name = "BOARD_CODE") - @ApiParam("看板代码") - private String boardCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "IMAGE_URL") - @ApiParam("图片路径") - private String imageUrl; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java deleted file mode 100644 index ff339e8..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesBoardImage; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @CreateDate: 2020/10/13 - * @Author: simon.song - */ -@Repository -public interface MesBoardImageRepository extends BaseRepository { -} From 339cbf06341c3ee3b902df0452be36743710abb8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 2 Mar 2021 20:26:19 +0800 Subject: [PATCH 11/16] =?UTF-8?q?bug:14146=20=E4=B8=80=E5=BC=A0=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=9F=A5=E8=AF=A2=E4=BA=A7=E5=93=81=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=BF=BD=E6=BA=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 12 ++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 11 +++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 0dce57a..ef86497 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -236,6 +236,18 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("物料版本号") private String versionNo; + @Transient + @ApiParam("配方内容") + private String formulaContent; + + @Transient + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Transient + @ApiParam("组内编号") + private Integer groupNo; + public MesProduceSn() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index 7f8ed36..22d2230 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -8,12 +8,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -74,4 +69,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @Column(name = "PART_COLOR_VALUE") @ApiParam("零件色值") private String partColorValue; + + @Transient + @ApiParam("物料名称") + private String partName; } From 154307b2f0786410800d1f27b111f210197c979b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 3 Mar 2021 11:12:12 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E3=80=90=E6=B3=B0=E5=9B=BD=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index 178dfe9..90acf1a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java @@ -47,6 +47,14 @@ public class MesProdCfgDetail extends BaseBean implements Serializable { @ApiParam("是否虚零件") private Integer isVirtual; + @Column(name = "IS_LEFT_PART") + @ApiParam("是否左零件") + private Integer isLeftPart; + + @Column(name = "PRINTER_NAME") + @ApiParam("打印机名称") + private String printerName; + @Transient @ApiParam("零件名称") private String partName; From 24aa100dfe64d36821ac67ce2d915e9c9a71d810 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 4 Mar 2021 15:17:21 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=80=BB=E8=A7=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java index b7c05dc..08ba812 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java @@ -35,6 +35,9 @@ public class BypassModel { @ApiParam("状态") private String status; + @ApiParam("检测结果") + private Integer result; + @ApiParam("颜色") private String color; From 2e49522aecc01eba8d3b3e26e9b83edab15ea134 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Mar 2021 16:43:46 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E3=80=9014115=2020063-BH=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8F=8A=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD-20210305=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index ab2f3a5..0d70135 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -53,5 +55,6 @@ public class WmsBhChildDetectionItem extends BaseBean { @Column(name = "VALUE_TYPE") @ApiParam("值类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class) private Integer valueType; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 5db1046..c96e9a2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -62,11 +64,13 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "VALUE_TYPE") @ApiParam("子检测箱值类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class) private Integer valueType; @Column(name = "STANDARD") @ApiParam("标准值") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_PART_CHECK_STD.class) private Integer standard; @Column(name = "MAX") From 4d40686be82c8fa2369728e5f3039f9bf5974b25 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 4 Mar 2021 17:01:24 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=9A=84=E5=85=83=E7=B4=A0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=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/form/bean/BfElement.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 6fbc911..689edcb 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -160,14 +160,14 @@ public class BfElement extends BaseBean { @ApiParam(value ="默认排序规则") private Integer elementSortAttrType; - @Lob +// @Lob @Column(name="ELEMENT_CSS_STYLE") @ApiParam(value ="元素样式") private String elementCssStyle; - @Lob +// @Lob @Column(name="ELEMENT_FORMATTER") - @ApiParam(value ="元素样式") + @ApiParam(value ="元素格式") private String elementFormatter; @Column(name="ELEMENT_DESCRIPTION") From 2a63c05597313a58da83a04d11b54923bcedef7c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 4 Mar 2021 17:02:09 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=9A=84=E5=85=83=E7=B4=A0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=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/form/bean/BfElement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 689edcb..994e590 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -167,7 +167,7 @@ public class BfElement extends BaseBean { // @Lob @Column(name="ELEMENT_FORMATTER") - @ApiParam(value ="元素格式") + @ApiParam(value ="元素格式化") private String elementFormatter; @Column(name="ELEMENT_DESCRIPTION")