From 07cd3de33f4e574d57f7f3ba721ad2f6115bb294 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Nov 2020 15:01:47 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 16cf9c5..811165e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -34,6 +34,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO", nullable = false) + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 1b9e494..3082b0c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -34,6 +34,10 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO", nullable = false) + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; From 7bb60b8f6e43508fbfe60d4ddc9e2f5f88c77a41 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Nov 2020 15:09:50 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=89=E4=B8=AA=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) 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 dac64cf..845b2c4 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 @@ -3540,4 +3540,67 @@ public class MesHqlPack { } return packBean; } + + /** + * MES容器位置查询条件封装 + * + * @param mesContainerLocation + * @return + */ + public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode()); + if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES产品容器容量配置查询条件封装 + * + * @param mesPartContainerCapacity + * @return + */ + public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES客户条码规则查询条件封装 + * + * @param mesCustomerSnRule + * @return + */ + public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode()); + if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean); + } + return packBean; + } } From c2f9937b37ca769f8bac369bd3bdc2287a69f195 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Nov 2020 15:18:05 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E7=83=AD=E5=A4=84=E7=90=86=E7=BF=BB=E5=8C=85=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesContainerLocation.java | 44 ++++++++++++++++ .../i3plus/pojo/mes/bean/MesCustomerSnRule.java | 59 ++++++++++++++++++++++ .../pojo/mes/bean/MesPartContainerCapacity.java | 48 ++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java new file mode 100644 index 0000000..749e502 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java @@ -0,0 +1,44 @@ +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; + +/** + * @Description : MES_容器位置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 17:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER_LOCATION") +@Api("MES_容器位置") +public class MesContainerLocation extends BaseBean { + + private static final long serialVersionUID = -1650212958579635634L; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "LOCATION_CAPACITY") + @ApiParam(value = "默认容量") + private String locationCapacity; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java new file mode 100644 index 0000000..9fe9dff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java @@ -0,0 +1,59 @@ +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; + +/** + * @Description : MES_客户条码规则 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUSTOMER_SN_RULE") +@Api("MES_客户条码规则") +public class MesCustomerSnRule extends BaseBean { + private static final long serialVersionUID = -7455066846136535539L; + + @Column(name = "CUSTOMER_CODE") + @ApiParam(value = "客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam(value = "客户零件号") + private String customerPartNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + private String partNo; + + @Column(name = "LENGTH") + @ApiParam(value = "长度") + private Integer length; + + @Column(name = "FROM1") + @ApiParam(value = "起始1") + private Integer from1; + + @Column(name = "TO1") + @ApiParam(value = "至1") + private Integer to1; + + @Column(name = "FIX1") + @ApiParam(value = "内容1") + private String fix1; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java new file mode 100644 index 0000000..f900c6c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java @@ -0,0 +1,48 @@ +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; + +/** + * @Description : MES_产品容器容量配置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_CONTAINER_CAPACITY") +@Api("MES_产品容器容量配置") +public class MesPartContainerCapacity extends BaseBean { + + private static final long serialVersionUID = 6438819635320965628L; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "CT_QTY") + @ApiParam(value = "容量") + private Integer ctQty; +} From 46c0206d6ac251dbf2221c9c4630547ff19a7b90 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 10 Nov 2020 15:38:55 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E7=83=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BF=BB=E5=8C=85=E6=96=B0=E5=A2=9E=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84dao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 82 ++++++++++++++++++++++ .../repository/MesContainerLocationRepository.java | 16 +++++ .../repository/MesCustomerSnRuleRepository.java | 16 +++++ .../MesPartContainerCapacityRepository.java | 16 +++++ .../MesProdCtCapacityConfigRepository.java | 15 ++++ 5 files changed, 145 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java new file mode 100644 index 0000000..9ef4f8c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -0,0 +1,82 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020/10/29 14:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE") +@Api("料箱表") +public class IfPackage extends BaseBean implements Serializable { + + private static final long serialVersionUID = 9099416791684702129L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty; + + @Column(name = "PORCESS_NAME") + @ApiParam("工序名称") + private String porcessName; + + @Column(name = "RK_TYPE") + @ApiParam("料架类型") + private String rkType; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + @Lob + private String errorMessage; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java new file mode 100644 index 0000000..293a1a7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesContainerLocation; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesContainerLocationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java new file mode 100644 index 0000000..19f6409 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerSnRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 13:33 + * @Modify: + **/ +@Repository +public interface MesCustomerSnRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java new file mode 100644 index 0000000..3616b53 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartContainerCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2020-11-10 + * @Modify: + **/ +@Repository +public interface MesPartContainerCapacityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java new file mode 100644 index 0000000..44c6144 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdCtCapacityConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2020-11-04 + **/ +@Repository +public interface MesProdCtCapacityConfigRepository extends BaseRepository { +} From 2d9521e4122033ecee306474bf3fd41b9846342a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 12 Nov 2020 15:17:52 +0800 Subject: [PATCH 05/28] BUG#12166 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index f527605..73bccbf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -12,6 +12,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.util.List; +import java.util.Map; /** * @Description : 推送信息配置 @@ -64,6 +66,10 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SCRIPT_NO") private String scriptNo; + @ApiParam("脚本入参") + @Column(name = "SCRIPT_PARAM") + private String scriptParam; + @Lob @ApiParam("标题模板") @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT") @@ -94,4 +100,5 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "CONTENT_LABEL") private String contentLabel; + } From 5780306e940d65185d162628e33789a5e7d06ae8 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 13 Nov 2020 14:08:39 +0800 Subject: [PATCH 06/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java | 6 +++--- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java index 749e502..81a783f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : MES_容器位置 @@ -26,9 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONTAINER_LOCATION") @Api("MES_容器位置") -public class MesContainerLocation extends BaseBean { - - private static final long serialVersionUID = -1650212958579635634L; +public class MesContainerLocation extends BaseBean implements Serializable { + private static final long serialVersionUID = 8181007288150974903L; @Column(name = "CT_CODE") @ApiParam(value = "容器类型代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java index 9fe9dff..5d11d7c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : MES_客户条码规则 @@ -26,8 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER_SN_RULE") @Api("MES_客户条码规则") -public class MesCustomerSnRule extends BaseBean { - private static final long serialVersionUID = -7455066846136535539L; +public class MesCustomerSnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -3928160156339420471L; @Column(name = "CUSTOMER_CODE") @ApiParam(value = "客户代码") From ea1d51f32c88a0b99e8168b4e675653eacd106a1 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 13 Nov 2020 14:09:43 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/repository/MesProdCtCapacityConfigRepository.java | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java deleted file mode 100644 index 44c6144..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCtCapacityConfigRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesProdCtCapacityConfig; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : dominic - * @CreateDate : 2020-11-04 - **/ -@Repository -public interface MesProdCtCapacityConfigRepository extends BaseRepository { -} From 31a1c64f6950fee0dd455b9505d9405a3f72a34c Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 13 Nov 2020 16:07:03 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5:?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E4=BD=8D=E7=BD=AE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index ba53ce5..b18781d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -39,6 +39,10 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable { @ApiParam("面位") private String sideLocation; + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + @Column(name = "FILE_ID") @ApiParam("文件id") private Long fileId; From 395039e901999381f917af928ff5316fdbb568c6 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 13 Nov 2020 16:08:49 +0800 Subject: [PATCH 09/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=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/mes/pcn/bean/MesDefect.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java index 2214411..bed31e1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -44,6 +44,18 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("缺陷类型") private String defectType; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "DEFECT_FLAG_VALUE") + @ApiParam("缺陷标识值") + private String defectFlagValue; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + @Transient @ApiParam("缺陷类型名称") private String defectTypeName; From de51b68790cfc770ebf22cc2d1cebb126538d9f7 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 13 Nov 2020 16:09:46 +0800 Subject: [PATCH 10/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8:=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=BC=BA=E9=99=B7=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDefectLocation.java | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java new file mode 100644 index 0000000..7bffe76 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java @@ -0,0 +1,39 @@ +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: dominic + * @CreateDate: 2020\11\13 09:59 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_LOCATION") +@Api("产品缺陷位置") +public class MesDefectLocation extends BaseBean implements Serializable { + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷位置名称") + private String defectName; +} From fa01ec478addd530d24b45cc4558bf243ea59797 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 16 Nov 2020 10:25:34 +0800 Subject: [PATCH 11/28] =?UTF-8?q?Mes=5FPackage=20=E8=A1=A8=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 77d9324..770fcc1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -23,7 +23,13 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +@Table(name = "MES_PACKAGE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "WORK_ORDER_NO"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "IS_SEALED") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) }) From cbd0b1f1361396249c70506c511e738bfbabb50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Nov 2020 14:44:42 +0800 Subject: [PATCH 12/28] BUG#12496 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index fd5b258..bcfd661 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -65,7 +65,7 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SCRIPT_PARAM") private String scriptParam; - @ApiParam("附件文件路径获取脚本编号") + @ApiParam("附件脚本编号") @Column(name = "ATTACH_SCRIPT_NO") private String attachScriptNo; From 4c1add6ba4d074352bc091da250b6c9e15aa7dfc Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 16 Nov 2020 14:56:33 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 28db666..458a3cf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3864,7 +3864,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROCESS_INSPECTION { NOT_CREATE(10, "未创建"), - CREATE(20, "创建"), + CREATE(20, "已创建"), PROCESS(30, "执行中"), COMPLETE(40, "完成"); From 4300201f99318ca4f13d9680430ed3c160d6943f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Nov 2020 15:48:44 +0800 Subject: [PATCH 14/28] BUG#12430,12495 --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 4005ae5..89f6ed4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -324,11 +324,13 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty, + public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; this.erpSrcNo = erpSrcNo; + this.item = item; this.partNo = partNo; + this.partNameRdd = partNameRdd; this.qty = qty; this.rcQty = rcQty; this.itemStatus = itemStatus; From 928c643031604d978ca813ae1b6cd8793cd91de0 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 16 Nov 2020 16:37:50 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) 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 dac64cf..10d429d 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 @@ -3540,4 +3540,24 @@ public class MesHqlPack { } return packBean; } + + /** + * MES_看板自定义参数配置查询条件封装 + * + * @param boardCustomParamCfg + * @return + */ + public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) { + DdlPackBean packBean = getAllBaseDataByNormalPro(boardCustomParamCfg, boardCustomParamCfg.getOrganizeCode()); + if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean); + } + if (!StringUtils.isEmpty(boardCustomParamCfg.getParamCode())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamCode(), "paramCode", packBean); + } + if (!StringUtils.isEmpty(boardCustomParamCfg.getParamName())) { + DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamName(), "paramName", packBean); + } + return packBean; + } } From dc3e344f1159a86d2a35570dc17dffdbb67253d4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 17 Nov 2020 15:57:26 +0800 Subject: [PATCH 16/28] =?UTF-8?q?Fix=20bug#12401=2019048-=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=94=AF=E6=8C=81=E5=85=B3=E8=81=94=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA470=E5=8D=95=E6=8D=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 3dec39f..cb532b0 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 @@ -696,10 +696,23 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.custNo = custNo; } - public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode) { + public WmsDocMovementDetails(String orderNo, String prodCfgTypeCode, String prodCfgTypeName, + Double qty, String planDate, String planTime, String custNo) { + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.qty = qty; + this.planDate = planDate; + this.planTime = planTime; + this.custNo = custNo; + } + + + public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode, String custNo) { this.orderNo = orderNo; this.pickQty = pickQty; this.prodCfgTypeCode = prodCfgTypeCode; + this.custNo = custNo; } } From 8d0e2b942b6a5f1e12780786e7b77ad6951f34ac Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 16:54:47 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=9A=E5=8A=A1pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 6 +- .../java/cn/estsh/i3plus/pojo/mes/bean/IfPackage | 81 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesContainerLocation | 44 ++++++++++++ .../i3plus/pojo/mes/bean/MesCustomerSnRule.java | 60 ++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 5 ++ .../i3plus/pojo/mes/bean/MesDefectLocation.java | 39 +++++++++++ .../i3plus/pojo/mes/bean/MesPackageTravel.java | 4 ++ .../pojo/mes/bean/MesPartContainerCapacity.java | 48 +++++++++++++ .../pojo/mes/bean/MesProduceCtgyPicture.java | 4 ++ .../repository/MesContainerLocationRepository.java | 16 +++++ .../repository/MesCustomerSnRuleRepository.java | 16 +++++ .../MesPartContainerCapacityRepository.java | 16 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 65 +++++++++++++++++ 13 files changed, 403 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 863a6fd..1023d06 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -25,7 +25,7 @@ import java.io.Serializable; @Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) - } +} ) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { @@ -35,6 +35,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage new file mode 100644 index 0000000..ec64f3a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage @@ -0,0 +1,81 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020/10/29 14:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE") +@Api("料箱表") +public class IfPackage extends BaseBean implements Serializable { + + private static final long serialVersionUID = 9099416791684702129L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty; + + @Column(name = "PORCESS_NAME") + @ApiParam("工序名称") + private String porcessName; + + @Column(name = "RK_TYPE") + @ApiParam("料架类型") + private String rkType; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation new file mode 100644 index 0000000..89a8a11 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation @@ -0,0 +1,44 @@ +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_容器位置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 17:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER_LOCATION") +@Api("MES_容器位置") +public class MesContainerLocation extends BaseBean implements Serializable { + private static final long serialVersionUID = 8181007288150974903L; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "LOCATION_CAPACITY") + @ApiParam(value = "默认容量") + private String locationCapacity; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java new file mode 100644 index 0000000..5d11d7c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerSnRule.java @@ -0,0 +1,60 @@ +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_客户条码规则 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUSTOMER_SN_RULE") +@Api("MES_客户条码规则") +public class MesCustomerSnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -3928160156339420471L; + + @Column(name = "CUSTOMER_CODE") + @ApiParam(value = "客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam(value = "客户零件号") + private String customerPartNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + private String partNo; + + @Column(name = "LENGTH") + @ApiParam(value = "长度") + private Integer length; + + @Column(name = "FROM1") + @ApiParam(value = "起始1") + private Integer from1; + + @Column(name = "TO1") + @ApiParam(value = "至1") + private Integer to1; + + @Column(name = "FIX1") + @ApiParam(value = "内容1") + private String fix1; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index d5e92b6..fb61ecb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("项目代码") private String prodCfgTypeCode; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + @Column(name = "DEFECT_FLAG_VALUE") @ApiParam("缺陷标识值") private String defectFlagValue; @@ -67,6 +71,7 @@ public class MesDefect extends BaseBean implements Serializable { @Transient @ApiParam("缺陷类型子集") private List mesDefectList; + public MesDefect() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java new file mode 100644 index 0000000..7bffe76 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectLocation.java @@ -0,0 +1,39 @@ +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: dominic + * @CreateDate: 2020\11\13 09:59 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_LOCATION") +@Api("产品缺陷位置") +public class MesDefectLocation extends BaseBean implements Serializable { + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷位置名称") + private String defectName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 1b9e494..f8e410d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -34,6 +34,10 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java new file mode 100644 index 0000000..6b864cf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java @@ -0,0 +1,48 @@ +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; + +/** + * @Description : MES_产品容器容量配置 + * @Reference : + * @Author : dominic.xiao + * @CreateDate : 2020-11-02 18:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_CONTAINER_CAPACITY") +@Api("MES_产品容器容量配置") +public class MesPartContainerCapacity extends BaseBean { + + private static final long serialVersionUID = 6438819635320965628L; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_LOCATION_NO") + @ApiParam(value = "容器位置编号") + private String ctLocationNo; + + @Column(name = "CT_QTY") + @ApiParam(value = "容量") + private Integer ctQty; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index ba53ce5..b18781d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -39,6 +39,10 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable { @ApiParam("面位") private String sideLocation; + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置代码") + private String defectLocation; + @Column(name = "FILE_ID") @ApiParam("文件id") private Long fileId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java new file mode 100644 index 0000000..1118c74 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesContainerLocation; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesContainerLocationRepository extends BaseRepository { +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java new file mode 100644 index 0000000..379d160 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerSnRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesCustomerSnRuleRepository extends BaseRepository { +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java new file mode 100644 index 0000000..3d65339 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartContainerCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020\11\4 11:21 + * @Modify: + **/ +@Repository +public interface MesPartContainerCapacityRepository extends BaseRepository { +} \ No newline at end of file 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 10d429d..abe8e5e 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 @@ -730,6 +730,7 @@ public class MesHqlPack { /** * 产线看板矩阵 + * * @param boardLineMatrix * @param organizeCode * @return @@ -3560,4 +3561,68 @@ public class MesHqlPack { } return packBean; } + + + /** + * MES容器位置查询条件封装 + * + * @param mesContainerLocation + * @return + */ + public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode()); + if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES产品容器容量配置查询条件封装 + * + * @param mesPartContainerCapacity + * @return + */ + public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean); + } + if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) { + DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean); + } + return packBean; + } + + /** + * MES客户条码规则查询条件封装 + * + * @param mesCustomerSnRule + * @return + */ + public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode()); + if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean); + } + if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) { + DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean); + } + return packBean; + } } From eb7ed898df75cdb7e6533356b297d24f80d1a0c6 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:10:26 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=9A=E5=8A=A1pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation index 89a8a11..0c12f1d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONTAINER_LOCATION") -@Api("MES_容器位置") +@Api("MES_容器位置") public class MesContainerLocation extends BaseBean implements Serializable { private static final long serialVersionUID = 8181007288150974903L; From f1fedb53f4a8be438cbb020bb575c03b88a65d71 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:14:13 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E4=B8=9A=E5=8A=A1pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/{MesContainerLocation => MesContainerLocation.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesContainerLocation => MesContainerLocation.java} (97%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java similarity index 97% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java index 0c12f1d..89a8a11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONTAINER_LOCATION") -@Api("MES_容器位置") +@Api("MES_容器位置") public class MesContainerLocation extends BaseBean implements Serializable { private static final long serialVersionUID = 8181007288150974903L; From 785e8dbfe888296fd6a91a5691e54a16796c466d Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:32:21 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AE=B9=E5=99=A8=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java index 7fd2655..bd948bd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java @@ -2,8 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail; /** * @Author: Wynne.Lu From 61638c391a5300f2b3600248f213a37a723179f0 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:33:57 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AE=B9=E5=99=A8=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 16cf9c5..8315005 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -34,6 +34,10 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; From d8c52a0534cddd0417e541cabe4783a50f75f7cc Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 17:45:21 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java index bd948bd..6d2fe27 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail; /** * @Author: Wynne.Lu From 13bd15d99770ad5c6b4c269dac82e19a07130477 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 18:16:01 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E5=9B=9E=E6=BB=9APCN=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 1023d06..a987364 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -35,10 +35,6 @@ public class MesPackageDetail extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; - @Column(name = "CT_LOCATION_NO") - @ApiParam("容器位置编号") - private String ctLocationNo; - @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; From 452024abf6bba168c286962f1a6cf03d85d7a005 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 18:19:05 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 82 ---------------------- 1 file changed, 82 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java deleted file mode 100644 index 9ef4f8c..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java +++ /dev/null @@ -1,82 +0,0 @@ -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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: dominic - * @CreateDate: 2020/10/29 14:11 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PACKAGE") -@Api("料箱表") -public class IfPackage extends BaseBean implements Serializable { - - private static final long serialVersionUID = 9099416791684702129L; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装编号") - private String packageNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam("数量") - private Double qty; - - @Column(name = "PORCESS_NAME") - @ApiParam("工序名称") - private String porcessName; - - @Column(name = "RK_TYPE") - @ApiParam("料架类型") - private String rkType; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - @Lob - private String errorMessage; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - -} From 22a88a4dc0d144fd90bb1ca5bd1789699dfe3767 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 17 Nov 2020 18:38:44 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=AD=A5=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage index ec64f3a..5583de7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage @@ -77,5 +77,4 @@ public class IfPackage extends BaseBean implements Serializable { @Column(name = "SYNC_STATUS") @ApiParam("同步状态") private Integer syncStatus; - } \ No newline at end of file From d8409c5b573d82c00086a789384584639c2e70f6 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 17 Nov 2020 18:57:14 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java new file mode 100644 index 0000000..5583de7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -0,0 +1,80 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: dominic + * @CreateDate: 2020/10/29 14:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE") +@Api("料箱表") +public class IfPackage extends BaseBean implements Serializable { + + private static final long serialVersionUID = 9099416791684702129L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("数量") + private Double qty; + + @Column(name = "PORCESS_NAME") + @ApiParam("工序名称") + private String porcessName; + + @Column(name = "RK_TYPE") + @ApiParam("料架类型") + private String rkType; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; +} \ No newline at end of file From 42feb06058c298badc01b4742c47647a5e1d1b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=8F=8C=E5=8F=8C?= Date: Tue, 17 Nov 2020 19:03:07 +0800 Subject: [PATCH 27/28] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'modules/i3plus-pojo?= =?UTF-8?q?-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/IfPackage | 80 ---------------------- 1 file changed, 80 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage deleted file mode 100644 index 5583de7..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage +++ /dev/null @@ -1,80 +0,0 @@ -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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: dominic - * @CreateDate: 2020/10/29 14:11 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PACKAGE") -@Api("料箱表") -public class IfPackage extends BaseBean implements Serializable { - - private static final long serialVersionUID = 9099416791684702129L; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装编号") - private String packageNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam("数量") - private Double qty; - - @Column(name = "PORCESS_NAME") - @ApiParam("工序名称") - private String porcessName; - - @Column(name = "RK_TYPE") - @ApiParam("料架类型") - private String rkType; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} \ No newline at end of file From 1f306924e4489b33ad3a69899325a372935ad2e4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 17 Nov 2020 19:32:34 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8F=82=E6=95=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 abe8e5e..c5921cb 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 @@ -3549,7 +3549,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) { - DdlPackBean packBean = getAllBaseDataByNormalPro(boardCustomParamCfg, boardCustomParamCfg.getOrganizeCode()); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardCustomParamCfg.getOrganizeCode()); if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) { DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean); }