From 8c4ae6ff342b4fe0e2337ed30229ae1230026dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 23 Oct 2020 17:51:10 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2893,2894?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 6 +++- .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 39 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 4 +++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index bb34224..3010027 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -278,8 +278,8 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("物料编号") public String partNo; - @ApiParam(value = "标题") @Transient + @ApiParam(value = "标题") public String title; @Transient @@ -346,6 +346,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("目标库位代码") public String destLocateNo; + @Transient + @ApiParam("查询状态集合") + public List orderStatusList; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 47d5248..b8df6db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 库位物料表 @@ -87,6 +88,26 @@ public class WmsLocatePart extends BaseBean { @ApiParam("库位类型") private Integer locateType; + @Transient + @ApiParam("库位类型") + private List locateTypeList; + + @Transient + @ApiParam("物料类型") + private List partTypeList; + + @Transient + @ApiParam(value = "存储区") + private String zoneNo; + + @Transient + @ApiParam(value = "仓库") + private String whNo; + + @Transient + @ApiParam(value = "库存单位") + private String stockUnit; + public Double getMin() { return this.min == null ? 0 : this.min; } @@ -107,5 +128,23 @@ public class WmsLocatePart extends BaseBean { return this.min ==null?0:this.min.doubleValue(); } + public WmsLocatePart() { + } + public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double min, + Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo, + String stockUnit) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.pullQty = pullQty; + this.max = max; + this.min = min; + this.isGeneratePicklist = isGeneratePicklist; + this.safetyStock = safetyStock; + this.moq = moq; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.stockUnit = stockUnit; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index e92e884..abd240f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -86,6 +86,10 @@ public class WmsSerialSnTrans extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isOk; + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + @Transient @ApiParam("操作类型") private List transTypeLst; From 586365dc6956089011c22c4bc8a77f4ed022149e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 27 Oct 2020 18:31:37 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2893,#2894,#2901?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) 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 b28e142..13650d8 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 @@ -7479,7 +7479,8 @@ public class WmsEnumUtil { PICK(40, "REPAIR", "挑选"), REPAIR(50, "REPAIR", "返修"), BIND(60, "BIND", "绑定"), - OUTSTOCK(70, "OUTSTOCK", "出库"); + OUTSTOCK(70, "OUTSTOCK", "出库"), + RE_PACKING(80, "RE_PACKING", "重绑"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index abd240f..b59daf8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -36,7 +36,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name = "BATCH_NO") @ApiParam(value = "BATCH号") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String batchNo; @Column(name="SERIAL_SN") @@ -47,7 +47,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="BH_TYPE") @ApiParam("BH类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) private Integer bhType; @Column(name = "PART_NO") @@ -77,19 +77,26 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="TRANS_TYPE") @ApiParam("操作类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class) private Integer transType; @Column(name = "IS_OK") @ApiParam(value = "是否合格") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE", isRequire = 2) private Integer isOk; @Column(name = "LOT_NO") @ApiParam("生产批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lotNo; + @Column(name = "STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_DETAILS_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_DETAILS_STATUS.class) + @ApiParam("状态") + private Integer status; + @Transient @ApiParam("操作类型") private List transTypeLst; From c9378a7d8cb7ca6abc8ae913f7d229f04daeeaf4 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 28 Oct 2020 19:37:52 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E3=80=9011959=2019125+PDA=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=8B=86=E5=88=86=E6=95=B0=E9=87=8F=E8=B6=85=E8=BF=87?= =?UTF-8?q?100=E9=83=A8=E5=88=86=EF=BC=8C=E6=9D=A1=E7=A0=81=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E4=B8=8D=E5=A2=9E=E5=8A=A0=E3=80=82+1020=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index e336469..c136a32 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -237,7 +237,7 @@ public class DdlPreparedPack { */ public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%"); + packBean.addColumnQuery("rl_"+columnName, " and model." + columnName + " like :m_rl_" + columnName, val + "%"); } } @@ -250,7 +250,7 @@ public class DdlPreparedPack { */ public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val); + packBean.addColumnQuery("ll_"+columnName, " and model." + columnName + " like :m_ll_" + columnName, "%" + val); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 293f70d..f036e0d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1749,11 +1749,14 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); - DdlPreparedPack.getOrderByPack( + /*DdlPreparedPack.getOrderByPack( new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE}, - new String[]{"sn", "createDatetime"}, result); + new String[]{"sn", "createDatetime"}, result);*/ +// result.setWhereAppend(result.getWhereAppend() + " and sn <> '"+wmsStockSn.getSn()+"'"); + return result; } From 31cdda5b33e0918b9fd042c6b188df6439271596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 28 Oct 2020 20:24:07 +0800 Subject: [PATCH 04/11] =?UTF-8?q?feat(softswitch):=E9=80=82=E9=85=8D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95,FTP=E6=96=87=E4=BB=B6=E6=94=AF=E6=8C=81SID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 8 ++-- .../pojo/model/softswitch/SuitClientModel.java | 30 +++++++++++++++ .../i3plus/pojo/model/softswitch/SuitModel.java | 45 ++++++++++++++++++++++ .../pojo/model/softswitch/SuitRecordModel.java | 4 ++ .../pojo/model/softswitch/SuitServerModel.java | 17 ++++++++ .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 9 +++++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 8 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.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 23191f8..753cfb3 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 @@ -231,7 +231,8 @@ public class BlockSoftSwitchEnumUtil { CLOUD(5,"Cloud调用"), REST(6,"REST调用"), WEB_SERVICE(7,"WebService"), - SOCKET(8,"socket"); + SOCKET(8,"socket"), + RETRY(9,"重试"); private int value; private String 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 f401265..337c41d 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 @@ -245,12 +245,12 @@ public class CommonEnumUtil { return tmp; } - public static int descOf(boolean desc) { - return desc ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); + public static int boolOfOfVal(boolean boolVal) { + return boolVal ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } - public static int descOf(int desc) { - return desc == 0 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); + public static int intOfVal(int boolIntVal) { + return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } public static TRUE_OR_FALSE valueOfEnum(int value){ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 4c82b54..7a1eea4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -39,6 +39,17 @@ public class SuitClientModel implements Serializable { private Integer actionId; /** + * 调用方自定义标识 + */ + @XStreamAsAttribute + private String suitSid; + + /** + * 重试记录id + */ + private Long retryRecordId; + + /** * 适配器信息 */ private BsSuitCaseModel suitCaseModel; @@ -142,4 +153,23 @@ public class SuitClientModel implements Serializable { // 设置默认 this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } + + public SuitClientModel(SuitModel suitModel, BsSuitCaseModel suitCaseModel) { + this.requestSource = suitModel.getRequestSource(); + this.suitSid = suitModel.getSuitSid(); + this.retryRecordId = suitModel.getRetryRecordId(); + + this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); + this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId(); + this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode(); + this.suitCaseModel = suitCaseModel; + + // 设置默认 + this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + // 设置默认 + this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + // 设置默认 + this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java new file mode 100644 index 0000000..984bf02 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * 软适配执行适配器(客户端服务端适配总入口) + * 所需的参数模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-10-28 15:51 + * @Modify: + **/ +@Data +public class SuitModel implements Serializable { + + private static final long serialVersionUID = 8981933192688480221L; + + @ApiParam(value = "适配器代码") + private String suitCaseCode; + + @ApiParam(value = "适配SID") + private String suitSid; + + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.REQUEST_SOURCE.class) + @ApiParam(value = "适配来源") + private Integer requestSource; + + @ApiParam(value = "重试记录id") + private Long retryRecordId; + + @ApiParam(value = "适配器参数XML") + private String paramXml; + + @ApiParam(value = "适配器参数") + private List bsSuitCaseParamList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java index 5367486..2b5db90 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import io.swagger.annotations.ApiModel; @@ -23,6 +24,9 @@ public class SuitRecordModel { @ApiModelProperty("适配文件") private BsSuitFile bsSuitFile; + @ApiModelProperty("分页信息") + private Pager pager; + public SuitRecordModel() { } 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 0f5fcf7..4dd5f5f 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 @@ -39,6 +39,13 @@ public class SuitServerModel implements Serializable { // 请求ID private String requestId; + + // 调用方自定义标识 + private String suitSid; + + // 重试记录id + private Long retryRecordId; + // 传输单对象 @XmlElement(name = "data") @XStreamAlias("data") @@ -110,4 +117,14 @@ public class SuitServerModel implements Serializable { // @XStreamImplicit private String analyzeMessage; + + public SuitServerModel(){ + } + public SuitServerModel(SuitModel suitModel){ + this.suitCaseCode = suitModel.getSuitCaseCode(); + this.requestSource = suitModel.getRequestSource(); + this.suitSid= suitModel.getSuitSid(); + this.retryRecordId = suitModel.getRetryRecordId(); + this.obj = suitModel.getParamXml(); + } } 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 76b54fe..3f03e22 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 @@ -61,6 +61,15 @@ public class BsSuitRecord extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseDetailId; + @Column(name = "SUIT_SID") + @ApiParam(value = "适配记录SID") + private String suitSid; + + @Column(name = "RETRY_RECORD_ID") + @ApiParam(value = "重试记录id") + @JsonSerialize(using = ToStringSerializer.class) + private Long retryRecordId; + @Column(name = "SUIT_METHOD_ID") @ApiParam(value = "适配方式id枚举（定时适配，主动适配）") private Integer suitMethodId; 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 2d9e16d..afb8677 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 @@ -320,6 +320,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); + DdlPreparedPack.getStringLikePack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); From f57f4e25be275d94de508184790e667313534826 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 28 Oct 2020 22:00:29 +0800 Subject: [PATCH 05/11] =?UTF-8?q?mgn-bj=20=E6=80=BB=E5=B1=8F=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 40 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 4 +++ .../i3plus/pojo/mes/model/QueueJitActualModel.java | 8 +++++ .../i3plus/pojo/mes/model/mgnbj/BjBoardModel.java | 41 ++++++++++++++++++++++ .../pojo/mes/model/mgnbj/BjBoardSeriesModel.java | 18 ++++++++++ 5 files changed, 111 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.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 a0e0dde..fa8307a 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 @@ -7972,4 +7972,44 @@ public class MesEnumUtil { } } + /** + * 看板-安灯监控状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_QUEUE_STATUS { + CALL(10, "呼叫"), + RESPONSE(20, "响应"), + SOLVE(30, "解决"); + + private int value; + private String description; + + ANDON_QUEUE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + 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; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 0739b8d..4e32b80 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -98,4 +98,8 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工位类型名称") private String workCellTypeName; + @Transient + @ApiParam("安灯呼叫状态") + private Integer andonQueueStatus; + } 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 31edd81..5e40bdc 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 @@ -111,4 +111,12 @@ public class QueueJitActualModel { this.createDatetime = createDatetime; } + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String produceCtgyCode, String custPlantCode, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.produceCtgyCode = produceCtgyCode; + this.custPlantCode = custPlantCode; + this.createDatetime = createDatetime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java new file mode 100644 index 0000000..421d7e5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/10/28 11:27 AM + * @Modify: + */ +@Data +public class BjBoardModel implements Serializable { + + @ApiParam("jsa数量") + private Integer jsaQty; + @ApiParam("完成数量") + private Integer completeQty; + @ApiParam("总数量") + private Integer totalQty; + @ApiParam("预警数量") + private Integer warnQty; + @ApiParam("预警率") + private Integer warnRate; + @ApiParam("目标合格率") + private Integer targetRate = 0; + @ApiParam("一次合格率") + private Integer onceQualityRate = 0; + + @ApiParam("x坐标内容") + private String xAxis; + + @ApiParam("x坐标内容") + private List xAxisList; + + @ApiParam("显示数据") + private List seriesModels; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java new file mode 100644 index 0000000..fa764fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/10/28 2:56 PM + * @Modify: + */ +@Data +public class BjBoardSeriesModel { + @ApiParam("名称") + private String name; + @ApiParam("显示数量") + private Integer qty; +} From 104fa0efa5444fcd71185b4927b020d549751ba4 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Wed, 28 Oct 2020 22:09:05 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=AE=8C=E6=88=90ERP=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java index 7e712f7..26af6b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java @@ -24,10 +24,15 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_ERP_QUAN_AREAS") -public class WmsErpQuanAreas extends BaseBean { +public class WmsErpQuanAreas extends BaseBean implements Comparable { private static final long serialVersionUID = 5560607687871639209L; @Column(name="AREA_NO") @ApiParam("库存地点") - public String area_no; + public String areaNo; + + @Override + public int compareTo(WmsErpQuanAreas o) { + return this.getAreaNo().compareTo(o.getAreaNo()); + } } From 6d4e8608c47d88513a8a32dc4dd8d0a4c96c205c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 29 Oct 2020 03:54:12 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=B3=A8=E5=A1=91=20=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=BC=80=E5=8F=91=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfProductOffLine.java | 13 +++- .../pojo/mes/bean/MesBoardLineCoordsMatrix.java | 53 ++++++++++++++++ .../i3plus/pojo/mes/bean/MesBoardLineMatrix.java | 73 ++++++++++++++++++++++ .../pojo/mes/bean/MesBoardLineStaffMatrix.java | 61 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesLineFaultRecord.java | 43 +++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesStaff.java | 58 +++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 13 ++-- .../pojo/mes/model/{mgnbj => mgn/bj}/CodeRule.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Document.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Head.java | 2 +- .../{mgnbj => mgn/bj}/JisaJphReportModel.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Message.java | 2 +- .../model/{mgnbj => mgn/bj}/MgnBjJitPlanModel.java | 2 +- .../{mgnbj => mgn/bj}/MgnBjRecipePartsModel.java | 2 +- .../mes/model/{mgnbj => mgn/bj}/OptionCode.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Part.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Parts.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Pn.java | 3 +- .../i3plus/pojo/mes/model/mgn/tj/AndonModel.java | 20 ++++++ .../i3plus/pojo/mes/model/mgn/tj/DefectModel.java | 22 +++++++ .../pojo/mes/model/mgn/tj/GoodRateModel.java | 26 ++++++++ .../i3plus/pojo/mes/model/mgn/tj/OeeModel.java | 30 +++++++++ .../pojo/mes/model/mgn/tj/ProductivityModel.java | 20 ++++++ .../pojo/mes/model/mgn/tj/StaffMatrixModel.java | 24 +++++++ .../MesBoardLineCoordsMatrixRepository.java | 16 +++++ .../repository/MesBoardLineMatrixRepository.java | 16 +++++ .../MesBoardLineStaffMatrixRepository.java | 16 +++++ .../repository/MesLineFaultRecordRepository.java | 16 +++++ .../pojo/mes/repository/MesStaffRepository.java | 16 +++++ 29 files changed, 542 insertions(+), 17 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/CodeRule.java (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Document.java (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Head.java (94%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/JisaJphReportModel.java (82%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Message.java (95%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/MgnBjJitPlanModel.java (97%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/MgnBjRecipePartsModel.java (83%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/OptionCode.java (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Part.java (96%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Parts.java (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Pn.java (92%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index ba85092..b9aeefa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -1,11 +1,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.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +29,8 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PRODUCT_OFF_LINE") +@NoArgsConstructor +@AllArgsConstructor @Api("生产报工表") public class IfProductOffLine extends BaseBean implements Serializable { @@ -153,4 +156,12 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "BASE_MODULE") @ApiParam("BaseModule零件号") private String baseModule; + + public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) { + this.partNo = partNo; + this.packageNo = packageNo; + this.qty = qty; + this.workCenterCode = workCenterCode; + this.qcStatus = qcStatus; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java new file mode 100644 index 0000000..aa0bce6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE_COORDS_MATRIX") +@Api("MES_看板产线坐标") +public class MesBoardLineCoordsMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = -7823702941907604215L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "X_AXIS") + @ApiParam("X坐标") + private String xAxis; + + @Column(name = "Y_AXIS") + @ApiParam("Y坐标") + private String yAxis; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java new file mode 100644 index 0000000..d8e07a0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE_MATRIX") +@Api("MES_看板产线矩阵") +public class MesBoardLineMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = 4414374274261870347L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "PICTURE_URL") + @ApiParam("产线图片路径") + private String pictureUrl; + + @Column(name = "USER_FIRST") + @ApiParam("用户编号1") + private String userFirst; + + @Column(name = "USER_SECOND") + @ApiParam("用户编号2") + private String userSecond; + + @Column(name = "USER_THIRD") + @ApiParam("用户编号3") + private String userThird; + + @Column(name = "USER_FORTH") + @ApiParam("用户编号4") + private String userForth; + + @Column(name = "USER_FIFTH") + @ApiParam("用户编号5") + private String userFifth; + + @Column(name = "USER_SIXTH") + @ApiParam("用户编号6") + private String userSixth; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java new file mode 100644 index 0000000..ee461b9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE_STAFF_MATRIX") +@Api("MES_看板产线员工能力矩阵") +public class MesBoardLineStaffMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = 1889056360071546259L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位代码") + private String workCellCode; + + @Column(name = "USER_CODE") + @ApiParam("员工编号") + private String userCode; + + @Column(name = "X_AXIS") + @ApiParam("X坐标") + private Double xAxis; + + @Column(name = "Y_AXIS") + @ApiParam("Y坐标") + private Double yAxis; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java new file mode 100644 index 0000000..5380410 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/10/27 13:29 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LINE_FAULT_RECORD") +@Api("产线故障记录表") +public class MesLineFaultRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6108659377329720059L; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "FAULT_TIME") + @ApiParam("故障时长（分）") + private Double faultTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java new file mode 100644 index 0000000..29ffebf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : 员工信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STAFF") +@Api("员工信息") +public class MesStaff extends BaseBean implements Serializable { + private static final long serialVersionUID = -8330599945613548761L; + + @Column(name = "USER_CODE") + @ApiParam("员工编号") + private String userCode; + + @Column(name = "USER_NAME") + @ApiParam("姓名") + private String userName; + + @Column(name = "PICTURE_URL") + @ApiParam("照片路径") + private String pictureUrl; + + @Column(name = "SKILL_LEVEL") + @ApiParam("技能等级") + private Integer skillLevel; + + @Transient + private Double xAxis; + + @Transient + private Double yAxis; + + @Transient + private String workCellCode; +} 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 fce6b31..fa677a8 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 @@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description: @@ -387,6 +386,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("已报工数量") private Integer productOffLineQty; + @Transient + @ApiParam("生产节拍") + private Integer takt; + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } @@ -419,10 +423,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { return this.approvalStatus == null ? 0 : this.approvalStatus; } - public MesWorkOrder(){} + public MesWorkOrder() { + } - public MesWorkOrder(String orderNo,String startTime,String workCenterCode,Double qty, - String partNo,String partNameRdd,String itemPartNo,Double itemQty){ + public MesWorkOrder(String orderNo, String startTime, String workCenterCode, Double qty, + String partNo, String partNameRdd, String itemPartNo, Double itemQty) { this.orderNo = orderNo; this.startTime = startTime; this.workCenterCode = workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java index 50601e8..67ed3eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java index cfe4ed4..6ea1cca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java similarity index 94% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java index 7d1c6f2..be1576f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java similarity index 82% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java index 4c4035b..411faac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java similarity index 95% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java index ef61c84..7b7fdc9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java similarity index 97% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java index d9dd5d5..b1219aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java similarity index 83% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java index e61fa14..e85a236 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java index 8a7070f..45c78ff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java similarity index 96% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java index 55efd0e..63d2725 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java index 740b5a0..6916568 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java similarity index 92% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java index fbf4020..9822683 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java @@ -1,11 +1,10 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java new file mode 100644 index 0000000..2c4c39f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 17:30 + * @desc + */ +@Data +public class AndonModel { + + private String workCenterCode; + + private Double xAxis; + + private Double yAxis; + + private String expInfo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java new file mode 100644 index 0000000..5513e58 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/28 13:47 + * @desc + */ +@Data +public class DefectModel { + + private String workCenterCode; + + private Map percents; + + private Integer total; + + private String queryBeginTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java new file mode 100644 index 0000000..3b95ac3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 20:50 + * @desc + */ +@Data +public class GoodRateModel { + + private String workCenterCode; + + private Double goodRate; + + private Integer total; + + private Integer goodTotal; + + private String color; + + private Double passPercentMax; + + private Double passPercentMin; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java new file mode 100644 index 0000000..fcf204f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 13:47 + * @desc + */ +@Data +public class OeeModel { + + private String workCenterCode; + + private Integer takt; + + private Integer standardTakt; + + private String color; + + private Double threshold = 0.03; + + private Double realProductivity; + + private Double oeePercent; + + private Double realWorkTime; + + private String shiftBeginTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java new file mode 100644 index 0000000..a3ea101 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 14:10 + * @desc + */ +@Data +public class ProductivityModel { + + private String time; + + private Integer planProductivity; + + private Integer realProductivity; + + private boolean isCurrentInfo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java new file mode 100644 index 0000000..cb9a30e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import cn.estsh.i3plus.pojo.mes.bean.MesStaff; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/10/28 21:44 + * @desc + */ +@Data +public class StaffMatrixModel { + + private List workCenterCodes; + + private String currentWorkCenterCode; + + private String workCenterPictureUrl; + + private List staffs; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java new file mode 100644 index 0000000..c259074 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineCoordsMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineCoordsMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java new file mode 100644 index 0000000..b381acf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java new file mode 100644 index 0000000..95ecb83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineStaffMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineStaffMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java new file mode 100644 index 0000000..a367516 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesLineFaultRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesLineFaultRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java new file mode 100644 index 0000000..ddd50d4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStaff; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStaffRepository extends BaseRepository { +} From 20ee1215d2b3ef31798650ee4e2b046dd42085c1 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 29 Oct 2020 03:59:46 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E5=8C=85=E5=90=8D?= =?UTF-8?q?=E7=BB=86=E5=8C=96=20=E5=AF=BC=E8=87=B4=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java index 421d7e5..fee720e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java index fa764fa..3b113ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import io.swagger.annotations.ApiParam; import lombok.Data; From 37c95dc6b32b8401b5a405833b4947b8e8ff67c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 29 Oct 2020 10:36:44 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/MgnBoardAssembleCompRateModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java index e4e28cb..d4fc145 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -18,4 +18,31 @@ public class MgnBoardAssembleCompRateModel { @ApiParam("合格率偏差值") private String fpyDeviationValue; + @ApiParam("日期") + private String date; + + @ApiParam("目标OEE") + private String planOee; + + @ApiParam("实际OEE") + private String finaOee; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷占比") + private String defectProportion; + + @ApiParam("一次目标良品值") + private Double planFirstPassYield; + + @ApiParam("最终目标良品值") + private Double planPassYield; + + @ApiParam("一次良品率") + private String firstQualifiedRate; + + @ApiParam("最终良品率") + private String finalQualifiedRate; + } From 5487c165ff9ec0abebba8e04d31e8a8682ae4349 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 29 Oct 2020 13:22:50 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E3=80=9011883=2020021--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E9=A2=86=E6=96=99=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?--1023=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 49 ++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java | 100 +++++++++++++++++++++ .../pojo/wms/repository/WmsPlcRepository.java | 16 ++++ 3 files changed, 165 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.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 cdd8873..c6deb39 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 @@ -9243,4 +9243,53 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * PLC业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_BUSI_TYPE { + DR(10, "DR", "DR"), + DF(20, "DF", "DF"), + IP(30, "IP", "IP"); + + private int value; + private String code; + private String description; + + PLC_BUSI_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); + } + } } + + + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java new file mode 100644 index 0000000..b2d9ee2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.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 : 2020-10-28 9:54 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PLC") +@Api("WMSPLC配置表") +public class WmsPlc extends BaseBean { + + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + + @Column(name = "PLC_NAME") + @ApiParam("PLC名称") + private String plcName; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.PLC_BUSI_TYPE.class) + private Integer busiType; + + @Column(name = "OPC_URL") + @ApiParam("OPC路径") + private String opcUrl; + + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + + @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 = "DATA_TYPE") + @ApiParam("标签类别") + private Integer dataType;*/ + + @Column(name = "USER_NAME") + @ApiParam("用户名") + private String userName; + + @Column(name = "PASSWORD") + @ApiParam("密码") + private String password; + + @Column(name = "START_VALUE") + @ApiParam("开始节点") + private Integer startValue; + + @Column(name = "end_VALUE") + @ApiParam("结束节点") + private Integer endValue; + + @Column(name = "NAME_SPACE_INDEX") + @ApiParam("空间索引") + private Integer nameSpaceIndex = 2; + + @Column(name = "REQUEST_INTERVAL") + @ApiParam("请求间隔") + private Double requestInterval = 500.0; + + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java new file mode 100644 index 0000000..da8fa53 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.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.WmsPlc; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-10-28 10:47 + * @Modify: + **/ +@Repository +public interface WmsPlcRepository extends BaseRepository { +} From 3dc951c34f804b70e50484d303264e74e501ec5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 29 Oct 2020 14:38:23 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E3=80=9011964=2019048-=E5=96=B7=E6=B6=82?= =?UTF-8?q?=E6=8A=9B=E5=85=89=E6=8A=A5=E8=A1=A8=E5=8F=98=E6=9B=B4-20201021?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ++++++++++++++++++++++ .../mes/model/MgnPaintPolishingReportModel.java | 3 + 2 files changed, 80 insertions(+) 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 a0e0dde..8ca0b5a 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 @@ -7972,4 +7972,81 @@ public class MesEnumUtil { } } + /** + * 不良品处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BAD_HANDLE_TYPE { + BACK_SPRAY(10, "BACK_SPRAY", "返喷"), + SCRAPPED(20, "SCRAPPED", "报废"), + POLISHING(30, "POLISHING", "抛光"), + DETERMIND(40, "DETERMIND", "待定"); + + private int value; + private String code; + private String description; + + BAD_HANDLE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOf(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) { + return valueOf(val); + } + + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java index 5f7725a..99ff6fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java @@ -39,4 +39,7 @@ public class MgnPaintPolishingReportModel { @ApiParam("组织代码") private String organizeCode; + @ApiParam("不良处理类型") + private String defectActionType; + }