diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 3d220a2..afd81eb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -46,6 +46,8 @@ public class BaseRepositoryImpl extends SimpleJpaRep private Class persistentClass; private SnowflakeIdMaker snowflakeIdMaker; + /* 默认查询数据条数 */ + private static final Pager DEFAULT_PAGER = new Pager(10,10); public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); @@ -507,7 +509,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { try { - List list = findByHqlWherePage(packBean,Pager.defaultMinPager()); + List list = findByHqlWherePage(packBean,DEFAULT_PAGER); return list != null && list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在,DdlPackBean:{}",packBean); @@ -520,17 +522,17 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(String propertyName, Object value) { - return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, Pager.defaultMinPager()); + return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER); } @Override public T getByProperty(String[] propertyNames, Object[] values) { - return getByPropertyPager(propertyNames, values, Pager.defaultMinPager()); + return getByPropertyPager(propertyNames, values, DEFAULT_PAGER); } @Override public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) { - pager = pager == null ? Pager.defaultMinPager(): pager; + pager = pager == null ? DEFAULT_PAGER: pager; if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); @@ -601,7 +603,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep try { if(!StringUtil.isEmpty(vendorNoStr)){ String queryString = "from " + persistentClass.getSimpleName() + " as model where model.vendorNo= :vendorNo"; - list=entityManager.createQuery(queryString) + list=entityManager.createQuery(queryString) .setParameter("vendorNo", vendorNoStr) .getResultList(); } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java new file mode 100644 index 0000000..6464445 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : siliter.yuan + * @CreateDate : 2020-06-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CELL_FEED_RECORD") +@Api("工位投料履历信息") +public class MesCellFeedRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971379489107783L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RAW_TYPE") + @ApiParam("原料类型") + private String rawType; + + @Column(name = "RAW_SN") + @ApiParam("原材料条码") + private String rawSn; + + @Column(name = "RAW_QTY") + @ApiParam("原材料数量") + private Double rawQty; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + + public double getRawQtyVal() { + return this.rawQty == null ? 0l : this.rawQty; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java new file mode 100644 index 0000000..6153d23 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java @@ -0,0 +1,14 @@ +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.MesCellFeedRecord; + +/** + * @Description : 工位投料履历持久化类 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-17 09:53 + * @Modify: + **/ +public interface MesCellFeedRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 9f80bcc..e02f6cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -40,9 +40,13 @@ public class IfPackageDetail extends BaseBean implements Serializable { private String partName; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PACKAGE_NO") @ApiParam("包装条码") private String packageNo; @@ -101,7 +105,7 @@ public class IfPackageDetail extends BaseBean implements Serializable { private String ctNo; @Column(name = "SAMPLE_TYPE") - @ApiParam("样本类型") + @ApiParam("条码类型") private String sampleType; @Column(name = "CUST_DELIVERY_LOCATION") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java new file mode 100644 index 0000000..9386832 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java @@ -0,0 +1,74 @@ +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 : siliter.yuan + * @CreateDate : 2020-06-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CELL_FEED_RECORD") +@Api("工位投料履历信息") +public class MesCellFeedRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369489107783L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RAW_TYPE") + @ApiParam("原料类型") + private String rawType; + + @Column(name = "RAW_SN") + @ApiParam("原材料条码") + private String rawSn; + + @Column(name = "RAW_QTY") + @ApiParam("原材料数量") + private Double rawQty; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + + public double getRawQtyVal() { + return this.rawQty == null ? 0l : this.rawQty; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index e3982b1..3bbe40e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -44,4 +44,8 @@ public class MesFiCfg extends BaseBean implements Serializable { @Column(name = "FI_QTY") @ApiParam("首检数量") private Double fiQty; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; } 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 f4f3037..4b81afd 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 @@ -112,7 +112,7 @@ public class MesPackage extends BaseBean implements Serializable { @Column(name = "SAMPLE_TYPE") @ApiParam("条码类型") - private String sampleType; + private String sampleType = "10"; @Transient @ApiParam("客户发往地") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java new file mode 100644 index 0000000..4b756ee --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.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; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_SAMPLE") +@Api("产品样本配置") +public class MesPartSample extends BaseBean implements Serializable { + private static final long serialVersionUID = -9190123981329081945L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 9e98310..7a27711 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -104,6 +104,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("客户发运地") private String custDelieryLocation; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; @@ -112,10 +116,6 @@ public class MesQcOrder extends BaseBean implements Serializable { @Transient private String serialNumber; - @ApiParam(value = "产线") - @Transient - private String workCenterCode; - @ApiParam(value = "工单号") @Transient private String mesWorkNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java index e0a1558..05466cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java @@ -24,7 +24,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SUB_PART") -@Api("数据同步死信") +@Api("替代料") public class MesSubPart extends BaseBean implements Serializable { private static final long serialVersionUID = 4636507477301700549L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java index a4b29ec..16d16db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java @@ -37,20 +37,27 @@ public class ButtonDynamicModel { private String paramValue; - public ButtonDynamicModel(Long id, String buttonCode, String buttonName){ + public ButtonDynamicModel(Long id, String buttonCode, String buttonName) { this.id = id; this.buttonCode = buttonCode; this.buttonName = buttonName; } - public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){ + public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode) { this.buttonCode = buttonCode; this.buttonName = buttonName; this.paramCode = paramCode; } - public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){ + public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode, String paramValue) { + this.buttonCode = buttonCode; + this.buttonName = buttonName; + this.paramCode = paramCode; + this.paramValue = paramValue; + } + + public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue) { this.id = id; this.buttonCode = buttonCode; this.windowNo = windowNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index d97a57a..6913759 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -30,4 +30,6 @@ public class CellFeedModel { private String scanQty; + private String LineRemainQty; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java new file mode 100644 index 0000000..33fd2aa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSampleModel.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/6/16 14:21 + * @desc 打包样本 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("打包样本") +public class PackageSampleModel { + + @ApiParam(name = "已打包数量") + private Double alreadyPackageCount; + + @ApiParam(name = "标准打包数量") + private Double standardPackageCount; + + @ApiParam(name = "样本类型") + private Map sampleTypeMap; + + @ApiParam(name = "样本类型代码") + private String lastSampleTypeCode; + + @ApiParam(name = "选择的样本类型") + private String chooseSampleTypeCode; + + @ApiParam(name = "强制执行工步") + private String forceStepCode; + + @ApiParam(name = "强制打包密码") + private String password; + + @ApiParam(name = "工厂") + private String organizeCode; + + @ApiParam(name = "工单号") + private String workOrderNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java new file mode 100644 index 0000000..5cb4185 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCellFeedRecord; + +/** + * @Description : 工位投料履历持久化类 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-17 09:53 + * @Modify: + **/ +public interface MesCellFeedRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java new file mode 100644 index 0000000..881d274 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartSampleRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartSample; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartSampleRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 91597a2..9d81d04 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -111,6 +111,22 @@ public class MesPcnHqlPack { return packBean; } + /** + * 获取工作中心下所有的投料履历数据 + * + * @param mesCellFeedRecord + * @param org + * @return + */ + public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + return packBean; + } + /** * 获取原材料扫描信息的对应工序BOM