From f363979f24464f87e9d3eb432242cc65b2a73a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 23 Mar 2021 15:34:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#3328?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/mesdata/WmsSendPartCheck.java | 41 ++++++++++++++++++++++ .../pojo/wms/bean/mesdata/WmsSendSnCheck.java | 35 ++++++++++++++++++ .../mesdata/WmsSendPartCheckRepository.java | 18 ++++++++++ .../mesdata/WmsSendSnCheckRepository.java | 18 ++++++++++ 4 files changed, 112 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendPartCheck.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendSnCheck.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendPartCheckRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendSnCheckRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendPartCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendPartCheck.java new file mode 100644 index 0000000..dd3264d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendPartCheck.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.bean.mesdata; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description 发运物料校验基础数据（源于MES同步） + * @Reference + * @Author dragon + * @CreateDate 2021/3/22 11:32 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "wms_send_part_check") +@Api("发运物料校验数据") +public class WmsSendPartCheck extends BaseBean { + private static final long serialVersionUID = 5370578735799188359L; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "IS_CHECK") + @ApiParam("是否校验") + public Integer isCheck; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendSnCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendSnCheck.java new file mode 100644 index 0000000..44b42d1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/mesdata/WmsSendSnCheck.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.bean.mesdata; + + +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.*; + +/** + * @Description 发运条码校验基础数据（源于MES同步） + * @Reference + * @Author dragon + * @CreateDate 2021/3/22 11:32 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "wms_send_sn_check") +@Api("发运条码绑定关系校验数据") +public class WmsSendSnCheck extends BaseBean { + private static final long serialVersionUID = 2140873585281055846L; + + @Column(name = "SN") + @ApiParam("产品条码") + public String sn; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendPartCheckRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendPartCheckRepository.java new file mode 100644 index 0000000..a3e14ea --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendPartCheckRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository.mesdata; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import cn.estsh.i3plus.pojo.wms.bean.mesdata.WmsSendPartCheck; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +/** +* @Description : 库存条码dao层 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-17 15:53 +* @Modify: +**/ +public interface WmsSendPartCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendSnCheckRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendSnCheckRepository.java new file mode 100644 index 0000000..9a54049 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/mesdata/WmsSendSnCheckRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository.mesdata; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import cn.estsh.i3plus.pojo.wms.bean.mesdata.WmsSendSnCheck; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +/** +* @Description : 库存条码dao层 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-17 15:53 +* @Modify: +**/ +public interface WmsSendSnCheckRepository extends BaseRepository { +} From 38d03b1060638251808547395166dcae4c51019c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 29 Mar 2021 10:36:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= 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 ++- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 2 files changed, 5 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 f175d1f..d4d2787 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 @@ -3747,7 +3747,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATION_REQUEST_BEAN_CMD { JUMP_STATE(10, "JUMP_STATE", "跳过状态点"), - FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点"); + FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点"), + FORCE_JUMP_PROCESS(30, "FORCE_JUMP_PROCESS", "通过DOSCAN强制跳过工序"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index dcfc6b9..06aec88 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -91,6 +91,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步序号") private Integer stepSeq; + @ApiParam("强制跳过工序") + private Boolean forceJumpProcess = false; + @ApiParam("强制执行工步代码") private String forceSpecStepCode; From a61f2c1778b2d5d599abfe94e19477fbc68ab328 Mon Sep 17 00:00:00 2001 From: github33 <337942886@qq.com> Date: Mon, 29 Mar 2021 15:12:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?CYCLE=5FRULE--=E6=96=B0=E5=A2=9E=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 9c8aff7..6b0573d 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 @@ -9216,9 +9216,9 @@ public class WmsEnumUtil { TWENTY_SECONDS("0/20 * * * * ?", "TWENTY_SECONDS", "二十秒一次"), EVERY_DAY("0 0 0 * * ?", "EVERY_DAY", "每天零点"), EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"), - NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点"); - - + NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点"), + NINE("0 0 9 * * ?", "NINE", "早上九点"), + NINTEEN("0 0 21 * * ?", "NINTEEN", "晚上九点"); private String value; private String code; private String description;