From 763b88b4209d6d8d194c57f7f5658f971a26b616 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 13 Aug 2020 16:54:29 +0800 Subject: [PATCH 1/4] =?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 2/4] =?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 3/4] =?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 { +} From 6ba2d2826af44339e2f82a5027f2a20694e0ca60 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 13 Aug 2020 22:56:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E9=BA=A6=E6=A0=BC=E7=BA=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=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/wms/bean/WmsCSRange.java | 4 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 3a6c6f6..9ba02c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -74,9 +74,9 @@ public class WmsCSRange extends BaseBean { @ApiParam(value = "库存数量", example = "0") public Double qty; - @Column(name = "LOT_NO", nullable = false) + @Column(name = "LOT_NO") @ApiParam("收货批次") - public String lotNo = ""; + public String lotNo; @Transient @ApiParam("存储区编号组") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 212b746..8776fad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -466,4 +466,13 @@ public class WmsDocMovementDetails extends BaseBean { this.custNo = custNo; } + public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo,Integer priority,String createDatetime) { + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + this.priority = priority; + this.createDatetime = createDatetime; + } + }