From 74cc0c757d1b30517d4b47e47669e8e2555d75a4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 12 Aug 2020 19:57:11 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 11 +++++++++-- .../java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index f4b82d7..b71500a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -94,6 +94,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("项目代码") private String prodCfgTypeCode; + @ApiParam("配方内容") + private String formulaContent; + public QueueOrderModel() { } @@ -227,7 +230,7 @@ public class QueueOrderModel implements Serializable { //getWaitQueueOrderModelNoSnMgn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode, - String vinCode) { + String vinCode, String formulaContent, String queueGroupNo) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -245,11 +248,13 @@ public class QueueOrderModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.prodCfgTypeCode = prodCfgTypeCode; this.vinCode = vinCode; + this.formulaContent = formulaContent; + this.queueGroupNo = queueGroupNo; } //getAlreadyQueueOrderModelNoSnMgn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode) { + String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -263,6 +268,8 @@ public class QueueOrderModel implements Serializable { this.serialNumber = serialNumber; this.prodCfgTypeCode = prodCfgTypeCode; this.vinCode = vinCode; + this.formulaContent = formulaContent; + this.queueGroupNo = queueGroupNo; } //getAlreadyQueueOrderModelNoSn diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 2ac3a02..405eeb6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -108,4 +108,11 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("产品配置名称") private String prodCfgCodeName; + @ApiParam("项目代码") + private String prodCfgTypeCode; + @ApiParam("产品位置") + private String produceCategoryCode; + @ApiParam("结果") + private String result; + } From 89bd4f189a1637e9e2fb64d398e2f0facbb87bee Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 12 Aug 2020 21:04:07 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java index 419799b..d648c10 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java @@ -37,4 +37,12 @@ public class MesProdCfgType extends BaseBean implements Serializable { @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") private String prodCfgTypeName; + + @Column(name = "PCT_VERSION") + @ApiParam("项目版本") + private String pctVersion; + + @Column(name = "DWG_VERSION") + @ApiParam("图纸版本") + private String dwgVersion; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index 5a00f18..e1066b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -61,4 +62,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable { @Column(name = "OPTION_TYPE") @ApiParam("选配类型") private Integer optionType; + + @Transient + @ApiParam("物料类型3") + private String categoryCode3; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 405eeb6..c7f67a2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -114,5 +114,13 @@ public class StepPrintSnModel extends MesProduceSn { private String produceCategoryCode; @ApiParam("结果") private String result; + @ApiParam("项目版本") + private String pctVersion; + @ApiParam("图纸版本") + private String dwgVersion; + @ApiParam("班次名称") + private String shiftName; + @ApiParam("JIT排序号") + private String jitSeq; } From 0d3a8a3af729294a504c885b74b543f3ce4e8fea Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 12 Aug 2020 23:18:36 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=BE=E8=A1=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 3b86867..2d69e23 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 @@ -4067,7 +4067,8 @@ public class MesPcnEnumUtil { JUMP_STEP(20, "跳过工步"), JUMP_STATE(30, "跳过状态点"), ABNORMAL_DEDUCTION(40, "扣减异常"), - REDO_STATION(50, "工位重做"); + REDO_STATION(50, "工位重做"), + RELEASE(60, "放行继续"); private int value; private String description; From 2d52fe0a407ec14b9387d398ac19b494e3edc8b7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 13 Aug 2020 13:53:15 +0800 Subject: [PATCH 4/9] Fix Bug #10535 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index c7f67a2..7f07cff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -122,5 +122,7 @@ public class StepPrintSnModel extends MesProduceSn { private String shiftName; @ApiParam("JIT排序号") private String jitSeq; + @ApiParam("产品位置名称") + private String produceCategoryName; } From 19b1bfb9b6cd13f7f66ac661980e882bdb7fbb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 13 Aug 2020 15:46:54 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 16df925..efeeefb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -184,6 +184,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("队列类型") private Integer queueType; + @Transient + @ApiParam("等级名称") + private String gradeName; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } From 4ec98581829abe93f16a5005f493a3cdc14ce3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 13 Aug 2020 15:51:37 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2625?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 29 ++++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index aa46876..f04cc9c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -90,9 +90,9 @@ public class WmsMoveMaster extends BaseBean { private String partNo; @Transient - @ApiParam("状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") - private Integer itemStatus; + @ApiParam("明细状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class) + private String itemStatus; @Transient @ApiParam("erp库存地") @@ -135,10 +135,14 @@ public class WmsMoveMaster extends BaseBean { private String srcZoneNo; @Transient - @ApiParam("处理数量") + @ApiParam("需求数量") private Double transQty; @Transient + @ApiParam("处理数量") + private Double handledQty; + + @Transient @ApiParam("不合格处理数量") private Double rejectQty; @@ -197,7 +201,7 @@ public class WmsMoveMaster extends BaseBean { this.errorMessage = errorMessage; this.busiTypeCode = busiTypeCode; this.partNo = partNo; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.refOrderNo = refOrderNo; this.carNo = carNo; this.refSrc = refSrc; @@ -220,7 +224,7 @@ public class WmsMoveMaster extends BaseBean { this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.unit = unit; this.srcWhNo = srcWhNo; this.srcZoneNo = srcZoneNo; @@ -237,22 +241,25 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } - public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, - String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, - String createDatetime, String createUser, String modifyUser, String modifyDatetime, String refSrc) { + public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, + String transTypeName, Integer itemStatus,String unit, String srcWhNo, String srcZoneNo, + String destWhNo, String destZoneNo, Double transQty,Double handledQty,Double rejectQty, + String fixId, Integer busiTypeCode,String createDatetime, String createUser, String modifyUser, + String modifyDatetime, String refSrc) { this.orderNo = orderNo; this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.unit = unit; this.srcWhNo = srcWhNo; this.srcZoneNo = srcZoneNo; this.destWhNo = destWhNo; this.destZoneNo = destZoneNo; this.transQty = transQty; + this.handledQty = handledQty; this.rejectQty = rejectQty; this.fixId = fixId; this.busiTypeCode = busiTypeCode; @@ -272,7 +279,7 @@ public class WmsMoveMaster extends BaseBean { this.partNameRdd = partNameRdd; this.transTypeCode = transTypeCode; this.transTypeName = transTypeName; - this.itemStatus = itemStatus; + this.itemStatus = itemStatus.toString(); this.unit = unit; this.srcWhNo = srcWhNo; this.srcZoneNo = srcZoneNo; From 763b88b4209d6d8d194c57f7f5658f971a26b616 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 13 Aug 2020 16:54:29 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E6=AD=A5=E8=A7=A6=E5=8F=91=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java index bad1874..7b08457 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java @@ -51,6 +51,10 @@ public class MesStep extends BaseBean implements Serializable { @ApiParam("工步对象") private String stepObject; + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + /** * 工位扫描业务所需使用字段 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 4d37f07..e3fcd90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -82,11 +82,15 @@ public class StepModel implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("触发类型") + private Integer triggerType; + public StepModel() { } public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) { + String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, + String workCellCode, Integer triggerType) { this.stepCode = stepCode; this.stepName = stepName; this.stepText = stepText; @@ -98,5 +102,6 @@ public class StepModel implements Serializable { this.paramCode = paramCode; this.stepDisplayName = stepDisplayName; this.workCellCode = workCellCode; + this.triggerType = triggerType; } } From 38f9adc2dd286bde2c3e8bf4cf4856ac14854299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 13 Aug 2020 19:40:44 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=9010554=2019048--=E5=96=B7=E6=B6=82?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E8=BD=A6=E9=97=B4=E7=9A=84=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=EF=BC=81-2020-08-13=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 04924a2..a6caac9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -221,6 +221,7 @@ public class MesPcnHqlPack { mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean); return packBean; } From a5ea72f593fa249bf4de86a0ede40ec41473d01f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 13 Aug 2020 19:43:08 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=AE=9E=E4=BD=93=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesLocation.java | 61 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 8 +++ .../pojo/mes/repository/MesLocationRepository.java | 15 ++++++ 3 files changed, 84 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java new file mode 100644 index 0000000..9ce2fba --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :MES_库位信息 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LOCATION") +@Api("MES_库位信息") +public class MesLocation extends BaseBean implements Serializable { + private static final long serialVersionUID = -896118285166769048L; + @Column(name = "LOCATION_CODE") + @ApiParam("库位代码") + private String locationCode; + + @Column(name = "LOCATION_NAME") + @ApiParam("库位名称") + private String locationName; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0d; + + @Column(name = "MAX_QTY") + @ApiParam("最大存储量") + private Integer maxQty = 0; + + @Transient + @ApiParam("物料名称") + private String partNameRdd; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 560dcd0..f07a65e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -132,6 +132,14 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("包装二维码") private String qrCode; + @Column(name = "LOCATION_CODE") + @ApiParam("库位代码") + private String locationCode; + + @Transient + @ApiParam("目标库位代码") + private String destLocationCode; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java new file mode 100644 index 0000000..ab1fbc1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLocationRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfProductOffLine; +import cn.estsh.i3plus.pojo.mes.bean.MesLocation; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:32 + * @Modify: + **/ +public interface MesLocationRepository extends BaseRepository { +}