From dc3e344f1159a86d2a35570dc17dffdbb67253d4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 17 Nov 2020 15:57:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?Fix=20bug#12401=2019048-=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=94=AF=E6=8C=81=E5=85=B3=E8=81=94=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?470=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 2/6] =?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 3/6] =?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 4/6] =?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 5/6] =?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 6/6] =?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;