From 4b65842d6ff5b4301834125de1efe56fe607da54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 12 Oct 2020 17:46:41 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=A1=B9=E7=9B=AE=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/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 da89988..fcc4640 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 @@ -2246,6 +2246,9 @@ public class MesHqlPack { if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } + if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCenterCode(), "workCenterCode", packBean); + } if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesProduceSnTravel.getCreateDateTimeStart(), From 7a29b8584896ab2b6c0dd9da5cc1727e5bc7395b Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 12 Oct 2020 19:33:20 +0800 Subject: [PATCH 2/9] =?UTF-8?q?Fix=20Bug=20#11733=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E8=B4=A7=E8=BF=9B=E5=BA=A6=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=BC=96=E8=BE=91=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 00036f6..64708ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -75,6 +75,10 @@ public class WmsASNMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; + @Column(name = "REASON") + @ApiParam(value = "原因", example = "1") + public String reason; + @ApiParam("ASN详情列表") @Transient public List asnMasterDetailsList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index ee49f3e..64ae284 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -199,6 +199,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "部门名称", example = "1") public Integer departName; + @Column(name = "REASON") + @ApiParam(value = "原因", example = "1") + public String reason; + @Transient @ApiParam("周总数") private Integer weekRcCount; From 44b5635e788e87c4db5841465590a2856780c09c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 12 Oct 2020 20:00:27 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3PO=E7=94=9F=E4=BA=A7=E4=BB=BB=E5=8A=A1=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=B3=E8=81=94=E8=A1=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index 9c33dde..65e0354 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -55,4 +55,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { @ApiParam(value = "拆分条码") public Integer splitSn; + + @ApiParam("关联单据行号") + public String refItem; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 99716c7..522d086 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -145,6 +147,11 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("交易类型") public String transTypeCodeRdd; + @Column(name = "REF_ITEM") + @ApiParam("关联单据行号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refItem; + @Transient @ApiParam("工厂代码集合") private List organizeCodeList; From 9c1965ea6ca8f830f4150bf120ab57113a80fd17 Mon Sep 17 00:00:00 2001 From: songss Date: Tue, 13 Oct 2020 11:38:28 +0800 Subject: [PATCH 4/9] =?UTF-8?q?11653=2019073=20=E5=AE=89=E7=81=AF=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index 14e008f..2c76fac 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java @@ -51,10 +51,12 @@ public class AndonCellEventCause extends BaseBean implements Serializable { @ApiParam(value = "事件原因代码") private String ecCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "安灯类型名称") private String alarmCodeName; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "事件原因描述") private String ecName; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index 6fef604..b6856ba 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java @@ -51,10 +51,12 @@ public class AndonCellEventMethod extends BaseBean implements Serializable { @ApiParam(value = "处理方法代码") private String emCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "安灯类型名称") private String alarmCodeName; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "处理方法描述") private String emName; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java index cd82b84..d4fb382 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java @@ -62,10 +62,12 @@ public class AndonCellGroupCfg extends BaseBean implements Serializable { @ApiParam(value = "纵坐标") private Float verticalAxis; + @AnnoOutputColumn(hidden = true) @Column(name = "ABNORMAL_SRC") @ApiParam(value = "异常图片") private String abnormalSrc; + @AnnoOutputColumn(hidden = true) @Column(name = "NORMAL_SRC") @ApiParam(value = "正常图片") private String normalSrc; From 629e6af9a949bea440c56420930aa1f94ef9c972 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 13 Oct 2020 16:17:18 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8C=87=E5=AF=BC?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java | 8 ++++++++ .../estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java | 12 +++++++++--- .../estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java | 7 ++++++- .../pojo/mes/model/excel/mgnbj/SparePartsImportModel.java | 3 --- 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java index 7e79763..0fe1e32 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java @@ -55,6 +55,14 @@ public class MesEquTaskStandard extends BaseBean implements Serializable { @ApiParam("操作指导") private String actionGuide; + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("操作指导文件路径") + private String actionGuideUrl; + + @Column(name = "FILE_ID") + @ApiParam("操作指导文件id") + private Long fileId; + @Transient @ApiParam(value = "生产线") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index e506922..212214d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -59,6 +59,10 @@ public class MesEquTaskStandardRecord extends BaseBean implements Serializable { @ApiParam("操作指导") private String actionGuide; + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("操作指导") + private String actionGuideUrl; + @Column(name = "CHECK_VALUE") @ApiParam("检测值") private String checkValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java index 2d1e39c..57704b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java @@ -2,10 +2,12 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -41,15 +43,19 @@ public class MesWorkCellStatus extends BaseBean implements Serializable { @Column(name = "TIME_OUT_STATUS") @ApiParam("超时状态") - private Integer timeOutStatus; + private Integer timeOutStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); @Column(name = "DELAY_HELP_STATUS") @ApiParam("延迟帮助状态") - private Integer delayHelpStatus; + private Integer delayHelpStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); @Column(name = "EMERGENCY_STOP_STATUS") @ApiParam("紧急停止状态") - private Integer emergencyStopStatus; + private Integer emergencyStopStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "FINISH_COUNT") + @ApiParam("完成数量") + private Integer finishCount = 0; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java index 732f977..441bb08 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java @@ -64,6 +64,9 @@ public class MesEquTaskStandardModel implements Serializable { @ApiParam("设备类别") private String equipmentCategoryName; + @ApiParam("操作指导文件路径") + private String actionGuideUrl; + public MesEquTaskStandardModel() { @@ -72,7 +75,8 @@ public class MesEquTaskStandardModel implements Serializable { public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, - String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard) { + String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard, + String actionGuideUrl) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -90,5 +94,6 @@ public class MesEquTaskStandardModel implements Serializable { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; this.modifyDatetimeStandard = modifyDatetimeStandard; + this.actionGuideUrl = actionGuideUrl; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java index 91fb090..eaecea7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -55,7 +55,4 @@ public class SparePartsImportModel { @ApiParam("用量") private Integer qty; - @ApiParam("单元格编号") - private Map cellNoMap = new HashMap<>(); - } From 05f493b80e7f732f4fecf860abf7451a19f1e4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Oct 2020 17:17:07 +0800 Subject: [PATCH 6/9] =?UTF-8?q?feat(softswitch):=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=87=8D=E8=AF=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 4 ++ .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 5 ++ 3 files changed, 63 insertions(+) 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 6cbc54a..23191f8 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 @@ -98,6 +98,15 @@ public class BlockSoftSwitchEnumUtil { } return tmp; } + + public static SUIT_MODE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } } /** @@ -1106,4 +1115,49 @@ public class BlockSoftSwitchEnumUtil { } + /** + * 适配重试方法 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SUIT_RETRY_METHOD { + RESET_MESSAGE_STATE(10, "重置报文状态"), + RE_EXECUTE(20, "重新执行"); + + private int value; + private String description; + + private BS_SUIT_RETRY_METHOD (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static BS_SUIT_RETRY_METHOD valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 9b21a42..69f23a8 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -51,6 +51,10 @@ public class BsSuitCase extends BaseBean { return caseTypeId.intValue(); } + public String getCaseTypeTxt() { + return BlockSoftSwitchEnumUtil.CASE_TYPE.valueOfDescription(getCaseTypeIdVal()); + } + @Column(name = "CASE_DETAIL_ID") @ApiParam(value = "适配器明细id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index f13d15b..76b54fe 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -131,6 +131,11 @@ public class BsSuitRecord extends BaseBean { @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class) private Integer processState; + public String getProcessStateTxt() { + return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() : + BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState); + } + @Column(name = "PROCESS_TIME") @ApiParam(value = "处理时间") private String processTime; From b186af893c732488f071eba578f877db1a95b930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Oct 2020 17:17:59 +0800 Subject: [PATCH 7/9] =?UTF-8?q?feat(softswitch):ftp=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 f80ec78..0f5fcf7 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 @@ -83,6 +83,13 @@ public class SuitServerModel implements Serializable { private BsSuitCaseModel bsSuitCaseModel; /** + * 适配发送报文信息 + */ + @XStreamOmitField + private String suitSendMessage; + + + /** * 请求来源 */ // @XStreamImplicit From c442845f942958f549bfd93c425cd4596d1150ec Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 13 Oct 2020 20:47:45 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=B7=B3=E5=BA=8F=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 11 +++++++---- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java | 8 ++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) 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 3af6f5c..03ff681 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 @@ -2063,7 +2063,8 @@ public class MesEnumUtil { MES_MODEL_GRADE(600, "modelGradeExcelService", "车型等级导入"), MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"), MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"), - MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"); + MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), + MES_JISA(640, "jisaExcelService", "JISA导入"); private int value; private String service; @@ -3415,7 +3416,7 @@ public class MesEnumUtil { REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), SPARE_RETURN_REPAIR(140, "客退备件返修"), - HOP_SEQ_ORDER(150, "跳序工单"); + SEIZE_SEAT_ORDER(150, "占位工单"); private int value; private String description; @@ -4612,7 +4613,8 @@ public class MesEnumUtil { LANDED(20, "下达"), CANCEL(30, "取消"), OFFLINE(40, "下线"), - SHIPMENT(50, "发运"); + SHIPMENT(50, "发运"), + SPECIAL(60, "特殊标识"); private int value; private String description; @@ -4648,7 +4650,8 @@ public class MesEnumUtil { public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), EMPTYING(20, "放空"), - ERR_PERCH(30, "异常占位"); + ERR_PERCH(30, "异常占位"), + PERCH_HANDLE(40, "占位处理"); private int 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 99133a8..bcf75a5 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 @@ -1916,7 +1916,7 @@ public class MesPcnEnumUtil { REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), SPARE_RETURN_REPAIR(140, "客退备件返修"), - HOP_SEQ_ORDER(150, "跳序工单"); + SEIZE_SEAT_ORDER(150, "占位工单"); private int value; private String description; @@ -2071,6 +2071,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_ORDER_STATUS { + WAIT_LANDED(5, "待下达"), NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java index 64e9e70..31edd81 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -4,6 +4,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.HashMap; +import java.util.Map; + /** * @Description: * @Author: jokelin @@ -71,6 +74,11 @@ public class QueueJitActualModel { @ApiParam("物料号") private String partName; + @ApiParam("mgn标识") + private String mgnFlag; + + @ApiParam("单元格编号") + private Map cellNoMap = new HashMap<>(); public QueueJitActualModel() { From 08687a7e14bb65843d9318261b623958e89da76d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 14 Oct 2020 01:23:20 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index ec42f52..d0a79d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -68,7 +68,7 @@ public class WmsActionModule extends BaseBean { @Column(name = "IS_SCRIPT_MODULE", columnDefinition = "int default 2") @ApiParam(value = "是否脚本组件") - private Integer isScriptModule = FALSE; + private Integer isScriptModule; /** * 是否脚本组件 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 49ce84f..aecde2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -50,7 +50,8 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BUSI_SCENE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=BUSI_SCENE_TYPE_DICTIONARY", listColumnName = "name", explicitColumnName = "dictionaryValue") public Integer busiSceneType;