From 380fded580ee8cc8ce471227ec6827d25168d639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 9 Mar 2020 18:21:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B8=85=E7=90=86=E5=AE=9E=E4=BD=93=E5=92=8C=E6=AD=BB=E4=BF=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java new file mode 100644 index 0000000..f218fc3 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.util.Date; + +/** + * @author adair.song + * @date 2020/03/09 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_PCN_CLEAR") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_PCN数据清理") +public class PtlPcnClear extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596443273899197995L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "EXTRACT_CONDITION") + @ApiParam("获取数据条件") + private String extractCondition; + + @Column(name = "ACTION_FREQUENCY") + @ApiParam("执行频率") + private Integer actionFrequency; + + @Column(name = "LAST_SYNC_TIME") + @ApiParam("上一执行时间") + private Date lastSyncTime; + +} From ccf2817788468ba2a0d4083d406c418dd3ddd9f2 Mon Sep 17 00:00:00 2001 From: joke lin Date: Tue, 10 Mar 2020 19:54:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 117 +++++++++++++++++++-- .../i3plus/pojo/mes/bean/MesQueueGroupCount.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 8 ++ .../i3plus/pojo/mes/bean/MesQueueJisDetail.java | 8 ++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 12 +++ .../pojo/mes/bean/MesQueueJitActualDetail.java | 6 +- .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 20 ++++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 12 ++- 8 files changed, 173 insertions(+), 12 deletions(-) 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 850ce6c..9683119 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 @@ -17,7 +17,8 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_MODULE { - WORK_ORDER_LANDED(10, "生产工单下达"); + WORK_ORDER_LANDED(10, "生产工单下达"), + QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"); private int value; private String description; @@ -2915,7 +2916,8 @@ public class MesEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"); + BH_ORDER(40, "B&H工单"), + JIT_ORDER(50, "JIT工单"); private int value; private String description; @@ -4068,7 +4070,7 @@ public class MesEnumUtil { * 客户JIT生产队列状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIT_ACTUAL_STATUS { + public enum QUEUE_JIT_ACTUAL_STATUS { CREATE(10, "创建"), LANDED(20, "下达"), CANCEL(30, "取消"); @@ -4076,7 +4078,7 @@ public class MesEnumUtil { private int value; private String description; - MES_QUEUE_JIT_ACTUAL_STATUS(int value, String description) { + QUEUE_JIT_ACTUAL_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -4104,14 +4106,117 @@ public class MesEnumUtil { * 客户JIT生产队列特殊标识 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG { + public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), EMPTYING(20, "放空"); private int value; private String description; - MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) { + QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + 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; + } + } + + /** + * JIS发运队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIS_STATUS { + CREATE(10, "创建"); + + private int value; + private String description; + + QUEUE_JIS_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + 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; + } + } + + /** + * 生产队列 队列类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_QUEUE_TYPE { + PRODUCT_QUEUE(10, "生产队列"), + PRELOAD_QUEUE(20, "预装队列"); + + private int value; + private String description; + + QUEUE_ORDER_QUEUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + 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; + } + } + + /** + * JIS发运队列明细 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIS_DETAIL_STATUS { + CREATE(10, "创建"); + + private int value; + private String description; + + QUEUE_JIS_DETAIL_STATUS(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java index 1133c1a..a459fb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -14,7 +14,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL + * @Description : * @Reference : * @Author : joke * @CreateDate : 2020-03-06 10:16 上午 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 249fd29..4a6ca87 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -64,6 +64,14 @@ public class MesQueueJis extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + @Transient @ApiParam("颜色") private String color; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index 5ac2924..8c8e9bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -59,4 +59,12 @@ public class MesQueueJisDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index e3f8e55..0f191b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -88,4 +88,16 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("客户需求结束时间") private String custPointEndDate; + @Transient + @ApiParam("产品配置名称") + private String prodCfgName; + + @Transient + @ApiParam("状态名称") + private String statusName; + + @Transient + @ApiParam("特殊标识名称") + private String specialFlagName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 77e6c6f..832419c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -31,9 +31,9 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 1442091799346314190L; - @Column(name = "QGR_CODE") - @ApiParam("分组规则代码") - private String qgrCode; + @Column(name = "JIS_ACTUAL_NO") + @ApiParam("队列编号") + private String jisActualNo; @Column(name = "PROD_CFG_CODE") @ApiParam("配置代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 159aa03..fa0c07b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -72,6 +72,26 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("区域代码") private String areaCode; + @Column(name = "IS_LOCK") + @ApiParam("锁定标识") + private Integer isLock; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "WORK_TYPE") + @ApiParam("区域代码") + private String workType; + + @Column(name = "QUEUE_TYPE") + @ApiParam("队列类型") + private Integer queueType; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + @Transient @ApiParam("起始车号") private String custFlagNoStart; 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 040bac7..c7554a2 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 @@ -72,10 +72,18 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryNameRdd; - @Column(name = "产品生产类型") - @ApiParam("产品类型名称") + @Column(name = "PPT_CODE") + @ApiParam("产品生产类型") private String pptCode; + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + @Transient @ApiParam("队列序号") private Double queueSeq; From 4d701aa9c4bec8647ae1281cbd2ddab8955ed5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 11 Mar 2020 11:51:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ptl=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java | 2 +- .../estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 2 +- .../estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java | 4 ++++ .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java | 2 +- .../pojo/ptl/repository/PtlPcnClearRepository.java | 16 ++++++++++++++++ 7 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index cd9a311..8956db4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -476,7 +476,7 @@ public class PtlEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_PATTERN { - UPDATE(1, "修改"), + UPDATE(1, "新增或修改"), INSERT(2, "新增"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 7d3d688..e452e94 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1360,7 +1360,7 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_PATTERN { - UPDATE(1, "修改"), + UPDATE(1, "新增或修改"), INSERT(2, "新增"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 620fa7d..649fe2d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.NoRepositoryBean; import java.io.Serializable; +import java.util.Date; import java.util.List; import java.util.Map; @@ -378,4 +379,7 @@ public interface BaseRepository extends JpaReposito double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + + List findByHqlWhereByClear(DdlPackBean packBean, String dateTime); + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 103be31..b766f3f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1548,4 +1548,16 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return num; } + + @Override + public List findByHqlWhereByClear(DdlPackBean packBean, String dateTime) { + StringBuffer queryString = new StringBuffer(); + queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " "); + + if (packBean != null) { + queryString.append(packBean.getWhereAppend()); + } + + return entityManager.createQuery(queryString.toString()).getResultList(); + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index 6aec23d..55a0d3e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -82,11 +82,11 @@ public class PtlBom extends BaseBean implements Serializable { @Column(name = "EFF_START_TIME") @ApiParam("有效起始日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) - private Date effStartTime; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam("有效截止日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) - private Date effEndTime; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String effEndTime; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java index f218fc3..360d748 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java @@ -53,6 +53,6 @@ public class PtlPcnClear extends BaseBean implements Serializable { @Column(name = "LAST_SYNC_TIME") @ApiParam("上一执行时间") - private Date lastSyncTime; + private String lastSyncTime; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java new file mode 100644 index 0000000..c39a211 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnClear; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnClearRepository extends BaseRepository { +} From ac4a8b0ab4a2601e5f82903e40b4f57ee2b2740b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 11 Mar 2020 15:07:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9ptl=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index b766f3f..8746630 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1551,13 +1551,20 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWhereByClear(DdlPackBean packBean, String dateTime) { + LOGGER.info("ptl_pcn数据清除查询"); StringBuffer queryString = new StringBuffer(); - queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " "); + queryString.append("select model from " + persistentClass.getSimpleName() + + " as model where 1=1 and model.createDatetime <= " + "'" + dateTime + "'" + " "); if (packBean != null) { queryString.append(packBean.getWhereAppend()); } - return entityManager.createQuery(queryString.toString()).getResultList(); + Query query = entityManager.createQuery(queryString.toString()); + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + + return query.getResultList(); } } From 102af98a75a7aafd4c196da55ca3f3b320cb0e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 11 Mar 2020 15:53:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90PTL=5F=E5=A2=9E=E5=8A=A0=E4=B8=BB?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=92=8C?= =?UTF-8?q?=E7=BB=84=E5=86=85=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 10 ++++------ .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 4 ++++ 2 files changed, 8 insertions(+), 6 deletions(-) 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 c7554a2..1b817ca 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 @@ -72,19 +72,17 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryNameRdd; - @Column(name = "PPT_CODE") - @ApiParam("产品生产类型") +@Column(name = "产品生产类型") + @ApiParam("产品类型名称") private String pptCode; - @Column(name = "QUEUE_GROUP_NO") + @Column(name = "QUEUE_GROUP_NO") @ApiParam("分组队列编号") private String queueGroupNo; @Column(name = "GROUP_NO") @ApiParam("组内编号") - private Integer groupNo; - - @Transient + private Integer groupNo; @Transient @ApiParam("队列序号") private Double queueSeq; 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 d4961d3..357f9e8 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -79,6 +80,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步列表") private List stepList; + @ApiParam("生产主队列编号") + private String orderNo; + @Override public String toString() { return "StationRequestBean{" +