From 531596d2d439bf6de1c186f2ad54efa71852759e Mon Sep 17 00:00:00 2001 From: joke Date: Fri, 6 Mar 2020 19:43:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[mes:=2049=20JIT=E8=AE=A1=E5=88=92=E4=B8=8E?= =?UTF-8?q?=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 | 74 +++++++++++++++++- .../i3plus/pojo/mes/bean/MesCustProdLine.java | 8 ++ .../i3plus/pojo/mes/bean/MesProduceGroup.java | 42 ++++++++++ .../i3plus/pojo/mes/bean/MesProduceGroupCfg.java | 40 ++++++++++ .../i3plus/pojo/mes/bean/MesQueueGroupCount.java | 49 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueGroupRule.java | 49 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 91 ++++++++++++++++++++++ .../pojo/mes/bean/MesQueueJitActualDetail.java | 61 +++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 77 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 53 +++++++++++++ .../pojo/mes/bean/MesQueueJitPlanDetail.java | 49 ++++++++++++ .../repository/MesProduceGroupCfgRepository.java | 14 ++++ .../mes/repository/MesProduceGroupRepository.java | 14 ++++ .../repository/MesQueueGroupCountRepository.java | 14 ++++ .../repository/MesQueueGroupRuleRepository.java | 14 ++++ .../MesQueueJitActualDetailRepository.java | 14 ++++ .../repository/MesQueueJitActualRepository.java | 14 ++++ .../repository/MesQueueJitPlanBomRepository.java | 14 ++++ .../MesQueueJitPlanDetailRepository.java | 14 ++++ .../mes/repository/MesQueueJitPlanRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 42 ++++++++++ 21 files changed, 760 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java 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 bc83711..850ce6c 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 @@ -1598,7 +1598,8 @@ public class MesEnumUtil { MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), MES_PLC(390,"PLC地址清单"), MES_PROCESS(400,"工序信息"), - MES_KPSN_RULE(410,"关键件条码校验规则"); + MES_KPSN_RULE(410,"关键件条码校验规则"), + MES_QUEUE_JIT_ACTUAL(420,"客户JIT生产队列"); private int value; private String description; @@ -4062,4 +4063,75 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIT_ACTUAL_STATUS { + CREATE(10, "创建"), + LANDED(20, "下达"), + CANCEL(30, "取消"); + + private int value; + private String description; + + MES_QUEUE_JIT_ACTUAL_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; + } + } + + /** + * 客户JIT生产队列特殊标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_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) { + 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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index c8da995..6224656 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -37,4 +37,12 @@ public class MesCustProdLine extends BaseBean implements Serializable { @Column(name = "CUST_PROD_LINE_NAME") @ApiParam("客户产线名称") private String custProdLineName; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java new file mode 100644 index 0000000..21fbfe9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java @@ -0,0 +1,42 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:34 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_GROUP") +@Api("MES_生产组") +public class MesProduceGroup extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6926189371427937743L; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "PG_NAME") + @ApiParam("生产组名称") + private String pgName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java new file mode 100644 index 0000000..0648f2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java @@ -0,0 +1,40 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:22 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_GROUP_CFG") +@Api("MES_生产组配置") +public class MesProduceGroupCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 82611799819312505L; + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; +} 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 new file mode 100644 index 0000000..1133c1a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -0,0 +1,49 @@ +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 java.io.Serializable; + +/** + * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_GROUP_COUNT") +@Api("MES_队列分组计数") +public class MesQueueGroupCount extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7799006330177462162L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "QTY") + @ApiParam("分组数量") + private Integer qty; + + @Column(name = "CNT_QTY") + @ApiParam("累计数") + private Integer cntQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java new file mode 100644 index 0000000..c9e3f4f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java @@ -0,0 +1,49 @@ +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 java.io.Serializable; + +/** + * @Description :MES_QUEUE_GROUP_COUNT + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_GROUP_RULE") +@Api("MES_队列分组规则") +public class MesQueueGroupRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6857842499743356177L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "QTY") + @ApiParam("分组数量") + private Integer qty; +} 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 new file mode 100644 index 0000000..e3f8e55 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -0,0 +1,91 @@ +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 : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_ACTUAL") +@Api("MES_客户JIT生产队列") +public class MesQueueJitActual extends BaseBean implements Serializable { + + private static final long serialVersionUID = 655875369308810110L; + + @Column(name = "JIS_ACTUAL_NO") + @ApiParam("队列编号") + private String jisActualNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "SEQ") + @ApiParam("排序号") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "SPECIAL_FLAG") + @ApiParam("特殊标识") + private Integer specialFlag; + + @Column(name = "CUST_POINT_DATE") + @ApiParam("客户需求时间") + private String custPointDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Transient + @ApiParam("客户需求开始时间") + private String custPointStartDate; + + @Transient + @ApiParam("客户需求结束时间") + private String custPointEndDate; + +} 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 new file mode 100644 index 0000000..77e6c6f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.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 java.io.Serializable; + +/** + * @Description :MES_QUEUE_JIT_ACTUAL + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL") +@Api("MES_客户JIT生产队列明细") +public class MesQueueJitActualDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1442091799346314190L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NAME") + @ApiParam("产品名称") + private String partName; + + @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/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java new file mode 100644 index 0000000..d982dab --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -0,0 +1,77 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:40 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN") +@Api("MES_客户JIT预装队列") +public class MesQueueJitPlan extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6613487463796132500L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "VEHICLE_CODE") + @ApiParam("选配码") + private String vehicleCode; + + @Column(name = "SEQ") + @ApiParam("计划排序号") + private String seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "PLAN_DATE") + @ApiParam("计划上线时间") + private String planDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "VERSION") + @ApiParam("版本号") + private String version; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java new file mode 100644 index 0000000..1d9faad --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -0,0 +1,53 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:01 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN_BOM") +@Api("MES_客户JIT预装队列BOM") +public class MesQueueJitPlanBom extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2037991315471333415L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "DOCK_NO") + @ApiParam("道口") + private String dockNo; + + @Column(name = "QTY") + @ApiParam("用量") + private Double qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java new file mode 100644 index 0000000..7111b75 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -0,0 +1,49 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:58 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL") +@Api("MES_客户JIT预装队列明细") +public class MesQueueJitPlanDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1263996676519565026L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品名称") + private String partName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java new file mode 100644 index 0000000..9065d3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceGroupCfg; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:53 上午 + * @Modify: + **/ +public interface MesProduceGroupCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java new file mode 100644 index 0000000..55e5df0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceGroup; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:52 上午 + * @Modify: + **/ +public interface MesProduceGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java new file mode 100644 index 0000000..5b5e0f3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueGroupCount; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:54 上午 + * @Modify: + **/ +public interface MesQueueGroupCountRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java new file mode 100644 index 0000000..93a9798 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueGroupRule; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:55 上午 + * @Modify: + **/ +public interface MesQueueGroupRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java new file mode 100644 index 0000000..2a56b7b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActualDetail; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesQueueJitActualDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java new file mode 100644 index 0000000..d7d0062 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActual; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:56 上午 + * @Modify: + **/ +public interface MesQueueJitActualRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java new file mode 100644 index 0000000..182e8d9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:58 上午 + * @Modify: + **/ +public interface MesQueueJitPlanBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java new file mode 100644 index 0000000..f645abc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:58 上午 + * @Modify: + **/ +public interface MesQueueJitPlanDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java new file mode 100644 index 0000000..2168ea9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesQueueJitPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 3670819..9e068c0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2164,4 +2164,46 @@ public class MesHqlPack { } return packBean; } + + /** + * 客户JIT生产队列 + * + * @param queueJitActual + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getCustPlantCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getCustPlantCode(), "custPlantCode", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getCustFlagNo())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getCustFlagNo(), "custFlagNo", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getVinCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getVinCode(), "vinCode", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean); + } + if (queueJitActual.getStatus() != null) { + DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean); + } + if (!StringUtil.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtil.isEmpty(queueJitActual.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + queueJitActual.getCreateDateTimeStart(), + queueJitActual.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtil.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtil.isEmpty(queueJitActual.getCustPointEndDate())) { + DdlPreparedPack.timeBuilder( + queueJitActual.getCustPointStartDate(), + queueJitActual.getCustPointEndDate(), + "createDatetime", packBean, true); + } + return packBean; + } } From 50d3de9b772040e905b3e1a6b6aeea89c585cc8e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 9 Mar 2020 18:46:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?7600=20=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82=207565=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=88=86=E7=BB=84=E5=8A=9F=E8=83=BD=E8=A6=81=E6=B1=82=E3=80=82?= =?UTF-8?q?=207633=20=E6=9D=A1=E7=A0=81=E6=98=8E=E7=BB=86=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=BC=E5=87=BA=EF=BC=8C=E6=97=A5?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=BA=A7=E7=94=9F=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=97=A0=E6=B3=95=E8=A2=AB=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=B8=8A=E7=9A=84=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E6=9F=A5=E5=88=B0=E4=BB=80=E4=B9=88?= =?UTF-8?q?=E5=B0=B1=E5=AF=BC=E5=87=BA=E4=BB=80=E4=B9=88=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=86=8D=E5=8A=A0=E5=85=B6=E4=BB=96=E9=A2=9D?= =?UTF-8?q?=E5=A4=96=E7=9A=84=E6=9D=A1=E4=BB=B6=207628=20=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D=E5=90=8E=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=207640=20=E8=A7=A3=E5=86=BB=E6=89=AB=E6=8F=8F=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=90=8E=E7=9A=84=E6=8F=90=E7=A4=BA=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9D=A1=E7=A0=81=EF=BC=8C=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E6=98=AF=E6=9C=89=E7=9A=84=E3=80=82=E9=9C=80=E8=A6=81=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E9=83=BD=E6=98=BE=E7=A4=BA=207536=20=E6=B2=A1?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=97=B6=E9=A2=86=E6=96=99=E4=B8=8E=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=B8=8B=E5=88=97=207659=20=E5=88=9B=E5=BB=BA=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=8D=95=E5=86=BB=E7=BB=93=E6=9D=A1=E7=A0=81=E6=97=B6?= =?UTF-8?q?=E6=9D=A1=E7=A0=81is=5Fvaild=3D2=207617=20=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=A3=80=E6=B5=8B=E5=8D=95=E6=8D=AE=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=9C=89=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BA=A4=EF=BC=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E5=88=9B=E5=BB=BA=E7=9A=84=E6=89=8D?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=89=93=E5=8D=B0=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=89=93=E5=8D=B0=E4=B8=80=E6=AC=A1=E3=80=82?= =?UTF-8?q?=207652=20=E5=9C=A8=E6=9D=A1=E7=A0=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=BB=84=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A1=86=E4=B9=9F=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=207454?= =?UTF-8?q?=20=E9=9C=80=E8=A6=81=E4=B8=80=E4=B8=AA=E9=85=8D=E6=96=99?= =?UTF-8?q?=E6=92=A4=E9=94=80=EF=BC=88=E9=92=88=E5=AF=B9=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=EF=BC=89=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E9=85=8D=E6=96=99=E7=9A=84=E6=9D=A1=E7=A0=81=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=A2=AB=E6=92=A4=E5=9B=9E=E5=88=B0=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E9=9C=80=E8=A6=81=E8=80=83=E8=99=91=E5=90=84?= =?UTF-8?q?=E7=A7=8D=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E3=80=82=207631=20=E5=9C=A8=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E7=9B=98=E7=82=B9=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=8A=8A=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=AD=E7=9A=84src=5Forder=5Fno=E6=98=BE=E7=A4=BA=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E5=AD=97=E6=AE=B5=E5=8F=96=E5=90=8D=E4=B8=BA?= =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E5=8D=95=E5=8F=B7=207526=20=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=8E=A5=E6=94=B6=E6=97=B6=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=9C=A8=E8=AE=B2=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E8=AF=A5=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=AD=E5=8F=AA=E5=AD=98=E5=9C=A8=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=E6=B3=95=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E8=AF=A5=E5=AD=97=E6=AE=B5=E9=9C=80=E8=A6=81=E5=9C=A8?= =?UTF-8?q?=E5=89=8D=E5=8F=B0=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=80=E6=AD=A5?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=AD=98=E5=9C=A8=E4=B8=A4?= =?UTF-8?q?=E6=AD=A5=E6=B3=95=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=88=99=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=A4=E6=AD=A5=E6=B3=95?= =?UTF-8?q?=E3=80=82=207617=20=E5=87=BA=E5=BA=93=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=B8=AD=E7=9A=84=E6=89=93=E5=8D=B0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E6=9C=89?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BA=A4=EF=BC=8C=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E5=88=9B=E5=BB=BA=E7=9A=84=E6=89=8D=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=80=E6=AC=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 3 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 e7b8cd0..57cadad 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 @@ -3857,7 +3857,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRINT_TYPE { - SN(10, "SN"); + SN(10, "SN"), + PACKAGE_NO(20, "PACKAGE_NO"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 6e717a9..aec24ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1301,6 +1301,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false,false); if (wmsStockSn.getIsValid() != null) { From 00252caa0c609b3855ddc6d128bb2fd7d403b2ea Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 9 Mar 2020 19:19:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E5=8A=A8mespcn=E5=85=AC=E7=94=A8m?= =?UTF-8?q?odel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ActorMessageModel.java | 37 ++++++++++++++++++++++ .../i3plus/pojo/mes/model}/StationRequestBean.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model}/StepModel.java | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/StationRequestBean.java (98%) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/StepModel.java (98%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java new file mode 100644 index 0000000..822087a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/3/9 15:35 + * @desc + */ +@Data +public class ActorMessageModel { + + private String msgType; + + private String clientInfo; + + private String workCellCode; + + private String workCenterCode; + + private String organizeCode; + + private String routeCode; + + private String serialNumber; + + private String productSn; + + private T dataObj; + + private List dataList; + + private Map dataMap; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java similarity index 98% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 46134cc..d4961d3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java similarity index 98% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 6b7eedd..7636eae 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data;