From a44163332623751c771e50e74848b2fea80f64cb Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 15 Nov 2019 11:09:35 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E3=80=90=E8=B6=85=E7=BA=A7=E7=A7=BB?= =?UTF-8?q?=E5=BA=93=E3=80=91bug6295?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index c98681aa..f9922c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -67,6 +69,24 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "交易类型" , example = "1") private String transTypeCode; + @Column(name = "DEST_OP_TYPE_CODE") + @ApiParam(value = "目标作业类型" , example = "2") + private String destOpTypeCode; + + @Column(name = "DEST_TRANS_TYPE_CODE") + @ApiParam(value = "目标交易类型" , example = "1") + private String destTransTypeCode; + + @Column(name = "DEST_SN_STATUS") + @ApiParam(value = "目标条码状态" , example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") + private Integer destSnStatus; + + @Column(name = "DEST_QC_STATUS") + @ApiParam(value = "目标质量状态" , example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") + private Integer destQcStatus; + @Column(name = "MODE_CODE") @ApiParam(value = "处理模式(10:生成任务,20:自动操作,30手工操作，40:自动操作 无交易)" , example = "1") private Integer modeCode; From 9597cee5967efc102c6bbaa33d79661bbda1b8f1 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 15 Nov 2019 12:34:50 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1Bug=EF=BC=8C=E5=85=B3=E8=81=94=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 7 ++-- .../estsh/i3plus/pojo/aps/bean/SerialNumber.java | 28 +++++++++++++ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 49 +++++++++++----------- .../aps/repository/ISerialNumberRepository.java | 9 ++++ 4 files changed, 66 insertions(+), 27 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 903874d..129a9db 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -30,6 +30,7 @@ import java.util.List; public class Resource extends BaseCode { @Column(name="BOTTLENECK") @ApiParam(value ="是否瓶颈资源") + @FieldAnnotation(defaultValue = "false") private Boolean bottleneck; @Column(name="TYPE") @@ -60,11 +61,11 @@ public class Resource extends BaseCode { private Double maxProduceBatch; @Column(name="TIME_TAIL_ADJUST") - @ApiParam(value ="时间尾数调整") + @ApiParam(value ="时间尾数圆整") private String timeTailAdjust; @Column(name="TIME_ADJUST") - @ApiParam(value ="时间调整") + @ApiParam(value ="时间圆整") private String timeAdjust; @Column(name="MAX_PREV_SD_TIME") @@ -80,7 +81,7 @@ public class Resource extends BaseCode { private String maxPostSdTime; @Column(name="ROUND_TYPE") - @ApiParam(value ="时间与时间尾数圆整类型") + @ApiParam(value ="圆整类型") @FieldAnnotation(defaultValue = "ROUNDING") private ApsEnumUtil.TIME_ROUND_TYPE roundType; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java new file mode 100644 index 0000000..eea1979 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :流水号，补充生产订单和采购订单时自动生成编码 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_SERIAL_NUMBER") +@Api("取消计划规则") +public class SerialNumber extends BaseAPS { + + @Column(name="NUMBER") + @ApiParam(value ="流水号") + private Integer number; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index fa3db91..f35fbed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -359,30 +359,31 @@ public class BeanRelation { * * @param bean */ - public static void delete(BaseBean bean) { - if (bean == null) { - return; - } - BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); - List> ownerSigns = beanInfo.getOwnerHolders(); - for (Enum holder : ownerSigns) { - List relaBeans = new ArrayList<>(list(bean, holder)); - for (BaseBean relaBean : relaBeans) { - //MemoryManager.delete(relaBean); - } - } - - List> normalSigns = beanInfo.getNormalSigns(); - for (Enum holder : normalSigns) { - Enum reverseHolder = beanInfo.getReverseHolder(holder); - List relaBeans = new ArrayList<>(list(bean, holder)); - for (BaseBean relaBean : relaBeans) { - if (reverseHolder != null) { - remove(relaBean, reverseHolder, bean); - } - } - } - } +// public static void delete(BaseBean bean) { +// if (bean == null) { +// return; +// } +// BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); +// List> ownerSigns = beanInfo.getOwnerHolders(); +// for (Enum holder : ownerSigns) { +// Class relaCls = beanInfo.getRelationInfo(holder).getBeanInfo().getBeanClass(); +// List relaBeans = new ArrayList<>(list(bean, holder)); +// for (BaseBean relaBean : relaBeans) { +// //MemoryManager.delete(relaBean); +// } +// } +// +// List> normalSigns = beanInfo.getNormalSigns(); +// for (Enum holder : normalSigns) { +// Enum reverseHolder = beanInfo.getReverseHolder(holder); +// List relaBeans = new ArrayList<>(list(bean, holder)); +// for (BaseBean relaBean : relaBeans) { +// if (reverseHolder != null) { +// remove(relaBean, reverseHolder, bean); +// } +// } +// } +// } /** * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java new file mode 100644 index 0000000..3770ae5 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.SerialNumber; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ISerialNumberRepository extends CrudRepository { +} From 3bda3169f48e613d010248b7e4a2e0513dd021d3 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 15 Nov 2019 13:31:27 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E3=80=90=E8=B6=85=E7=BA=A7=E7=A7=BB?= =?UTF-8?q?=E5=BA=93=E3=80=91bug6295?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index f9922c1..e120ba0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -61,14 +61,6 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目标存储区" , example = "2") private String destZoneNo; - @Column(name = "OP_TYPE_CODE") - @ApiParam(value = "作业类型" , example = "2") - private String opTypeCode; - - @Column(name = "TRANS_TYPE_CODE") - @ApiParam(value = "交易类型" , example = "1") - private String transTypeCode; - @Column(name = "DEST_OP_TYPE_CODE") @ApiParam(value = "目标作业类型" , example = "2") private String destOpTypeCode; @@ -77,6 +69,14 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目标交易类型" , example = "1") private String destTransTypeCode; + @Column(name = "SRC_OP_TYPE_CODE") + @ApiParam(value = "源作业类型" , example = "2") + private String srcOpTypeCode; + + @Column(name = "SRC_TRANS_TYPE_CODE") + @ApiParam(value = "源交易类型" , example = "1") + private String srcTransTypeCode; + @Column(name = "DEST_SN_STATUS") @ApiParam(value = "目标条码状态" , example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") From 48cbf9d47170d7dfe18f9c104beb98c05afd541a Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 15 Nov 2019 15:57:53 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E3=80=90NC=E5=86=BB=E7=BB=93=E3=80=91?= =?UTF-8?q?=E3=80=90350=20NC=E5=86=BB=E7=BB=93-4.2=20=E6=89=B9=E9=87=8FNC?= =?UTF-8?q?=E5=86=BB=E7=BB=93=E3=80=91=E3=80=901187=20NC=E5=86=BB=E7=BB=93?= =?UTF-8?q?-4.2=20=E6=89=B9=E9=87=8FNC=E5=86=BB=E7=BB=93=E3=80=91=20?= =?UTF-8?q?=E3=80=90=09=E5=BA=93=E5=AD=98=E6=8A=A5=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=9C=8B=E5=88=B0=E5=AF=84=E5=94=AE=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E3=80=91=E3=80=90bug6331=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 5 files changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 208e2ca..8e6d27e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -190,6 +190,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "车号") private String carNo; + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + private Integer consignation; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 96ffb91..4581410 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -196,6 +196,10 @@ public class WmsMoveSn extends BaseBean { @Transient private Integer isSnapshot; + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + private Integer consignation; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 0c9c9bf..f4c6c39 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -67,6 +67,11 @@ public class WmsPoSn extends BaseBean { @Column(name="SN_STATUS") @ApiParam(value = "状态", example = "10") public Integer snStatus; + /** + * 质量:10-合格 20-不合格 30-隔离 40-报废 + */ + @ApiParam(value = "质量状态", example = "10") + public Integer qcStatus; @Column(name="PACKAGE") @ApiParam("包装名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index a3e8927..f98e0a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -274,6 +274,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("批次校验规则") private String lotCheckRule; + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + private Integer consignation; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index dd901c0..41a0b9e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1510,7 +1510,9 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); From e60256e291a7b452daeefb67e435f7f40070ed57 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 15 Nov 2019 16:59:36 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1167?= =?UTF-8?q?=EF=BC=8C=E5=8C=85=E8=A3=85=E7=89=B9=E6=AE=8A=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 2 +- 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 88a3791..4c34404 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -55,6 +55,10 @@ public class MesPackage extends BaseBean { @ApiParam("批号") private String lotNo; + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + @Column(name = "PACK_SPEC") @ApiParam("包装规格") private String packSpec; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java index 89e6f89..19bd5d9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -32,7 +32,7 @@ public class MesPackageTravel extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "OP_TYPE") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java index 1ff7261..9a979a9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -34,6 +34,9 @@ public class ProdPackageModel { @ApiParam("班次") private String shiftCode; + @ApiParam("班次名称") + private String shiftName; + @ApiParam("物料号") private String partNo; 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 ce04c3d..f6a4b95 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 @@ -55,6 +55,10 @@ public class MesPackage extends BaseBean { @ApiParam("批号") private String lotNo; + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + @Column(name = "PACK_SPEC") @ApiParam("包装规格") private String packSpec; 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 4ac7024..76a808b 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 @@ -32,7 +32,7 @@ public class MesPackageTravel extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "OP_TYPE") From 9842ed21814ef551c88d5dbdd9cc75be44173873 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 15 Nov 2019 17:26:53 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1193?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3pojo=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 37 ++++++++ .../pojo/mes/pcn/bean/IfDismantleRecord.java | 99 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/IfPackageDetail.java | 94 ++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/IfProductOffLine.java | 86 +++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesActionIf.java | 38 +++++++++ .../pojo/mes/pcn/bean/MesDismantleRecord.java | 9 +- .../repository/IfDismantleRecordRepository.java | 14 +++ .../mes/pcn/repository/MesActionIfRepository.java | 14 +++ .../i3plus/pojo/mes/bean/IfDismantleRecord.java | 99 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/IfPackageDetail.java | 94 ++++++++++++++++++++ .../i3plus/pojo/mes/bean/IfProductOffLine.java | 86 +++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 + 12 files changed, 669 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java 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 38268c7..59dfd14 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 @@ -13,6 +13,43 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 接口同步状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IF_SYNC_STATUS { + + NO_SYNC(10, "未同步"), + ALREADY_SYNC(20, "已同步"), + FAIL_SYNC(30, "同步失败"); + + private int value; + private String description; + + IF_SYNC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 条码类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java new file mode 100644 index 0000000..15051d5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java @@ -0,0 +1,99 @@ +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.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\14 19:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_DISMENTLE_RECORD") +@Api("物料拆解表") +public class IfDismantleRecord extends BaseBean { + + @Column(name = "DISMANTLE_ID") + @ApiParam("拆解编号") + private String dismantleId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "PARENT_PART_NAME") + @ApiParam("产品物料名称") + private String parentPartName; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Integer qty; + + @Column(name = "DISMANTLE_QTY") + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料名称") + private String itemPartName; + + @Column(name = "OK_QTY") + @ApiParam("合格数") + private BigDecimal okQty; + + @Column(name = "MISS_QTY") + @ApiParam("缺失数") + private BigDecimal missQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数") + private BigDecimal scrapQty; + + @Column(name = "LOT_NO") + @ApiParam("批次") + private String lotNo; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java new file mode 100644 index 0000000..afecb21 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java @@ -0,0 +1,94 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE_DETAIL") +@Api("包装明细表") +public class IfPackageDetail extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "LOT_NO") + @ApiParam("包装批次") + private String lotNo; + + @Column(name = "QTY") + @ApiParam("数量") + private String qty; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编号2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编号3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编号4") + private String packageNo4; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java new file mode 100644 index 0000000..a53a8b5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java @@ -0,0 +1,86 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 10:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PRODUCT_OFF_LINE") +@Api("生产报工表") +public class IfProductOffLine extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "QTY") + @ApiParam("数量") + private String qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java new file mode 100644 index 0000000..c1c1a82 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java @@ -0,0 +1,38 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_IF") +@Api("动作接口配置") +public class MesActionIf extends BaseBean { + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index 33b2402..5b9c854 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.math.BigDecimal; /** * @Description: @@ -59,7 +60,7 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "DISMANTLE_QTY") @ApiParam("拆解数") - private Integer dismantleQty; + private BigDecimal dismantleQty; @Column(name = "ITEM_PART_NO") @ApiParam("子物料编码") @@ -71,15 +72,15 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "OK_QTY") @ApiParam("合格数") - private Integer okQty; + private BigDecimal okQty; @Column(name = "MISS_QTY") @ApiParam("缺失数") - private Integer missQty; + private BigDecimal missQty; @Column(name = "SCRAP_QTY") @ApiParam("报废数") - private Integer scrapQty; + private BigDecimal scrapQty; @Column(name = "MEMO") @ApiParam("备注") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java new file mode 100644 index 0000000..02bca6e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.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.IfDismantleRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 14:14 + * @Modify: + **/ +public interface IfDismantleRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java new file mode 100644 index 0000000..5f1dbef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.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.MesActionIf; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 11:21 + * @Modify: + **/ +public interface MesActionIfRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java new file mode 100644 index 0000000..6fe4ca3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -0,0 +1,99 @@ +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.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\14 19:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_DISMENTLE_RECORD") +@Api("物料拆解表") +public class IfDismantleRecord extends BaseBean { + + @Column(name = "DISMANTLE_ID") + @ApiParam("拆解编号") + private String dismantleId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "PARENT_PART_NAME") + @ApiParam("产品物料名称") + private String parentPartName; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Integer qty; + + @Column(name = "DISMANTLE_QTY") + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料名称") + private String itemPartName; + + @Column(name = "OK_QTY") + @ApiParam("合格数") + private BigDecimal okQty; + + @Column(name = "MISS_QTY") + @ApiParam("缺失数") + private BigDecimal missQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数") + private BigDecimal scrapQty; + + @Column(name = "LOT_NO") + @ApiParam("批次") + private String lotNo; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} 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 new file mode 100644 index 0000000..71f7100 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -0,0 +1,94 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE_DETAIL") +@Api("包装明细表") +public class IfPackageDetail extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "LOT_NO") + @ApiParam("包装批次") + private String lotNo; + + @Column(name = "QTY") + @ApiParam("数量") + private String qty; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编号2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编号3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编号4") + private String packageNo4; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java new file mode 100644 index 0000000..2309dbe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -0,0 +1,86 @@ +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: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 10:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PRODUCT_OFF_LINE") +@Api("生产报工表") +public class IfProductOffLine extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "QTY") + @ApiParam("数量") + private String qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} 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 bc3eab8..9b67963 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 @@ -818,6 +818,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(customerPart.getCustomerPartNo())) { DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); } + if (!StringUtils.isEmpty(customerPart.getCustomerPartName())) { + DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartName(), "customerPartName", packBean); + } return packBean; } From 9ca276086616dde87f14c78e721e39c5cf605dd8 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 15 Nov 2019 17:49:35 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1193?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3repository=E3=80=91/s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/repository/IfPackageDetailRepository.java | 14 ++++++++++++++ .../mes/pcn/repository/IfProductOffLineRepository.java | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java new file mode 100644 index 0000000..9a4d6be --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.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.IfPackageDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 17:47 + * @Modify: + **/ +public interface IfPackageDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java new file mode 100644 index 0000000..9d362f1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.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.IfProductOffLine; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 17:48 + * @Modify: + **/ +public interface IfProductOffLineRepository extends BaseRepository { +} From b15c3f4ae74609a699633351367eb35294c1f221 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 15 Nov 2019 18:34:23 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1101?= =?UTF-8?q?=EF=BC=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index b018ee8..88fb6d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :设备通知对象配置 @@ -37,10 +34,12 @@ public class MesEquNotifyObjectCfg extends BaseBean { @ApiParam("对象名称") private String notifyObjectName; + @Lob @Column(name="NOTIFY_OBJECT_VALUE") @ApiParam("对象值") private String notifyObjectValue; + @Lob @Column(name="NOTIFY_OBJECT_VALUE_RDD") @ApiParam("对象值") private String notifyObjectValueRdd; From 4cec8e8ac84b69c615f1077dc6ae71ec783f1ba5 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 15 Nov 2019 19:54:45 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1193?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=89=A9=E6=96=99=E6=8B=86=E8=A7=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=BD=8D=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java index 15051d5..19bbed9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java @@ -37,6 +37,10 @@ public class IfDismantleRecord extends BaseBean { @ApiParam("产线") private String workCenterCode; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + @Column(name = "PARENT_PART_NO") @ApiParam("产品物料编码") private String parentPartNo;