From 8ae3c65cb3ecd733804d8d45eb431904f8533a08 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 14 Jul 2020 05:33:32 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=B8=89=E5=8A=9B=E5=A3=AB=E6=BC=94?= =?UTF-8?q?=E7=A4=BAdemo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 53c1be7..dd55c06 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.List; @@ -129,6 +130,9 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(property = false) private Long furnacePlanId; + @Transient + private boolean hasCominbed = false; + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java index 7116296..788b585 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java @@ -28,4 +28,5 @@ public class ReportPager extends APSPager { private Date end; // 统计结束时间 private ApsEnumUtil.MATERIAL_REPORT_TYPE type; private ApsEnumUtil.REPORT_TIME_SPAN span; // 统计时间间隔 + private String shiftCode; } From c10a7bae7e6faece2966997403ae6578eba5165c Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Sun, 26 Jul 2020 15:52:04 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index fc4acd3..9877c7e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -64,6 +64,10 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板参数拼接") private String paramsPack; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + @Transient @ApiParam(value ="模板id对应的模板参数") private List labelTemplateParamList; From f0fd8da49cf58600cdfa9e12318c8e36b5a3dad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 27 Jul 2020 23:41:16 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java index 324db04..de93034 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -58,7 +58,6 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable { @ApiParam("流程") private String routeCOde; - @Lob @Column(name = "MESSAGE") @ApiParam("异常信息") private String message; From 7d76a3ecc76c746d072a050ea0f41be58e0ef75e Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Mon, 27 Jul 2020 23:56:45 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/script/EngineScriptPersistence.java | 70 ++++++++++++++++++++++ .../pcn/script/EngineScriptPersistenceHistory.java | 60 +++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistenceHistory.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java new file mode 100644 index 0000000..8cfd100 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.mes.pcn.script; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * 脚本持久化实体类 + * + * @author Rock.Yu + * @since 2019-03-18 14:22 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "SCRIPT_PERSISTENCE") +@Api("系统动态脚本") +public class EngineScriptPersistence extends BaseBean { + private static final long serialVersionUID = 7893111140559759490L; + // 脚本调用的唯一编号，例如：WMS_PDA_0001 + @Column(name = "SCRIPT_NO", length = 50) + private String scriptNo; + + // 脚本的中文名称 + @Column(name = "SCRIPT_NAME", length = 50) + private String scriptName; + + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 + @Column(name = "SCRIPT_TYPE") + private Integer scriptType; + + // 脚本编写的语言 + // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + @Column(name = "LANGUAGE_TYPE") + private Integer languageType; + + // 脚本的具体内容 + @Lob + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + private String scriptContent; + + // 脚本的描述，包含脚本的用法，参数说明等 + @Column(name = "SCRIPT_REMARK", length = 2000) + private String scriptRemark; + + // 编译后的脚本内容，通过预编译加快脚本的运行速度 + @Transient + private Object compiledScript; + + // 构造方法，便于批量创建数据 + public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType, + String scriptContent, String scriptRemark) { + this.id = id; + this.scriptNo = scriptNo; + this.scriptName = scriptName; + this.scriptType = scriptType; + this.languageType = languageType; + this.scriptContent = scriptContent; + this.scriptRemark = scriptRemark; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistenceHistory.java new file mode 100644 index 0000000..4cd3e31 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistenceHistory.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.pcn.script; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * 脚本持久化历史记录 + * + * @author jason.niu + * @since 2020-04-29 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "SCRIPT_PERSISTENCE_HISTORY") +@Api("系统动态脚本") +public class EngineScriptPersistenceHistory extends BaseBean { + + private static final long serialVersionUID = 7201021903118622899L; + // 脚本调用的唯一编号，例如：WMS_PDA_0001 + @Column(name = "SCRIPT_NO", length = 50) + private String scriptNo; + + // 脚本的中文名称 + @Column(name = "SCRIPT_NAME", length = 50) + private String scriptName; + + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 + @Column(name = "SCRIPT_TYPE") + private Integer scriptType; + + // 脚本编写的语言 + // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + @Column(name = "LANGUAGE_TYPE") + private Integer languageType; + + // 脚本的具体内容 + @Lob + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + private String scriptContent; + + // 脚本的描述，包含脚本的用法，参数说明等 + @Column(name = "SCRIPT_REMARK", length = 2000) + private String scriptRemark; + + // 编译后的脚本内容，通过预编译加快脚本的运行速度 + @Transient + private Object compiledScript; + +} From 9104f42d42375c61c87d9463f88e4bc896a8a14c Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 28 Jul 2020 00:10:01 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E7=BC=BA=E5=A4=B1=E7=9A=84DAO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EngineScriptPersistenceHistoryRepository.java | 9 +++++ .../IEngineScriptPersistenceRepository.java | 40 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/EngineScriptPersistenceHistoryRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/EngineScriptPersistenceHistoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/EngineScriptPersistenceHistoryRepository.java new file mode 100644 index 0000000..1274e35 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/EngineScriptPersistenceHistoryRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.script.EngineScriptPersistenceHistory; +import org.springframework.stereotype.Repository; + +@Repository +public interface EngineScriptPersistenceHistoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java new file mode 100644 index 0000000..9f4da0d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.script.EngineScriptPersistence; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @Description : 脚本引擎持久化类 + * @Reference : + * @Author : Rock.Yu + * @CreateDate : 2019-04-16 09:53 + * @Modify: + **/ +@Repository +public interface IEngineScriptPersistenceRepository extends BaseRepository { + /** + * 按照工厂代码和脚本编号查询脚本实体对象 + * @param organizeCode 工厂代码 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo); + + /** + * 按照脚本编号查询脚本实体对象 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByScriptNo(String scriptNo); + + /** + * 查找所有的脚本语言类型 + * @return 数据库中已经存在的脚本语言类型 + */ + @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType") + List findGroupByLanguageType(); +} From 1d02d45e61b9e790118e6562f0280322bb8369f0 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 28 Jul 2020 00:15:00 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E7=BC=BA=E5=A4=B1=E7=9A=84DAO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/script/ScriptLoggerModel.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/ScriptLoggerModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/ScriptLoggerModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/ScriptLoggerModel.java new file mode 100644 index 0000000..a21dfb0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/ScriptLoggerModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.pcn.script; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 脚本执行日志 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-29 + * @Modify: + **/ +@Data +@Api("插件日志") +public class ScriptLoggerModel { + @ApiParam("工厂") + private Boolean error; + + @ApiParam("日志内容") + private String context; + + @ApiParam("日志打印日期") + private String printDate; +} From eef7ed9c32bc028dac0b1da69a296e1578d30303 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 28 Jul 2020 00:33:27 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=20pojo=20=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E5=85=B3=E7=B3=BB=EF=BC=8C=20mes-pcn-pojo=20=E5=B7=B2?= =?UTF-8?q?=E5=BA=9F=E5=BC=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IEngineScriptPersistenceRepository.java | 40 ------------- .../mes/pcn/script/EngineScriptPersistence.java | 70 ---------------------- .../mes/engine/script/EngineScriptPersistence.java | 23 ++++--- .../script/EngineScriptPersistenceHistory.java | 2 +- .../pojo/mes/engine}/script/ScriptLoggerModel.java | 2 +- .../EngineScriptPersistenceHistoryRepository.java | 4 +- .../IEngineScriptPersistenceRepository.java | 2 + 7 files changed, 20 insertions(+), 123 deletions(-) delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java rename modules/{i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine}/script/EngineScriptPersistenceHistory.java (97%) rename modules/{i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine}/script/ScriptLoggerModel.java (90%) rename modules/{i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes}/repository/EngineScriptPersistenceHistoryRepository.java (66%) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java deleted file mode 100644 index 9f4da0d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IEngineScriptPersistenceRepository.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.script.EngineScriptPersistence; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @Description : 脚本引擎持久化类 - * @Reference : - * @Author : Rock.Yu - * @CreateDate : 2019-04-16 09:53 - * @Modify: - **/ -@Repository -public interface IEngineScriptPersistenceRepository extends BaseRepository { - /** - * 按照工厂代码和脚本编号查询脚本实体对象 - * @param organizeCode 工厂代码 - * @param scriptNo 脚本编号 - * @return 脚本实体对象 - */ - EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo); - - /** - * 按照脚本编号查询脚本实体对象 - * @param scriptNo 脚本编号 - * @return 脚本实体对象 - */ - EngineScriptPersistence findByScriptNo(String scriptNo); - - /** - * 查找所有的脚本语言类型 - * @return 数据库中已经存在的脚本语言类型 - */ - @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType") - List findGroupByLanguageType(); -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java deleted file mode 100644 index 8cfd100..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistence.java +++ /dev/null @@ -1,70 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.script; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; - -/** - * 脚本持久化实体类 - * - * @author Rock.Yu - * @since 2019-03-18 14:22 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Table(name = "SCRIPT_PERSISTENCE") -@Api("系统动态脚本") -public class EngineScriptPersistence extends BaseBean { - private static final long serialVersionUID = 7893111140559759490L; - // 脚本调用的唯一编号，例如：WMS_PDA_0001 - @Column(name = "SCRIPT_NO", length = 50) - private String scriptNo; - - // 脚本的中文名称 - @Column(name = "SCRIPT_NAME", length = 50) - private String scriptName; - - // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 - @Column(name = "SCRIPT_TYPE") - private Integer scriptType; - - // 脚本编写的语言 - // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby - @Column(name = "LANGUAGE_TYPE") - private Integer languageType; - - // 脚本的具体内容 - @Lob - @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") - private String scriptContent; - - // 脚本的描述，包含脚本的用法，参数说明等 - @Column(name = "SCRIPT_REMARK", length = 2000) - private String scriptRemark; - - // 编译后的脚本内容，通过预编译加快脚本的运行速度 - @Transient - private Object compiledScript; - - // 构造方法，便于批量创建数据 - public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType, - String scriptContent, String scriptRemark) { - this.id = id; - this.scriptNo = scriptNo; - this.scriptName = scriptName; - this.scriptType = scriptType; - this.languageType = languageType; - this.scriptContent = scriptContent; - this.scriptRemark = scriptRemark; - } -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java index f61a055..eac13e5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java @@ -4,11 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; -import javax.script.CompiledScript; /** * 脚本持久化实体类 @@ -20,39 +20,44 @@ import javax.script.CompiledScript; @Entity @DynamicInsert @DynamicUpdate +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) @Table(name = "SCRIPT_PERSISTENCE") @Api("系统动态脚本") public class EngineScriptPersistence extends BaseBean { + private static final long serialVersionUID = 7893111140559759490L; // 脚本调用的唯一编号，例如：WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) private String scriptNo; + // 脚本的中文名称 @Column(name = "SCRIPT_NAME", length = 50) private String scriptName; + // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 @Column(name = "SCRIPT_TYPE") - private int scriptType; + private Integer scriptType; + // 脚本编写的语言 // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby @Column(name = "LANGUAGE_TYPE") - private int languageType; + private Integer languageType; + // 脚本的具体内容 @Lob - @Column(name = "SCRIPT_CONTENT") + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") private String scriptContent; + // 脚本的描述，包含脚本的用法，参数说明等 @Column(name = "SCRIPT_REMARK", length = 2000) private String scriptRemark; + // 编译后的脚本内容，通过预编译加快脚本的运行速度 @Transient - private CompiledScript compiledScript; - - public EngineScriptPersistence() { - } + private Object compiledScript; // 构造方法，便于批量创建数据 - public EngineScriptPersistence(long id, String scriptNo, String scriptName, int scriptType, int languageType, + public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType, String scriptContent, String scriptRemark) { this.id = id; this.scriptNo = scriptNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java similarity index 97% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistenceHistory.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java index 4cd3e31..80c332c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/EngineScriptPersistenceHistory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.pcn.script; +package cn.estsh.i3plus.pojo.mes.engine.script; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/ScriptLoggerModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/ScriptLoggerModel.java similarity index 90% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/ScriptLoggerModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/ScriptLoggerModel.java index a21dfb0..2a6ab3e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/script/ScriptLoggerModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/ScriptLoggerModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.pcn.script; +package cn.estsh.i3plus.pojo.mes.engine.script; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/EngineScriptPersistenceHistoryRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EngineScriptPersistenceHistoryRepository.java similarity index 66% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/EngineScriptPersistenceHistoryRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EngineScriptPersistenceHistoryRepository.java index 1274e35..f7cb666 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/EngineScriptPersistenceHistoryRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EngineScriptPersistenceHistoryRepository.java @@ -1,7 +1,7 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; +package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.script.EngineScriptPersistenceHistory; +import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistenceHistory; import org.springframework.stereotype.Repository; @Repository diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java index db00b1d..dc15bb2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistence; import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; import java.util.List; @@ -13,6 +14,7 @@ import java.util.List; * @CreateDate : 2019-04-16 09:53 * @Modify: **/ +@Repository public interface IEngineScriptPersistenceRepository extends BaseRepository { /** * 按照工厂代码和脚本编号查询脚本实体对象 From 2e3f5bb2af4557525c9254098ec02fb1030355b2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 28 Jul 2020 09:42:53 +0800 Subject: [PATCH 08/10] =?UTF-8?q?Fix=20bug#9994=20=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=98=8E=E7=BB=86--=E6=98=BE=E7=A4=BA=E9=87=8D=E5=A4=8D?= 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 | 3 ++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 6b820ef..a0618cf 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 @@ -799,7 +799,8 @@ public class WmsEnumUtil { PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK(640, "PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK", "零件号转化物料出库"), INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"), CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"), - MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"); + MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"), + PROD_SCRAP(680, "PROD_SCRAP", "生产报废"); 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/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 80a7f60..74c110f 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 @@ -384,6 +384,11 @@ public class WmsDocMovementDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; + @Transient + @ApiParam("工作中心代码") + private String workCenterCode; + + public WmsDocMovementDetails () { From 35cdb1f2572fad7fda56a84fbbc9987e75a166fa Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 28 Jul 2020 12:39:58 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java index eac13e5..f1d76b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java @@ -22,7 +22,10 @@ import javax.persistence.*; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "SCRIPT_PERSISTENCE") +@Table(name = "SCRIPT_PERSISTENCE", indexes = { + @Index(columnList = "SCRIPT_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("系统动态脚本") public class EngineScriptPersistence extends BaseBean { private static final long serialVersionUID = 7893111140559759490L; From c18c22a799856cb7628944f6e5ac7750a2941f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 28 Jul 2020 14:08:49 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E7=94=B5=E6=A3=80=E6=B5=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 7fead57..0fe7b90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -185,6 +185,18 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码打印状态名称") private String printStatusName; + @Transient + @ApiParam("设备代码") + private String equipmentCode; + + @Transient + @ApiParam("设备名称") + private String equipmentName; + + @Transient + @ApiParam("电检结果") + private String electricResult; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1")