From 5dc142ba3459a35872606257db53460f4b12929a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 7 Sep 2020 09:56:57 +0800 Subject: [PATCH 001/329] =?UTF-8?q?=E3=80=902719=2006=201.1.10=09=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=96=87=E6=A1=A3=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=96=B0=E5=A2=9E=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/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b89b62b..c7e88b6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6382,7 +6382,7 @@ public class WmsEnumUtil { BIGDECIMAL_FORMAT(9, "Bigdecimal", "BigDecimal格式"), BLOB_FORMAT(10, "Blob", "BLOB格式"), CLOB_FORMAT(11, "Clob", "CLOB格式"), - TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式") + TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式"); private int value; private String code; From 82a1fd878563bc6358a13a69f86abb4bd1ef1ef3 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 7 Sep 2020 15:02:03 +0800 Subject: [PATCH 002/329] =?UTF-8?q?Sweb=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 3428e74..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 193cff013f0e38a62199bb6eb539d1b87e60b83b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 8 Sep 2020 10:26:29 +0800 Subject: [PATCH 003/329] =?UTF-8?q?=E3=80=902737=2009=201.2.1.9.1=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E6=96=B0=E5=A2=9E=E5=BA=93=E4=BD=8D=E5=88=AB=E5=90=8D?= =?UTF-8?q?=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/WmsLocate.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 2779b7f..3a2c1e7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -190,6 +190,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") private Integer upY; + @Column(name = "LOCATE_ALIAS") + @ApiParam(value = "库位别名") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String locateAlias; + // 导入用 @ApiParam(value = "工厂") @Transient From f73e826cd81b0f4e0cd8d70f2e2daefc5abd46d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 8 Sep 2020 22:30:21 +0800 Subject: [PATCH 004/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java index 834aedf..ce900de 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java @@ -51,7 +51,7 @@ public class ZzMesWorkOrderModel extends BaseBean { private String snp; @ApiParam(value = "包装规格") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String packageSpec; @ApiParam(value = "备注") From 99e63fea8c85096e51da3de5fe119b4222815910 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 9 Sep 2020 16:24:16 +0800 Subject: [PATCH 005/329] =?UTF-8?q?=E3=80=902741=20=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS-=E8=B4=A8=E6=A3=80=E8=B7=B3?= =?UTF-8?q?=E6=89=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index aa6cdcf..df864de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -157,4 +157,23 @@ public class WmsPartExtend extends BaseBean { @ApiParam(value = "自动采购数量") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer autoPurchaseQty; + + @Column(name = "QC_SKIP_CYCLE") + @ApiParam(value = "质检跳批周期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer qcSkipCycle; + + @Column(name = "QC_PASS_COUNT") + @ApiParam(value = "质检合格次数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer qcPassCount; + + @Column(name = "LAST_QC_TIME") + @ApiParam(value = "上次质检时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lastQcTime; + + public Integer getQcPassCount() { + return this.qcPassCount == null ? 0 :this.qcPassCount.intValue(); + } } From d33dae14dcfe49afd283bcf4c0798341dba07d46 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 9 Sep 2020 16:53:57 +0800 Subject: [PATCH 006/329] =?UTF-8?q?jsp=E8=AE=A1=E7=AE=97bug=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 38 ++++++++++++++++++++++ .../pojo/mes/bean/MesQueueJitPlanDetail.java | 23 +++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 19e6a45..3da9998 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -4484,7 +4484,9 @@ public class MesEnumUtil { public enum QUEUE_JIT_ACTUAL_STATUS { CREATE(10, "创建"), LANDED(20, "下达"), - CANCEL(30, "取消"); + CANCEL(30, "取消"), + OFFLINE(40, "下线"), + SHIPMENT(50, "发运"); private int value; private String description; 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 952b144..6c6be4c 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 @@ -5102,4 +5102,42 @@ public class MesPcnEnumUtil { } } + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_STATUS { + CREATE(10, "创建"), + LANDED(20, "下达"), + CANCEL(30, "取消"), + OFFLINE(40, "下线"), + SHIPMENT(50, "发运"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index d290454..b2631fb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -58,4 +59,26 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { @Column(name = "FORMULA_CONTENT") @ApiParam("配方内容") private String formulaContent; + + @Transient + @ApiParam("工单类型") + private Integer woType; + + @Transient + @ApiParam("子物料名称") + private String itemPartNo; + + @Transient + @ApiParam("数量") + private long qty; + + public MesQueueJitPlanDetail() { + + } + + public MesQueueJitPlanDetail(String partNo, String itemPartNo, long qty) { + this.partNo = partNo; + this.itemPartNo = itemPartNo; + this.qty = qty; + } } From e4dc2e1a469fdc6130197e3519235e928667ac71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 9 Sep 2020 18:59:23 +0800 Subject: [PATCH 007/329] =?UTF-8?q?=E3=80=902637=2008=20ext=2020042=20PCN?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=EF=BC=8Clog=E8=B0=83?= =?UTF-8?q?=E6=95=B4=200804=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesPcnSystemCfg.java | 57 ++++++++++++++++++++++ .../mes/repository/MesPcnSystemCfgRepository.java | 17 +++++++ 2 files changed, 74 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java new file mode 100644 index 0000000..a1f1796 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java @@ -0,0 +1,57 @@ +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.*; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_SYSTEM_CFG") +@Api("MES_PCN_系统配置") +public class MesPcnSystemCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324811596L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "SYS_NAME") + @ApiParam("系统名称") + private String sysName; + + @Column(name = "COMPANY") + @ApiParam("公司名称") + private String company; + + @Column(name = "SYS_LOG") + @ApiParam("系统LOG") + private String sysLog; + + @Column(name = "MAIN_LOG") + @ApiParam("主页LOG") + private String mainLog; + + @Column(name = "COPYRIGHT") + @ApiParam("版权信息") + private String copyright; + + @Transient + @ApiParam("LOG存放地址") + private String logUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java new file mode 100644 index 0000000..bc0a358 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.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.MesEquipment; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnSystemCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPcnSystemCfgRepository extends BaseRepository { +} From 7a6bda2994bce3ffcab7de3a1d422e428756a785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 9 Sep 2020 21:23:07 +0800 Subject: [PATCH 008/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/TJMgnBoardModel.java | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java new file mode 100644 index 0000000..63b76b8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +@Data +public class TJMgnBoardModel extends BaseBean { + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色") + private String partColor; + + @ApiParam("生产数量") + private Double prodQty; + + @ApiParam("一次合格数量") + private Double firstQuQty; + + @ApiParam("抛光数量") + private Double polishQty; + + @ApiParam("不合格数量") + private Double noQuQty; + + @ApiParam("一次合格率") + private String firstPassRate; + + @ApiParam("最终合格率") + private String finalPassRate; + + @ApiParam("列名") + private List> headModelList; + + @ApiParam("列值") + private List> headValueModelList; + +} From 698128aff53642c663ba7d25f5eac9f7b6f819c7 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 9 Sep 2020 23:09:36 +0800 Subject: [PATCH 009/329] =?UTF-8?q?MGN=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index d5b5feb..9e7ed23 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import java.time.LocalTime; +import java.util.Map; /** * @Description : 供应商收货看板信息 @@ -48,6 +50,12 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable> gteCurrentDayResultMap; + + @ApiParam("小于今天的结果集") + private Map> ltCurrentDayResultMap; + public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName, String planTime, Double transQty, Double resQty) { this.orderNo = orderNo; From 97a8a5a6ec93d60c7cb77aba40d29db8f726724a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 10 Sep 2020 13:14:22 +0800 Subject: [PATCH 010/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMGN=E7=B3=BB=E5=88=97?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 15 ++++++++++++++- .../i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 9cc690d..6133593 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -11,7 +11,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description : PO订单明细信息 @@ -190,6 +195,14 @@ public class WmsPOMasterDetails extends BaseBean { private String planEndDate; + /** + * 状态:1=新建,10=收货中,20=收货完成, + * 30=入库中,40=入库完成,90=已关闭,91=已取消 + */ + @Transient + @ApiParam(value = "状态", example = "1") + public Integer poStatus; + public Double getSnpVal() { return snp; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index 9e7ed23..4f21a95 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -54,7 +54,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable> gteCurrentDayResultMap; @ApiParam("小于今天的结果集") - private Map> ltCurrentDayResultMap; + private Map> ltCurrentDayResultMap; public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName, String planTime, Double transQty, Double resQty) { From c5ebcaf2b54434bc48df415018d1c6c1c0ee41a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 10 Sep 2020 14:27:49 +0800 Subject: [PATCH 011/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=85=A5=E5=BA=93=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E8=A1=A8=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 85 +++++++++++++++++++++- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 ++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 3da9998..787e7a6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3322,7 +3322,8 @@ public class MesEnumUtil { FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); + REPRODUCTION_NOT_RMS(120, "重新生产-不报功"), + REVERSE_SPRAY_ORDER(130, "反喷工单"); private int value; private String description; @@ -7095,4 +7096,86 @@ public class MesEnumUtil { } } + + /** + * 涂装导入--反喷标识（Y-正常；F-反喷） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REVERSE_SPRAY_MARK { + REVERSE_SPRAY("F", "反喷"), + NORMAL("Y", "正常"); + + private String value; + private String description; + + REVERSE_SPRAY_MARK(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MES_出入库事务表--事务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TRANS_TYPE { + + OUTSTOCK(10, "出库"), + INSTOCK(20, "入库"), + GOBACK(30, "退回"); + + private int value; + private String description; + + PACKAGE_TRANS_TYPE(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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } 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 0333bea..de9c87c 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 @@ -3326,4 +3326,28 @@ public class MesHqlPack { } return packBean; } + + /** + * 预装区域查询 + * + * @param packageTrans + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPackageTrans(MesPackageTrans packageTrans, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(packageTrans, organizeCode); + if (!StringUtils.isEmpty(packageTrans.getTransType())) { + DdlPreparedPack.getNumEqualPack(packageTrans.getTransType(), "transType", packBean); + } + if (!StringUtils.isEmpty(packageTrans.getPartNo())) { + DdlPreparedPack.getStringLikerPack(packageTrans.getPartNo(), "partNo", packBean); + } + if (!StringUtil.isEmpty(packageTrans.getCreateDateTimeStart()) || !StringUtil.isEmpty(packageTrans.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + packageTrans.getCreateDateTimeStart(), + packageTrans.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } } From 48b6634032a59b165a74d95addeef8fed271b9cd Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 10 Sep 2020 15:02:26 +0800 Subject: [PATCH 012/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE=20?= =?UTF-8?q?=E6=A0=B7=E6=9C=AC=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) 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 952b144..e65bb5a 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 @@ -5102,4 +5102,34 @@ public class MesPcnEnumUtil { } } + /** + * 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_SAMPLE_TYPE { + + NORMAL(10, "正常batch"), + FIRST(20, "首件"), + MIDDLE(30, "中件"), + LAST(40, "末件"); + + private int value; + private String description; + + PACKAGE_SAMPLE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + + } + } From 9fde75101e6b713c9ddb7948e4a46ff1acb17a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 10 Sep 2020 15:24:05 +0800 Subject: [PATCH 013/329] =?UTF-8?q?=E3=80=9011181=2019048-=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=92=8C=E4=BF=9D=E5=AD=98=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=81-2020-09-09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index 7078525..611b035 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -67,4 +67,12 @@ public class ProdOrgModel extends BaseBean { @Transient @ApiParam("序号") private Integer seq; + + @Transient + @ApiParam("工位监控模式") + private Integer monitorType; + + @Transient + @ApiParam("条码生成模式") + private Integer generateType; } From 91aa6f61a08f170e121f6b11a4591cb7dd8dd817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 10 Sep 2020 18:00:05 +0800 Subject: [PATCH 014/329] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=A2=84=E8=A3=85?= =?UTF-8?q?=E5=8C=BA=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 ---------------------- 1 file changed, 24 deletions(-) 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 de9c87c..0333bea 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 @@ -3326,28 +3326,4 @@ public class MesHqlPack { } return packBean; } - - /** - * 预装区域查询 - * - * @param packageTrans - * @param organizeCode - * @return - */ - public static DdlPackBean getMesPackageTrans(MesPackageTrans packageTrans, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(packageTrans, organizeCode); - if (!StringUtils.isEmpty(packageTrans.getTransType())) { - DdlPreparedPack.getNumEqualPack(packageTrans.getTransType(), "transType", packBean); - } - if (!StringUtils.isEmpty(packageTrans.getPartNo())) { - DdlPreparedPack.getStringLikerPack(packageTrans.getPartNo(), "partNo", packBean); - } - if (!StringUtil.isEmpty(packageTrans.getCreateDateTimeStart()) || !StringUtil.isEmpty(packageTrans.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder( - packageTrans.getCreateDateTimeStart(), - packageTrans.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - } - return packBean; - } } From ab608c0919f9421065be50b4712cbcd527154a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 10 Sep 2020 22:02:36 +0800 Subject: [PATCH 015/329] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 + .../pojo/model/platform/UserExportModel.java | 172 +++++++++++++++++++++ .../i3plus/pojo/platform/bean/SysRefUserRole.java | 2 +- 3 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 64cd8a5..d2c673a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -494,6 +494,10 @@ public class CommonEnumUtil { return tmp; } + public static String valueOfDescription(int val) { + return valueOf(val); + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java new file mode 100644 index 0000000..c3d4274 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java @@ -0,0 +1,172 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-09 + * @Modify: + **/ +@Data +@ApiModel +public class UserExportModel extends BaseBean { + + private static final long serialVersionUID = -6597413958814715617L; + + @ApiModelProperty(value ="姓名" , access ="名称") + private String infoName; + + @ApiModelProperty(value ="工号") + private String infoEmpNo; + + @ApiModelProperty(value ="角色名称" , access ="角色名称") + private String roleNameRdd; + + @ApiModelProperty(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @ApiModelProperty(value ="邮箱" , access ="邮箱") + private String userEmail; + + @ApiModelProperty(value ="手机号" , access ="手机号") + private String userPhone; + + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String departmentNameRdd; + + @ApiModelProperty(value ="岗位名称" , access ="岗位名称") + private String positionNameRdd; + + @ApiModelProperty(value ="组织名称" , access ="组织名称") + private String organizeNameRdd; + + @ApiModelProperty(value ="员工类型", access ="实习、试用期、正式") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE) + private Integer infoEmployeeType; + + @ApiModelProperty(value ="员工等级") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE) + private Integer infoGrade; + + @ApiModelProperty(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_SEX) + private Integer infoSex; + + @ApiModelProperty(value ="婚姻" , example ="1" , access ="性别（1.未知，2.已婚,3未婚）") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE) + private Integer infoMarriage; + + @ApiModelProperty(value ="证件类型") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE) + private Integer infoCardType; + + @ApiModelProperty(value ="证件编号") + private String infoCardNumber; + + @ApiModelProperty(value ="毕业专业") + private String infoSchoolProfession; + + @ApiModelProperty(value ="毕业院校") + private String infoSchool; + + @ApiModelProperty(value ="学历") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_EDUCATION) + private Integer infoSchoolEducation; + + @ApiModelProperty(value ="毕业时间") + private String infoSchoolLeaveDate; + + @ApiModelProperty(value ="籍贯") + private String infoBirthplace; + + @ApiModelProperty(value ="种族") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY) + private Integer infoRace; + + @ApiModelProperty(value ="紧急联系人") + private String infoEmergencyContact; + + @ApiModelProperty(value ="紧急联系人-电话") + private String infoEmergencyPhone; + + @ApiModelProperty(value ="入职日期" , access ="默认当前时间") + private String infoJoinDate; + + @ApiModelProperty(value ="离职日期" , access ="默认当前时间") + private String infoResignationDate; + + @ApiModelProperty(value ="出生日期") + private String infoBornDate; + + @ApiModelProperty(value ="政治面貌") + @AnnoOutputColumn(refClass = SysDictionary.class,value = "name",refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS) + private Integer infoPoliticalStatus; + + @ApiModelProperty(value ="兴趣爱好") + private String infoHobby; + + @ApiModelProperty(value ="家庭地址") + private String infoFamilyAddress; + + @ApiModelProperty(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) + private Integer userStatus; + + @ApiModelProperty(value ="用户状态" , example ="-1") + private Integer infoStatus; + + public UserExportModel() { + } + + public UserExportModel(SysUser sysUser, SysUserInfo sysUserInfo) { + setSysUser(sysUser); + setSysUserInfo(sysUserInfo); + } + + public UserExportModel setSysUser(SysUser sysUser){ + this.userLoginName=sysUser.getUserLoginName(); + this.userPhone=sysUser.getUserPhone(); + this.userEmail=sysUser.getUserEmail(); + this.infoEmpNo=sysUser.getUserEmpNo(); + return this; + } + + public UserExportModel setSysUserInfo(SysUserInfo sysUserInfo){ + this.infoName=sysUserInfo.getName(); + this.departmentNameRdd=sysUserInfo.getDepartmentNameRdd(); + this.positionNameRdd=sysUserInfo.getPositionNameRdd(); + this.organizeNameRdd=sysUserInfo.getOrganizeNameRdd(); + this.infoEmployeeType=sysUserInfo.getUserEmployeeType(); + this.infoGrade=sysUserInfo.getUserGrade(); + this.infoSex=sysUserInfo.getUserSex(); + this.infoMarriage=sysUserInfo.getUserMarriage(); + this.infoCardType=sysUserInfo.getUserCardType(); + this.infoCardNumber=sysUserInfo.getUserCardNumber(); + this.infoSchoolProfession=sysUserInfo.getUserSchoolProfession(); + this.infoSchool=sysUserInfo.getUserSchool(); + this.infoSchoolEducation=sysUserInfo.getUserSchoolEducation(); + this.infoSchoolLeaveDate=sysUserInfo.getUserSchoolLeaveDate(); + this.infoBirthplace=sysUserInfo.getUserBirthplace(); + this.infoRace=sysUserInfo.getUserRace(); + this.infoEmergencyContact=sysUserInfo.getUserEmergencyContact(); + this.infoEmergencyPhone=sysUserInfo.getUserEmergencyPhone(); + this.infoJoinDate=sysUserInfo.getUserJoinDate(); + this.infoResignationDate=sysUserInfo.getUserResignationDate(); + this.infoBornDate=sysUserInfo.getUserBornDate(); + this.infoPoliticalStatus=sysUserInfo.getUserPoliticalStatus(); + this.infoHobby=sysUserInfo.getUserHobby(); + this.infoFamilyAddress=sysUserInfo.getUserFamilyAddress(); + return this; + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java index b6bdcc9..8b2bd9f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java @@ -37,7 +37,7 @@ public class SysRefUserRole extends BaseBean { private Long userId; @Column(name="USER_NAME_RDD") - @ApiParam(value ="角色名称") + @ApiParam(value ="用户名称") private String userNameRdd; @Column(name="ROLE_ID") From 130d3a97922c6e5991e4d0c705fc4aa5ec721024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 10 Sep 2020 22:03:31 +0800 Subject: [PATCH 016/329] =?UTF-8?q?feat:=E5=AD=97=E5=85=B8=E8=A7=84?= =?UTF-8?q?=E5=88=99=E8=B0=83=E6=95=B4=E5=85=81=E8=AE=B8=E5=80=BC=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 15 +++++++++++++-- .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 9a6e187..926f68f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -254,18 +254,29 @@ public class DdlPreparedPack { } /** - * 封装String对象成equal语句 + * 封装String对象成equal语句,不封装空值，空字符串 * * @param columnName 列名 * @param packBean */ public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val); + getStringEqualAndAllowBlankPack(val, columnName, packBean); } } /** + * 封装String对象成equal语句,封装空值，空字符串 + * + * @param val 条件 + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualAndAllowBlankPack(String val, String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val); + } + + /** * 封装String对象成equal语句 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index a92c56f..e0c1886 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -662,7 +662,7 @@ public class CoreHqlPack { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(), "dictionaryValue", result); + DdlPreparedPack.getStringEqualAndAllowBlankPack(dictionary.getDictionaryValue(), "dictionaryValue", result); DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not From 799967bde5e0f294c9136e7bc0da16b7f6d63f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 10 Sep 2020 22:29:51 +0800 Subject: [PATCH 017/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 38 +++++++++++++++++++++- .../pojo/mes/model/PaintWorkOrderSnModel.java | 4 +++ .../i3plus/pojo/mes/model/TJMgnBoardModel.java | 3 ++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 95020ed..538ba18 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 @@ -1879,7 +1879,8 @@ public class MesPcnEnumUtil { FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); + REPRODUCTION_NOT_RMS(120, "重新生产-不报功"), + REVERSE_SPRAY_ORDER(130, "反喷工单"); private int value; private String description; @@ -5170,4 +5171,39 @@ public class MesPcnEnumUtil { } } + /** + * 涂装导入--反喷标识（Y-正常；F-反喷） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REVERSE_SPRAY_MARK { + REVERSE_SPRAY("F", "反喷"), + NORMAL("Y", "正常"); + + private String value; + private String description; + + REVERSE_SPRAY_MARK(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java index 2265b41..60a89fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -66,4 +66,8 @@ public class PaintWorkOrderSnModel extends BaseBean { private List prodPackageList; private String partNameRdd; + + @ApiParam("反喷标识--工单类型") + private String reverseSprayMark; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 63b76b8..469a7e1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -41,6 +41,9 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("最终合格率") private String finalPassRate; + @ApiParam("不良处理类型") + private String defectType; + @ApiParam("列名") private List> headModelList; From 5e229b7176cac1ca55cb4f29b0dc2ff39324ee00 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 11 Sep 2020 00:20:04 +0800 Subject: [PATCH 018/329] message pool --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 538ba18..47d87e1 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 @@ -2596,7 +2596,8 @@ public class MesPcnEnumUtil { TIME_MODULE_START("timeModuleStart", "定时组件开始"), ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"), ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"), - TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), + MESSAGE_POOL("messagePool", "消息池"); private String value; private String description; From 676e43fc33f25f5fbbfb136fafea4bd255d9d973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 11 Sep 2020 09:52:29 +0800 Subject: [PATCH 019/329] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E6=9D=A1=E4=BB=B6=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/sqlpack/MesHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 de9c87c..9c4f85b 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 @@ -2389,6 +2389,7 @@ public class MesHqlPack { queueJitActual.getCustPointEndDate(), "createDatetime", packBean, true); } + DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean); return packBean; } From f1715db6644f4228eee37a57f48fb75b2c90b9fd Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 11 Sep 2020 11:37:00 +0800 Subject: [PATCH 020/329] =?UTF-8?q?Finish=20Task=20#2184=20Cost:8h=202184?= =?UTF-8?q?=2006=201.2.3.7.1=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BF=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/MesPPMasterModel.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java new file mode 100644 index 0000000..7a612b3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.wms; + + +import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 生产领料计划 + * @Reference : + * @Author : puxiao + * @CreateDate : 2020-09-10 19:50 + * @Modify: + **/ +@Data +public class MesPPMasterModel { + + @ApiParam("生产计划主数据") + private MesPpMaster mesPpMaster; + + @ApiParam("生产计划明细数据") + private List mesPpDetailsList; +} From b978fa390c61e9d3902014278ea8d4c1a902ce86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 11 Sep 2020 12:03:27 +0800 Subject: [PATCH 021/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E6=B6=82=E8=A3=85=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=E5=92=8C=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 0333bea..3e688fc 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 @@ -161,6 +161,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean); + } if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } From 8a1f0c608e73e0ca536cad3876892385bf431f24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 11 Sep 2020 16:41:09 +0800 Subject: [PATCH 022/329] =?UTF-8?q?=E3=80=90=E5=9F=BA=E7=A1=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=9B=BF=E4=BB=A3=E6=96=99=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 787e7a6..90cb863 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1973,7 +1973,8 @@ public class MesEnumUtil { MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"), MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"), MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), - MES_LOCATION(570, "locationExcelService", "库位信息导入"); + MES_LOCATION(570, "locationExcelService", "库位信息导入"), + MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"); private int value; private String service; 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 05466cb..e5f1c82 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 @@ -36,4 +36,7 @@ public class MesSubPart extends BaseBean implements Serializable { @ApiParam("替代料") private String subPartNo; + @Column(name = "SUB_FLAG") + @ApiParam("替代料标识") + private String subFlag; } 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 3475f9a..889926f 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 @@ -3327,4 +3327,13 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesSubPart(MesSubPart mesSubPart) { + DdlPackBean packBean = getAllBaseData(mesSubPart.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesSubPart.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesSubPart.getSubPartNo(), "subPartNo", packBean); + DdlPreparedPack.getStringLikerPack(mesSubPart.getSubFlag(), "subFlag", packBean); + DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean); + return packBean; + } } From 3cf5c7077412ce1b9b910ae0d2e78a8da196ce1c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 11 Sep 2020 18:12:34 +0800 Subject: [PATCH 023/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMGN=E7=B3=BB=E5=88=97?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java index 7a612b3..87d933d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; import io.swagger.annotations.ApiParam; import lombok.Data; -import java.util.List; - /** * @Description : 生产领料计划 * @Reference : @@ -22,5 +20,5 @@ public class MesPPMasterModel { private MesPpMaster mesPpMaster; @ApiParam("生产计划明细数据") - private List mesPpDetailsList; + private MesPpDetails mesPpDetails; } From b389da7c2fe56cf5efb3c7590d5d9c9b5d60d482 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 11 Sep 2020 22:39:17 +0800 Subject: [PATCH 024/329] Fix Bug #11260 --- .../i3plus/pojo/mes/bean/MesPartStockSchedule.java | 8 ++++++++ .../estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 20 +++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index c695604..82bfdf1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -3,8 +3,10 @@ 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.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,8 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate +@AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_STOCK_SCHEDULE") @Api("MES_库存排程配置") @@ -75,6 +79,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "STOCK_QTY") + @ApiParam("排程实时库存") + private Integer stockQty; + @Transient @ApiParam("物料名称") private String partName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 66a0859..8dc57e7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -102,6 +102,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("客户产线代码") private String custProdLineCode; + @ApiParam("JIT排序号") + private String jitSeq; + private Integer status; public QueueOrderModel() { } @@ -309,7 +312,8 @@ public class QueueOrderModel implements Serializable { //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) { + Double queueSeq, Double queDetailSeq, String partNo, + String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode, String serialNumber) { this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.orderNo = orderNo; @@ -320,6 +324,7 @@ public class QueueOrderModel implements Serializable { this.organizeCode = organizeCode; this.vinCode = vinCode; this.produceCategoryCode = produceCategoryCode; + this.serialNumber = serialNumber; } // getQueueOrderBySerialNumber @@ -332,4 +337,17 @@ public class QueueOrderModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.workType = workType; } + + // getQueueJitActualJitSeq + public QueueOrderModel(Long id, Double queueSeq, String serialNumber, String orderNo, String prodCfgTypeCode, String vinCode, String queueGroupNo, String jitSeq, Integer status) { + this.id = id; + this.queueSeq = queueSeq; + this.serialNumber = serialNumber; + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.vinCode = vinCode; + this.queueGroupNo = queueGroupNo; + this.jitSeq = jitSeq; + this.status = status; + } } From bd20bc1552597ecbfae2e8c8dd60abba5136ce78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 11 Sep 2020 22:52:35 +0800 Subject: [PATCH 025/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E6=B6=82=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index d55e918..51dc163 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -350,6 +350,14 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("是否虚拟件") private Integer isFictive = 2; + @Transient + @ApiParam("圈数") + private Integer rounds; + + @Transient + @ApiParam("小车号") + private String smallCarNo; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From cfd507438e9601401e73919f7ac6a5de0456a100 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 12 Sep 2020 10:49:27 +0800 Subject: [PATCH 026/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index eb834de..d6da684 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -173,6 +173,10 @@ public class WmsPOMaster extends BaseBean { private Integer boardStatus; @Transient + @ApiParam("物料编码") + private String partNo; + + @Transient private List orderNoList; @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") 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 73d5512..ef66f02 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 @@ -18,6 +18,7 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Arrays; @@ -259,7 +260,6 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); @@ -277,10 +277,10 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); } - - // 查询计划时间在指定范围的单号，查询这些单号的数据 - if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { + if (!CollectionUtils.isEmpty(wmsPOMaster.getOrderNoList())) { DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); + } else { + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); } //按创建时间查询单据信息 From 15a259c8b2485ebd073c60ed710842575c247834 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 12 Sep 2020 14:51:51 +0800 Subject: [PATCH 027/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMGN=E7=B3=BB=E5=88=97?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 16 ++++++++++++++++ .../i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index eb834de..942dfca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -195,6 +195,11 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "部门名称", example = "1") public Integer departName; + @Transient + @ApiParam("周总数") + private Integer weekRcCount; + + public WmsPOMaster() { } @@ -219,6 +224,17 @@ public class WmsPOMaster extends BaseBean { this.planTime = planTime; } + public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName, + String dockCode, String planDate, String planTime) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.dock = dockCode; + this.planDate = planDate; + this.planTime = planTime; + } + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index 4f21a95..387aba1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -54,7 +54,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable> gteCurrentDayResultMap; @ApiParam("小于今天的结果集") - private Map> ltCurrentDayResultMap; + private Map> ltCurrentDayResultMap; public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName, String planTime, Double transQty, Double resQty) { From c947df6c6649791c2813c5e153bd8660c35bfd2e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 12 Sep 2020 18:27:22 +0800 Subject: [PATCH 028/329] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 25 ++++++-- .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 3 + .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 2 +- .../i3plus/pojo/wms/modelbean/WmsAgvModel.java | 47 +++++++++++++++ .../i3plus/pojo/wms/modelbean/WmsPoCountModel.java | 67 ++++++++++++++++++++++ 5 files changed, 138 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 7d1d04e..b0ac2ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -182,7 +182,7 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam(value = "版本") - private String version; + private Integer version; public WmsDocMovementSn(){} @@ -217,7 +217,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, - String whNo,String erpSrcNo,String version,Double sumQty) { + String whNo,String erpSrcNo,Integer version,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -242,7 +242,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,String custNo, + Integer version,String whNo,String custNo, String erpSrcNo,String planDate,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; @@ -258,7 +258,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,Integer snStatus,Double sumQty) { + Integer version,String whNo,Integer snStatus,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -271,7 +271,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) { + Integer version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -283,4 +283,19 @@ public class WmsDocMovementSn extends BaseBean { this.snStatus = snStatus; this.sumQty = sumQty; } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + String erpSrcNo,String vendorNo,String whNo,String assignSrcWhNo,String planDate,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.erpSrcNo = erpSrcNo; + this.vendorNo = vendorNo; + this.whNo = whNo; + this.srcWhNo = assignSrcWhNo; + this.planDate = planDate; + this.sumQty = sumQty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 78806fe..1e55325 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -1,7 +1,9 @@ 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.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -47,6 +49,7 @@ public class WmsMoveToERP extends BaseBean { * 状态:1=创建,10=待处理,20=已处理 */ @Column(name = "ORDER_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") @ApiParam(value = "状态", example = "0") public Integer orderStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index df864de..8bddf7e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -169,7 +169,7 @@ public class WmsPartExtend extends BaseBean { private Integer qcPassCount; @Column(name = "LAST_QC_TIME") - @ApiParam(value = "上次质检时间") + @ApiParam(value = "首次质检时间合格") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lastQcTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java new file mode 100644 index 0000000..9a2ae7e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : AGV接口Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-10 20:21 + * @Modify: + **/ +@Data +@Api("AGV接口Model") +public class WmsAgvModel { + + @ApiParam(value = "任务ID") + private String taskId; + + @ApiParam(value = "源库位") + private String srcLocateNo; + + @ApiParam(value = "目标库位") + private String destLocateNo; + + @ApiParam(value = "物料编号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "需求数量") + private Double qty; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam(value = "物料编号集合") + private List partNoList; + + @ApiParam(value = "目标库位编号集合") + private List destLocateNoList; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java new file mode 100644 index 0000000..432ab79 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : PO明细回传汇总Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-12 13:56 + * @Modify: + **/ +@Data +@Api("PO明细回传汇总Model") +public class WmsPoCountModel { + + @ApiParam(value = "po单号") + private String poOrderNo; + + @ApiParam(value = "收货日期") + private String rcDate; + + @ApiParam(value = "源单号") + private String srcOrderNo; + + @ApiParam(value = "源行号") + private Integer srcItem; + + @ApiParam(value = "收货批次") + private String lotNo; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "仓库") + private String whNo; + + @ApiParam(value = "汇总数量") + private Double sumQty; + + @ApiParam(value = "供应商批次") + private String venLotNo; + + @ApiParam(value = "操作人") + private String user; + + public WmsPoCountModel() { + } + + public WmsPoCountModel(String poOrderNo, String rcDate, String srcOrderNo, Integer srcItem, String lotNo, String partNo, String partName, String whNo, Double sumQty, String venLotNo, String user) { + this.poOrderNo = poOrderNo; + this.rcDate = rcDate; + this.srcOrderNo = srcOrderNo; + this.srcItem = srcItem; + this.lotNo = lotNo; + this.partNo = partNo; + this.partName = partName; + this.whNo = whNo; + this.sumQty = sumQty; + this.venLotNo = venLotNo; + this.user = user; + } +} From 0c855ba2afeee715c367d4221874dbf0638b4479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 12 Sep 2020 19:42:34 +0800 Subject: [PATCH 029/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 51dc163..4d0bcef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -358,6 +358,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("小车号") private String smallCarNo; + @Transient + @ApiParam("行颜色") + private String rowColor; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 9a2a596094a0e40dd69fa893af3c4a634545b9cb Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sat, 12 Sep 2020 20:05:38 +0800 Subject: [PATCH 030/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=9E=8B-=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 2bd1dae..b2977bb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4287,7 +4287,8 @@ public class WmsEnumUtil { REPORT(10, "REPORT", "生产报工"), BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"), REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销"), - PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"); + PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"), + SHIP_CHECK(50, "SHIP_CHECK", "发运校验"); private int value; private String code; From 9954b1e83ab9886f8f413685ad3a727d09a62ff4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 13 Sep 2020 13:57:56 +0800 Subject: [PATCH 031/329] =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3ASN=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b2977bb..2bd7583 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1452,7 +1452,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_STRATEGY_TYPE { - PART_COVERAGE(110, "物料分类覆盖"), + MATERIAL_PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), ZORE_STOCK(130, "零库存"), MATERIAL_COVERAGE(140, "物料覆盖"); From d127413055a1b359ced4ffe7cb5b47ffbfc4d3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 13 Sep 2020 14:06:53 +0800 Subject: [PATCH 032/329] =?UTF-8?q?=E3=80=9011225=2019081-=E5=AE=A2?= =?UTF-8?q?=E6=88=B7JIT=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=83=BD=E5=A4=9F=E9=80=89=E6=8B=A9L7=E7=BA=A7?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=EF=BC=8C=E8=BF=9B=E8=A1=8C=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E7=AD=9B=E9=80=89-20200910=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 56e17ba..6815e14 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -158,4 +158,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "下达按钮编号") public String buttonCode; + @Transient + @ApiParam(value = "零件号") + public String partNo; + } 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 95322a6..f310d79 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 @@ -2360,7 +2360,7 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) { + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual,List orderList, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); @@ -2392,6 +2392,9 @@ public class MesHqlPack { queueJitActual.getCustPointEndDate(), "createDatetime", packBean, true); } + if(!CollectionUtils.isEmpty(orderList)){ + DdlPreparedPack.getInPackList(orderList, "jisActualNo", packBean); + } DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean); return packBean; } From 0d5ade92a907ffc161df1c074ac8e796d6d3ca8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 13 Sep 2020 16:54:56 +0800 Subject: [PATCH 033/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=8D=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 90cb863..a9c6f83 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1974,7 +1974,8 @@ public class MesEnumUtil { MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"), MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), MES_LOCATION(570, "locationExcelService", "库位信息导入"), - MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"); + MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"), + MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"); private int value; private String service; From 8ac53abe9ec5a83248ebf3bb4658caabb7c4a81f Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 13 Sep 2020 17:22:58 +0800 Subject: [PATCH 034/329] =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3ASN=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 52 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 5 +++ 2 files changed, 57 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 2bd7583..24d3342 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -5063,6 +5063,58 @@ public class WmsEnumUtil { /** + * 生产计划主表计划状态 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PLAN_STATUS { + CREATE(10, "CREATE", "创建"), + PLANNED(20, "PLANNED", "处理中"), + CLOSE(30, "CLOSE", "已关闭"); + + private int value; + private String code; + private String description; + + WORK_ORDER_PLAN_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * 是否贵重物料 * 默认为2 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 0e69083..52fb00f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -81,6 +81,11 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String remark; + @Column(name = "WORK_ORDER_PLAN_STATUS", columnDefinition = "int default 10") + @ApiParam("工单计划状态:10-创建，20-处理中，30-已关闭") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS") + private Integer workOrderPlanStatus; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } From 17c64fbf4615c147fb50ea951e67a896de204a3e Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 13 Sep 2020 18:07:07 +0800 Subject: [PATCH 035/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E6=9C=80=E6=97=A9=E6=89=B9=E6=AC=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 21bf580..f50dd20 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 @@ -545,6 +545,15 @@ public class WmsStockSn extends BaseBean { this.locateNo = locateNo; } + public WmsStockSn(String locateNo, String partNo, String partName, String zoneNo, String unit, String whNo) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partName; + this.zoneNo = zoneNo; + this.unit = unit; + this.whNo = whNo; + } + //locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid public WmsStockSn(String locateNo, String partNo, Integer snStatus, Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) { From d3f754c8a6a3381b867421e829dc551dbd1df0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 13 Sep 2020 18:58:41 +0800 Subject: [PATCH 036/329] =?UTF-8?q?=E3=80=90=E5=AE=A2=E6=88=B7JIT=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E9=98=9F=E5=88=97=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?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/MesQueueJitActual.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 6815e14..2e24438 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -134,6 +134,14 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("工单类型") private Integer woType; + @Column(name = "OFFLINE_TIME") + @ApiParam("下线时间") + private String offlineTime; + + @Column(name = "NOTICE_SIGN") + @ApiParam("通知标识") + private String noticeSign; + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; From 1e9f1a5c47084c7a9ddf6e5d210a318bda3cfea9 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 13 Sep 2020 22:47:53 +0800 Subject: [PATCH 037/329] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=20?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 36 ++++++++++++++++ modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- .../i3plus/pojo/mes/bean/MesCheckDataCfg.java | 47 ++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 50 ++++++++++++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++ .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 47 +++++++++++++++----- .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 16 +++---- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 27 files changed, 187 insertions(+), 55 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 8ef99a3..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 3751cf9..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a6c1bea..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 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 95020ed..900e85d 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 @@ -5170,4 +5170,40 @@ public class MesPcnEnumUtil { } } + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_DATA_SOURCE { + DB(10, "数据库"), + PLC(20, "PLC"), + MANUAL_INPUT(30, "人工输入"); + + private int value; + private String description; + + QC_CHECK_DATA_SOURCE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0a2f9d4..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 5f809e6..aca1465 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 557548a..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index f10cf39..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 34a7337..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 670eb15..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ce2dc01..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index b8c9643..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java new file mode 100644 index 0000000..4fb2273 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java @@ -0,0 +1,47 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/11 14:29 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CHECK_DATA_CFG", indexes = { + @Index(columnList = "CHECK_CFG_NO") +}) +@Api("检测数据源配置") +public class MesCheckDataCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5608847087804566577L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 1b6ee58..1b50bdb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -64,18 +64,6 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("频率") private String checkFrequency; - @Transient - @ApiParam("物料名称") - private String partName; - - @Transient - @ApiParam("检测结果") - private String checkResult; - - @Transient - @ApiParam("检测值") - private String checkValue; - @Column(name = "CHECK_ITEM_TYPE") @ApiParam("检测项类型") private String checkItemType; @@ -86,12 +74,32 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private Integer isConcession = 0; + private Integer isConcession; @Column(name = "NUMBER_FLAG") @ApiParam("数量标识") private String numberFlag; + @Column(name = "QTY") + @ApiParam("检测数量") + private Integer qty; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + + @Column(name = "DATA_SOURCE") + @ApiParam("数据来源") + private String dataSource; + + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("任务单类型") + private String checkValueType; + @Column(name = "MAXIMUM") @ApiParam("最大数") private Double maximum = 0d; @@ -100,6 +108,22 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("最小数") private Double minimum = 0d; + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("检测结果") + private String checkResult; + + @Transient + @ApiParam("检测值") + private String checkValue; + @Transient @ApiParam("检测类型名称") private String checkTypeName; 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 d2e184a..7e25367 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 @@ -112,6 +112,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("样本类型") private Integer sampleType; + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index c78132b..a999a66 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -29,7 +29,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QC_ORDER_DETAIL") @Api("MES_检验单明细") -public class MesQcOrderDetail extends BaseBean implements Serializable { +public class MesQcOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -5412635747424111476L; @Column(name = "ORDER_NO") @@ -68,6 +68,10 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("判定结果") private Integer checkReulst = 0; + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + @Column(name = "ITEM_NO") @ApiParam("检验行号") private Integer itemNo = 0; @@ -76,17 +80,13 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "CHECK_VALUE") - @ApiParam("检测值") - private String checkValue; - - @ApiParam(value = "已完成数量") - @Transient - private Integer finishQty = 0; + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty; - @ApiParam(value = "检测项类型名称") - @Transient - private String businessTypeName; + @Column(name = "FINISH_QTY") + @ApiParam("已检数量") + private Integer finishQty; @Column(name = "MAXIMUM") @ApiParam("最大数") @@ -95,4 +95,29 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "MINIMUM") @ApiParam("最小数") private Double minimum = 0d; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "DATA_SOURCE") + @ApiParam("数据源") + private String dataSource; + + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("检测值类型") + private String checkValueType; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @ApiParam(value = "检测项类型名称") + @Transient + private String businessTypeName; + } 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 c7e2797..bcac673 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 @@ -465,20 +465,16 @@ public class MesPcnHqlPack { } /** - * 获取工作中心下所有的投料数据 + * 获取检测单下的所有检测明细 * - * @param mesQcOrderDetail + * @param qcOrder * @param organizeCode * @return */ - public static DdlPackBean getMesQcOrderDetail(MesQcOrderDetail mesQcOrderDetail, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean); - DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean); - DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean); - if (mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()) { - DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty() + 1, "itemNo", packBean); - } + public static DdlPackBean getMesQcOrderDetail(MesQcOrder qcOrder, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); return packBean; } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1d29933..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 284225c..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 7ff16c9..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 353a02b..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b125cee..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index c9d54a9..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 39f1e2f..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index df01041..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 0cfb344..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From cf26f7eaddefd8496bd5ca040bf22776323417a2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 14 Sep 2020 09:10:37 +0800 Subject: [PATCH 038/329] =?UTF-8?q?mespcn=E5=BC=82=E6=AD=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/FutrueTaskModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java new file mode 100644 index 0000000..917b27c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 条码解绑实体 + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class FutrueTaskModel { + + @ApiParam("实现类") + private Object futrueTaskService; + + @ApiParam("包装条码") + private StationRequestBean stationRequestBean; + + @ApiParam("过程条码") + private MesProduceSn produceSn; + + +} From 6765c58de2a38098ed10f18f412aacb3e95fa8bd Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 14 Sep 2020 09:45:50 +0800 Subject: [PATCH 039/329] =?UTF-8?q?Fix=20bug#11212=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=9A=84=E6=9D=A1=E7=A0=81=E5=9C=A8=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8A=B6=E6=80=81=E4=B8=AD=E6=9F=A5=E8=AF=A2=E6=98=AF?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=8A=B6=E6=80=81=20--20200914?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index 241599c..bce6ced 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -72,4 +72,13 @@ public class WmsWorkCenter extends BaseBean { searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; + + /** + * 分钟 + **/ + @Column(name = "ADVANCE_PULL_TIMES", columnDefinition = "int default 0") + @ApiParam(value = "提前拉动时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer advancePullTimes; + } From 802c8010137a4aaa736e690356755be51daa8511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 14 Sep 2020 11:37:57 +0800 Subject: [PATCH 040/329] =?UTF-8?q?=E3=80=9011310=2019081-=E4=B8=8B?= =?UTF-8?q?=E8=BE=BE=E8=87=B3=E4=B8=8B=E7=BA=BF=E6=97=B6=E9=97=B4=E9=A2=84?= =?UTF-8?q?=E8=AD=A6-20200913=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 41 ++++++++++++++++++++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 +-- .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 2 +- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index a9c6f83..ec7d0e5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3323,8 +3323,8 @@ public class MesEnumUtil { EMERGENCY_ORDER(80, "紧急插单"), FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), - REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"), + REPRODUCTION_RMS(110, "重新生产-报工"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"); private int value; @@ -7180,4 +7180,41 @@ public class MesEnumUtil { return tmp; } } + + /** + * 通知标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NOTICE_SIGN { + + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private int value; + private String description; + + NOTICE_SIGN(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } } diff --git a/modules/i3plus-pojo-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 47d87e1..28ed12b 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 @@ -1878,8 +1878,8 @@ public class MesPcnEnumUtil { EMERGENCY_ORDER(80, "紧急插单"), FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), - REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"), + REPRODUCTION_RMS(110, "重新生产-报工"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"); private int value; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 2e24438..e438425 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -140,7 +140,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @Column(name = "NOTICE_SIGN") @ApiParam("通知标识") - private String noticeSign; + private Integer noticeSign = 10; @Transient @ApiParam("客户需求开始时间") From 7412eb3f16dcdc5b3e83fbc33d9d06c0f59dc9d1 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 14 Sep 2020 13:44:54 +0800 Subject: [PATCH 041/329] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQcOrderRecord.java | 54 ++++++++++++++++++++++ .../mes/repository/MesCheckDataCfgRepository.java | 14 ++++++ 2 files changed, 68 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java new file mode 100644 index 0000000..72337e6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java @@ -0,0 +1,54 @@ +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: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER_RECORD") +@Api("MES_检验单检验记录") +public class MesQcOrderRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -5245624982023882232L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_RESULT") + @ApiParam("判定结果") + private Integer checkResult = 0; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "CHECK_SEQ") + @ApiParam("检测顺序") + private Integer checkSeq; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java new file mode 100644 index 0000000..06bc4e1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.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.MesCheckDataCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesCheckDataCfgRepository extends BaseRepository { +} From ddf9936d749c1831af864bdc36d8658dc5703a43 Mon Sep 17 00:00:00 2001 From: liquor <1548617474@qq.com> Date: Mon, 14 Sep 2020 15:36:50 +0800 Subject: [PATCH 042/329] =?UTF-8?q?=E5=9C=A8=E7=9C=8B=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E5=88=97=E2=80=9C=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=BA=93=E4=BD=8D=E2=80=9D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 ++- 1 file changed, 2 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 0a332da..556316e 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 @@ -521,7 +521,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.orderStatus = orderStatus; } - public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty) { + public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty,String srcLocateNo) { this.id = wmsDocMovementDetails.getId(); this.orderNo = wmsDocMovementDetails.getOrderNo(); this.partNo = wmsDocMovementDetails.getPartNo(); @@ -533,5 +533,6 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.createDatetime = wmsDocMovementDetails.getCreateDatetime(); this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); this.boxQty = boxQty; + this.srcLocateNo = srcLocateNo; } } From 92c2a49b907dee7941e9db89ea024d0256301ab1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 14 Sep 2020 21:31:19 +0800 Subject: [PATCH 043/329] =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3ASN=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 f50dd20..c9af9a4 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 @@ -832,5 +832,19 @@ public class WmsStockSn extends BaseBean { this.fixLotNo = fixLotNo; } + public WmsStockSn(String sn, Double qty, String unit, String partNo, String partNameRdd, String partTypeDesc, String lotNo, String leftCode, String fixLotNo, String vendorNo, String organizeCode) { + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.partTypeDesc = partTypeDesc; + this.lotNo = lotNo; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.vendorNo = vendorNo; + this.organizeCode = organizeCode; + } + } From 3267a9b54ff83db5aa1adf0af278a3b3a99a49fb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 15 Sep 2020 09:37:48 +0800 Subject: [PATCH 044/329] =?UTF-8?q?=E3=80=90=E5=A6=82=E4=B8=9CAGV=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java | 3 ++ .../i3plus/pojo/wms/modelbean/WmsAgvModel.java | 47 ---------------------- 2 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java index a941bf2..341533f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java @@ -53,6 +53,9 @@ public class WmsConfig extends BaseBean { @ApiParam(value ="参数值类型") private String configValueType; + /** + * SQL Server 2005:请使用 varchar(max)、nvarchar(max) 和 varbinary(max) 数据类型，而不要使用 text、ntext 和 image 数据类型。 + */ @Lob @Column(name="CONFIG_VALUE", columnDefinition = "TEXT") @ApiParam(value ="参数值") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java deleted file mode 100644 index 9a2ae7e..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAgvModel.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description : AGV接口Model - * @Reference : - * @Author : jimmy.zeng - * @CreateDate : 2020-09-10 20:21 - * @Modify: - **/ -@Data -@Api("AGV接口Model") -public class WmsAgvModel { - - @ApiParam(value = "任务ID") - private String taskId; - - @ApiParam(value = "源库位") - private String srcLocateNo; - - @ApiParam(value = "目标库位") - private String destLocateNo; - - @ApiParam(value = "物料编号") - private String partNo; - - @ApiParam(value = "物料名称") - private String partName; - - @ApiParam(value = "需求数量") - private Double qty; - - @ApiParam(value = "工厂代码") - private String organizeCode; - - @ApiParam(value = "物料编号集合") - private List partNoList; - - @ApiParam(value = "目标库位编号集合") - private List destLocateNoList; - -} From e75745380ebe60326d6eb9c5179be9ff68f0213b Mon Sep 17 00:00:00 2001 From: liquor <1548617474@qq.com> Date: Tue, 15 Sep 2020 11:44:29 +0800 Subject: [PATCH 045/329] =?UTF-8?q?=E3=80=9011324=2020011--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E6=94=B6=E8=B4=A7=E8=87=AA=E5=8A=A8=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=97=B6=E6=89=B9=E6=AC=A1=E5=AD=97=E6=AE=B5=E4=B8=BA2020-09-1?= =?UTF-8?q?1=EF=BC=8C=E9=9C=80=E8=A6=81=E5=90=8E=E5=8F=B0=E5=9C=A8?= =?UTF-8?q?=E4=BC=A0=E7=BB=99=E5=89=8D=E7=AB=AF=E6=97=B6=E5=B0=86=E5=90=8E?= =?UTF-8?q?=E4=B8=89=E4=BD=8D=E5=AD=97=E7=AC=A6=E5=8E=BB=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E5=8F=98=E4=B8=BA2020-09=E7=94=A8=E4=BA=8E=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=9B=AE=E8=A7=86=E5=8C=96-0914=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/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 c9af9a4..f9b3812 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 @@ -237,6 +237,10 @@ public class WmsStockSn extends BaseBean { @Transient public String zoneNameRdd; + @ApiParam(value = "时间") + @Transient + public String date; + @ApiParam(value = "库位名称") @Transient public String locateNameRdd; From 6e22be2d3792331a6a03f66b933d9d2a6e3315b5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 15 Sep 2020 12:06:49 +0800 Subject: [PATCH 046/329] =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3ASN=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 11 +++++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 ++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 9ba02c1..2ad5530 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -83,6 +83,11 @@ public class WmsCSRange extends BaseBean { @AnnoOutputColumn(hidden = true) public String[] zoneNos; + @Transient + @ApiParam("库存地代码") + @AnnoOutputColumn(hidden = true) + public String areaNo; + public WmsCSRange(){} public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ @@ -91,4 +96,10 @@ public class WmsCSRange extends BaseBean { this.partNameRdd = partNameRdd; } + public WmsCSRange(String zoneNo, String areaNo, String partNo, String partNameRdd) { + this.zoneNo = zoneNo; + this.areaNo = areaNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 8c80c2a..ee49f3e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -203,6 +203,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam("周总数") private Integer weekRcCount; + @Transient + @ApiParam("容差") + private Integer delayHour; + public WmsPOMaster() { @@ -229,7 +233,7 @@ public class WmsPOMaster extends BaseBean { } public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName, - String dockCode, String planDate, String planTime) { + String dockCode, String planDate, String planTime, Integer delayHour) { this.orderNo = orderNo; this.poStatus = poStatus; this.vendorNo = vendorNo; @@ -237,6 +241,7 @@ public class WmsPOMaster extends BaseBean { this.dock = dockCode; this.planDate = planDate; this.planTime = planTime; + this.delayHour = delayHour; } public int getPoStatusVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 6133593..d97792c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -133,6 +133,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "是否免费", example = "1") private Integer isFree; + @Column(name = "DELAY_HOUR", columnDefinition = "int default 0") + @ApiParam(value = "容差") + private Integer delayHour; + @Column(name = "REMARK") @ApiParam("备注") private String remark; From 6fa35ad939b597edfd32a8ab35a5f1c8ef27ef0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 15 Sep 2020 13:29:26 +0800 Subject: [PATCH 047/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E5=8F=96=E6=B6=88=E6=9D=A1=E7=A0=81=E8=A1=A5=E6=89=93?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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 28ed12b..9c495fe 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 @@ -58,19 +58,21 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { - MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(20, "展示组件"), - BUTTON_MODULE(30, "按钮组件"), - TIMING_MODULE(40, "定时组件"), - PCS_BACK_MODULE(50, "工序后台组件"), - PLC_CALLBACK_MODULE(60, "PLC回调工位参数"), - ASSIST_MODULE(70, "辅助组件"); + MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"), + REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"), + BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"), + TIMING_MODULE(40, "TIMING_MODULE", "定时组件"), + PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"), + PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"), + ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件"); private int value; + private String data; private String description; - WORK_MODULE_TYPE(int value, String description) { + WORK_MODULE_TYPE(int value, String data, String description) { this.value = value; + this.data = data; this.description = description; } @@ -78,6 +80,8 @@ public class MesPcnEnumUtil { return value; } + public String getData() { return data; } + public String getDescription() { return description; } From 531fe743c2181351413a4c171a7f82ea66260882 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 15 Sep 2020 14:23:19 +0800 Subject: [PATCH 048/329] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E6=B5=8B=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A6=96=E6=A3=80=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 51 +++++++++++++++++++--- .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 20 +++++---- .../mes/repository/MesQcOrderRecordRepository.java | 18 ++++++++ 3 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.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 1500290..4b63234 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 @@ -5208,18 +5208,59 @@ public class MesPcnEnumUtil { } /** - * 客户JIT生产队列状态 + * 过程检测数据源类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_CHECK_DATA_SOURCE { - DB(10, "数据库"), - PLC(20, "PLC"), - MANUAL_INPUT(30, "人工输入"); + DB(10, "10", "数据库"), + PLC(20, "20", "PLC"), + MANUAL_INPUT(30, "30", "人工输入"); + + private int value; + private String description; + private String code; + + QC_CHECK_DATA_SOURCE(int value, String code, String description) { + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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) + public enum QC_CHECK_VALUE_TYPE { + STRING(10, "字符串"), + INTEGER(20, "数值"); private int value; private String description; - QC_CHECK_DATA_SOURCE(int value, String description) { + QC_CHECK_VALUE_TYPE(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index a999a66..6fefde1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -64,14 +64,6 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("是否允许让步") private Integer isConcession = 0; - @Column(name = "CHECK_REULST") - @ApiParam("判定结果") - private Integer checkReulst = 0; - - @Column(name = "CHECK_VALUE") - @ApiParam("检测值") - private String checkValue; - @Column(name = "ITEM_NO") @ApiParam("检验行号") private Integer itemNo = 0; @@ -120,4 +112,16 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Transient private String businessTypeName; + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + + @Transient + @ApiParam("判定结果") + private Integer checkResult = 0; + + @Transient + @ApiParam("检测值") + private String checkValue; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java new file mode 100644 index 0000000..33abfd8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesQcOrderRecordRepository extends BaseRepository { + +} From 485c66aaf77db17d36fc1dcb71fef34cb829a5f4 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 15 Sep 2020 17:10:15 +0800 Subject: [PATCH 049/329] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..0a44fb0 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 6e803445d74850fb39bcb5760de655946841a29f Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 15 Sep 2020 17:27:08 +0800 Subject: [PATCH 050/329] Fix Bug #11320,#11213 --- .../estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index a5a55d2..ad28143 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -39,11 +39,15 @@ public class WmsAutoPurchasePartModel extends Pager { @ApiParam("供应商名称") private String vendorName; - public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) { + @ApiParam("要货时间") + private String arriveTime; + + public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, String arriveTime) { this.partNo = partNo; this.partName = partName; this.qty = qty; this.erpWarehouse = warehouse; + this.arriveTime = arriveTime; } public WmsAutoPurchasePartModel() { From dd1ece9be844ab91c49e362945ebe745c642f773 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 15 Sep 2020 17:45:32 +0800 Subject: [PATCH 051/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=20=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) 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 4b63234..8b95c10 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 @@ -3779,7 +3779,7 @@ public class MesPcnEnumUtil { * 整体检测结果状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CHECK_REULST { + public enum CHECK_RESULT { PASS(10, "通过"), NON_PASS(20, "不通过"), @@ -3788,7 +3788,7 @@ public class MesPcnEnumUtil { private int value; private String description; - CHECK_REULST(int value, String description) { + CHECK_RESULT(int value, String description) { this.value = value; this.description = description; } @@ -5284,4 +5284,24 @@ public class MesPcnEnumUtil { } } + /** + * 过程检测检测检测结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_RESULT { + OK(10), + NOT_OK(20), + MANUAL(30); + + private int value; + + QC_CHECK_VALUE_RESULT(int value) { + this.value = value; + } + + public int getValue() { + return value; + } + } + } From 900fd5d5b7498a9def96703ef06fd5d4801e7e4d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 15 Sep 2020 19:30:41 +0800 Subject: [PATCH 052/329] =?UTF-8?q?MGN=E6=A0=87=E5=87=86=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 143f6d8..530005d 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 @@ -401,4 +401,12 @@ public class WmsMoveSn extends BaseBean { this.srcSnStatus = srcSnStatus; this.destSnStatus = destSnStatus;; } + + + public WmsMoveSn(String sn, String refSrc, String transTypeName, Integer itemStatus) { + this.sn = sn; + this.refSrc = refSrc; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + } } From a3eb1e83f3af185dcce6d2e30d5b5bc4d00349b6 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 15 Sep 2020 19:39:36 +0800 Subject: [PATCH 053/329] Fix Bug #11320,#11213 --- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index ad28143..71a6e00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -40,9 +40,9 @@ public class WmsAutoPurchasePartModel extends Pager { private String vendorName; @ApiParam("要货时间") - private String arriveTime; + private Integer arriveTime; - public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, String arriveTime) { + public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer arriveTime) { this.partNo = partNo; this.partName = partName; this.qty = qty; From 48443a57de0449a8efc7917adc1b41a0c7a17acb Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 15 Sep 2020 19:56:06 +0800 Subject: [PATCH 054/329] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index 71a6e00..e651958 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -40,14 +40,17 @@ public class WmsAutoPurchasePartModel extends Pager { private String vendorName; @ApiParam("要货时间") - private Integer arriveTime; + private String arriveTime; - public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer arriveTime) { + private Integer preReceivingDay; + + + public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer preReceivingDay) { this.partNo = partNo; this.partName = partName; this.qty = qty; this.erpWarehouse = warehouse; - this.arriveTime = arriveTime; + this.preReceivingDay = preReceivingDay; } public WmsAutoPurchasePartModel() { From 6dca5ccb0988dd87d1dcd16987a2360db765f4d2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 15 Sep 2020 21:23:24 +0800 Subject: [PATCH 055/329] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index 917b27c..77ab351 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -23,5 +23,14 @@ public class FutrueTaskModel { @ApiParam("过程条码") private MesProduceSn produceSn; + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + } From 55a8bcad72ebc904cae5a648e3b855cdf6dfdac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 15 Sep 2020 23:03:25 +0800 Subject: [PATCH 056/329] =?UTF-8?q?feat(core):=E7=B3=BB=E7=BB=9F=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/UserExportModel.java | 64 ++++++++++-------- .../pojo/platform/bean/SysSoftUpdateRecord.java | 78 ++++++++++++++++++++++ .../repository/SysSoftUpdateRecordRepository.java | 14 ++++ .../platform/repository/SysToolTypeRepository.java | 9 +++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 22 ++++++ 5 files changed, 159 insertions(+), 28 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSoftUpdateRecord.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSoftUpdateRecordRepository.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java index c3d4274..c665e3b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java @@ -135,38 +135,46 @@ public class UserExportModel extends BaseBean { } public UserExportModel setSysUser(SysUser sysUser){ - this.userLoginName=sysUser.getUserLoginName(); - this.userPhone=sysUser.getUserPhone(); - this.userEmail=sysUser.getUserEmail(); - this.infoEmpNo=sysUser.getUserEmpNo(); + if (sysUser != null) { + this.userLoginName = sysUser.getUserLoginName(); + this.userPhone = sysUser.getUserPhone(); + this.userEmail = sysUser.getUserEmail(); + this.infoEmpNo = sysUser.getUserEmpNo(); + } else { + this.userLoginName = "用户账号不存在"; + } return this; } public UserExportModel setSysUserInfo(SysUserInfo sysUserInfo){ - this.infoName=sysUserInfo.getName(); - this.departmentNameRdd=sysUserInfo.getDepartmentNameRdd(); - this.positionNameRdd=sysUserInfo.getPositionNameRdd(); - this.organizeNameRdd=sysUserInfo.getOrganizeNameRdd(); - this.infoEmployeeType=sysUserInfo.getUserEmployeeType(); - this.infoGrade=sysUserInfo.getUserGrade(); - this.infoSex=sysUserInfo.getUserSex(); - this.infoMarriage=sysUserInfo.getUserMarriage(); - this.infoCardType=sysUserInfo.getUserCardType(); - this.infoCardNumber=sysUserInfo.getUserCardNumber(); - this.infoSchoolProfession=sysUserInfo.getUserSchoolProfession(); - this.infoSchool=sysUserInfo.getUserSchool(); - this.infoSchoolEducation=sysUserInfo.getUserSchoolEducation(); - this.infoSchoolLeaveDate=sysUserInfo.getUserSchoolLeaveDate(); - this.infoBirthplace=sysUserInfo.getUserBirthplace(); - this.infoRace=sysUserInfo.getUserRace(); - this.infoEmergencyContact=sysUserInfo.getUserEmergencyContact(); - this.infoEmergencyPhone=sysUserInfo.getUserEmergencyPhone(); - this.infoJoinDate=sysUserInfo.getUserJoinDate(); - this.infoResignationDate=sysUserInfo.getUserResignationDate(); - this.infoBornDate=sysUserInfo.getUserBornDate(); - this.infoPoliticalStatus=sysUserInfo.getUserPoliticalStatus(); - this.infoHobby=sysUserInfo.getUserHobby(); - this.infoFamilyAddress=sysUserInfo.getUserFamilyAddress(); + if (sysUserInfo != null) { + this.infoName = sysUserInfo.getName(); + this.departmentNameRdd = sysUserInfo.getDepartmentNameRdd(); + this.positionNameRdd = sysUserInfo.getPositionNameRdd(); + this.organizeNameRdd = sysUserInfo.getOrganizeNameRdd(); + this.infoEmployeeType = sysUserInfo.getUserEmployeeType(); + this.infoGrade = sysUserInfo.getUserGrade(); + this.infoSex = sysUserInfo.getUserSex(); + this.infoMarriage = sysUserInfo.getUserMarriage(); + this.infoCardType = sysUserInfo.getUserCardType(); + this.infoCardNumber = sysUserInfo.getUserCardNumber(); + this.infoSchoolProfession = sysUserInfo.getUserSchoolProfession(); + this.infoSchool = sysUserInfo.getUserSchool(); + this.infoSchoolEducation = sysUserInfo.getUserSchoolEducation(); + this.infoSchoolLeaveDate = sysUserInfo.getUserSchoolLeaveDate(); + this.infoBirthplace = sysUserInfo.getUserBirthplace(); + this.infoRace = sysUserInfo.getUserRace(); + this.infoEmergencyContact = sysUserInfo.getUserEmergencyContact(); + this.infoEmergencyPhone = sysUserInfo.getUserEmergencyPhone(); + this.infoJoinDate = sysUserInfo.getUserJoinDate(); + this.infoResignationDate = sysUserInfo.getUserResignationDate(); + this.infoBornDate = sysUserInfo.getUserBornDate(); + this.infoPoliticalStatus = sysUserInfo.getUserPoliticalStatus(); + this.infoHobby = sysUserInfo.getUserHobby(); + this.infoFamilyAddress = sysUserInfo.getUserFamilyAddress(); + } else { + this.infoName = "用户消息不存在"; + } return this; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSoftUpdateRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSoftUpdateRecord.java new file mode 100644 index 0000000..f5985dc --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSoftUpdateRecord.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-13 17:35 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_SOFT_UPDATE_RECORD") +@ApiModel(value="软件更新记录",description = "软件更新记录") +public class SysSoftUpdateRecord extends BaseBean { + + @Column(name="SYSTEM_SOFT_TYPE") + @ApiParam(value ="系统软件类型") + private Integer systemSoftType; + + public String getSystemSoftTypeTxt(){ + return systemSoftType == null ? "无" : CommonEnumUtil.SOFT_TYPE.valueOfDescription(systemSoftType); + } + + @Column(name="SYSTEM_VERSION") + @ApiParam(value ="系统版本") + private String systemVersion; + + @Lob + @Column(name="UPDATE_CONTENT") + @ApiParam(value ="更新内容") + private String updateContent; + + @Column(name="FIRST_DEPLOYMENT_TIME") + @ApiParam(value ="首次部署时间") + private String firstDeploymentTime; + + @Transient + private Map> updateDetailMap; + + public void putUpdateDetail(String detailType, String detail) { + if(updateDetailMap == null){ + updateDetailMap = new HashMap<>(); + } + + List detailList; + if (updateDetailMap.containsKey(detailType)) { + detailList = updateDetailMap.get(detailType); + } else { + detailList = new ArrayList<>(); + updateDetailMap.put(detailType, detailList); + } + + detailList.add(detail); + } + + public void transformUpdateDetail() { + this.updateContent = JSON.toJSONString(updateDetailMap); + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSoftUpdateRecordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSoftUpdateRecordRepository.java new file mode 100644 index 0000000..9b9953c --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSoftUpdateRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSoftUpdateRecord; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-14 13:15 + * @Modify: + **/ +public interface SysSoftUpdateRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java index f74a350..614b9a7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java @@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.SysToolType; +import org.springframework.data.jpa.repository.Lock; +import org.springframework.data.jpa.repository.Query; + +import javax.persistence.LockModeType; /** * @Description : 设备类型 @@ -11,4 +15,9 @@ import cn.estsh.i3plus.pojo.platform.bean.SysToolType; * @Modify : **/ public interface SysToolTypeRepository extends BaseRepository { + + @Lock(LockModeType.PESSIMISTIC_WRITE) + @Query(value = "from SysToolType where id = ?1") + SysToolType getByIds(Long id); + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index e0c1886..ff6f6bc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -1210,4 +1210,26 @@ public class CoreHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); + + DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSoftUpdateRecord.getSystemVersion(), "systemVersion", ddlPackBean); + DdlPreparedPack.timeBuilder(sysSoftUpdateRecord.getFirstDeploymentTime(), "firstDeploymentTime", ddlPackBean, false, + true); + + return ddlPackBean; + } + + public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); + + DdlPreparedPack.getNumNOEqualPack(sysSoftUpdateRecord.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSoftUpdateRecord.getSystemVersion(), "systemVersion", ddlPackBean); + + return ddlPackBean; + } + } \ No newline at end of file From 163d0773a95d0a6f626cfa4b71aa5bb553467ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 16 Sep 2020 00:28:21 +0800 Subject: [PATCH 057/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0a44fb0..aca1465 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 7ab755c9f58a5531f027bc53fb028f7605a91e3a Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 16 Sep 2020 00:46:14 +0800 Subject: [PATCH 058/329] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E6=B5=8B=20?= =?UTF-8?q?16=20=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesLoopQcGenerateDetail.java | 10 ++- .../pojo/mes/bean/MesQcOrderApprovalStatus.java | 89 ++++++++++++++++++++++ .../mes/model/QcOrderCheckDataDetailModel.java | 48 ++++++++++++ .../MesQcOrderApprovalStatusRepository.java | 14 ++++ 4 files changed, 158 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java index 6a2d772..f7b71d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java @@ -29,7 +29,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_LOOP_QC_GENERATE_DETAIL") @Api("MES_巡检项生成明细") -public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { +public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -5412635747424111476L; @Column(name = "RELATION_ORDER_NO") @@ -44,9 +44,13 @@ public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { @ApiParam("检测项") private String checkItem; - @Column(name = "LASR_TIME") + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + + @Column(name = "LAST_TIME") @ApiParam("末次时间") - private String lasrTime; + private String lastTime; @ApiParam(value = "物料号") @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java new file mode 100644 index 0000000..c1774c7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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 + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER_APPROVAL_STATUS") +@Api("检测单审批状态表") +public class MesQcOrderApprovalStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = -3157480917343280506L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单号") + private String workOrderNo; + + @Column(name = "PLAN_QTY") + @ApiParam("计划数量") + private Double planQty; + + @Column(name = "CHECK_TYPE") + @ApiParam("检验类型") + private Integer checkType; + + @Column(name = "QC_USER") + @ApiParam("检查人") + private String qcUser; + + @Column(name = "CHECK_RESULT") + @ApiParam("检验结果") + private String checkResult; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测") + private Integer isKeyCheckItem; + + @Column(name = "QUALITY_APPROVAL_STATUS") + @ApiParam("质量经理审批状态") + private Integer qualityApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "QUALITY_CHOICE") + @ApiParam("质量经理审批状态") + private Integer qualityChoice; + + @Column(name = "PRODUCE_APPROVAL_STATUS") + @ApiParam("生产经理审批状态") + private Integer produceApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "PRODUCE_CHOICE") + @ApiParam("生产经理审批状态") + private Integer produceChoice; + + @Column(name = "APPROVAL_STATUS") + @ApiParam("生产经理审批状态") + private Integer approvalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java new file mode 100644 index 0000000..170de7d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/9/16 00:24 + * @desc + */ +@Data +public class QcOrderCheckDataDetailModel { + + private Integer checkType; + + private String checkItem; + + private String checkStandard; + + private Integer checkCount; + + private Integer isConcession; + + private Integer isKeyCheckItem; + + private Double max; + + private Double min; + + private String checkValue; + + private Integer checkResult; + + + public QcOrderCheckDataDetailModel(Integer checkType, String checkItem, String checkStandard, Integer checkCount, + Integer isConcession, Integer isKeyCheckItem, Double max, Double min, + String checkValue, Integer checkResult) { + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkCount = checkCount; + this.isConcession = isConcession; + this.isKeyCheckItem = isKeyCheckItem; + this.max = max; + this.min = min; + this.checkValue = checkValue; + this.checkResult = checkResult; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java new file mode 100644 index 0000000..28d572d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.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.MesQcOrderApprovalStatus; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQcOrderApprovalStatusRepository extends BaseRepository { +} From 817f4b28129c1bf40ff35691144781df357c7cad Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 16 Sep 2020 09:26:07 +0800 Subject: [PATCH 059/329] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index 6224656..7b4df40 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -45,4 +45,16 @@ public class MesCustProdLine extends BaseBean implements Serializable { @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "CUST_PROD_LINE_FLAG") + @ApiParam("客户产线标识") + private String custProdLineFlag; + + @Column(name = "DOCK_NO") + @ApiParam("dock") + private String dockNo; } From 50c2258f58ca40d65bfa236a2649d683ce456b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 16 Sep 2020 11:31:39 +0800 Subject: [PATCH 060/329] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E6=9D=A1=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 37 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index ec7d0e5..77340aa 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7217,4 +7217,39 @@ public class MesEnumUtil { } } + + /** + * 触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STEP_TRIGGER_TYPE { + INTERNAL_TRIGGER(10, "内部触发"), + EXTERNAL_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + STEP_TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index bd996b0..eb70530 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -136,6 +136,28 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("产品颜色") private String colorName; + @Transient + @ApiParam("零件号") + private String partNo; + + @Transient + @ApiParam("零件名称") + private String partNameRdd; + + @Transient + @ApiParam("箱数") + private Integer boxQty; + + @Transient + @ApiParam("开始时间") + private String startTime; + + @Transient + @ApiParam("结束时间") + private String endTime; + + public MesQueueOrder(){} + public int getStatusVal() { return this.status == null ? 0 : this.status; } @@ -144,4 +166,19 @@ public class MesQueueOrder extends BaseBean implements Serializable { return this.seq == null ? 0.0d : this.seq; } + public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, + Integer queueType,Integer status,String createUser, + String createDatetime,String modifyUser,String modifyDatetime) { + this.seq = seq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.boxQty = boxQty; + this.queueType = queueType; + this.status = status; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } + } From d19fbe8cf116b7db63776fc5a548e4ad0590e515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 16 Sep 2020 15:22:15 +0800 Subject: [PATCH 061/329] =?UTF-8?q?fix(core):=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=87=BA=E6=97=B6=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/platform/UserExportModel.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java index c665e3b..527391a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java @@ -119,13 +119,10 @@ public class UserExportModel extends BaseBean { @ApiModelProperty(value ="家庭地址") private String infoFamilyAddress; - @ApiModelProperty(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1") + @ApiModelProperty(value ="账号状态" , example ="-1") @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) private Integer userStatus; - @ApiModelProperty(value ="用户状态" , example ="-1") - private Integer infoStatus; - public UserExportModel() { } @@ -140,6 +137,7 @@ public class UserExportModel extends BaseBean { this.userPhone = sysUser.getUserPhone(); this.userEmail = sysUser.getUserEmail(); this.infoEmpNo = sysUser.getUserEmpNo(); + this.userStatus = sysUser.getUserStatus(); } else { this.userLoginName = "用户账号不存在"; } @@ -172,6 +170,11 @@ public class UserExportModel extends BaseBean { this.infoPoliticalStatus = sysUserInfo.getUserPoliticalStatus(); this.infoHobby = sysUserInfo.getUserHobby(); this.infoFamilyAddress = sysUserInfo.getUserFamilyAddress(); + this.organizeCode=sysUserInfo.getOrganizeCode(); + this.createDatetime=sysUserInfo.getCreateDatetime(); + this.createUser=sysUserInfo.getCreateUser(); + this.modifyDatetime=sysUserInfo.getModifyDatetime(); + this.modifyUser=sysUserInfo.getModifyUser(); } else { this.infoName = "用户消息不存在"; } From ad5c122df80d4263e1ff0f373f11e22073d14a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 16 Sep 2020 16:29:28 +0800 Subject: [PATCH 062/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3-=E6=B7=BB=E5=8A=A0=E6=80=BB=E8=A3=85=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E6=B5=8B=E5=BC=B9=E6=A1=86=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E5=92=8C=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++ .../pojo/mes/model/DismantleRecordModel.java | 46 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/FutrueTaskModel.java | 11 +++++- 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java 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 a22dd03..c809906 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 @@ -140,6 +140,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("库位代码") private String locationCode; + @Column(name = "ERP_WORK_CENTER_CODE") + @ApiParam("erp工作中心") + private String erpWorkCenterCode; + @Transient @ApiParam("目标库位代码") private String destLocationCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java new file mode 100644 index 0000000..99913d8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class DismantleRecordModel { + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("用户") + private String userInfo; + + @ApiParam("物料拆解集合") + private List dismantleRecordList; + + @ApiParam("不良集合") + private List defectList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index 77ab351..1fdcdda 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @Description: 条码解绑实体 * @Reference: @@ -12,7 +14,7 @@ import lombok.Data; * @Modify: **/ @Data -public class FutrueTaskModel { +public class FutrueTaskModel { @ApiParam("实现类") private Object futrueTaskService; @@ -32,5 +34,12 @@ public class FutrueTaskModel { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("总装批量执行逻辑") + private List requestBeanList; + + @ApiParam("总装批量执行逻辑") + private Object specialBusinessType; + + } From f58e07fa335bb7278d32306fb7f6afcbd06dd586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 16 Sep 2020 16:30:41 +0800 Subject: [PATCH 063/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3-=E6=B7=BB=E5=8A=A0=E6=80=BB=E8=A3=85=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E6=B5=8B=E5=BC=B9=E6=A1=86=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E5=92=8C=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java index 99913d8..931906d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesDefect; import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord; -import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; From ba8022f9ca4ea1c858bd915e57fa7ee174e65401 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 16 Sep 2020 19:31:29 +0800 Subject: [PATCH 064/329] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E6=9D=A1=E7=A0=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 382dd6a..e33fd3a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -124,6 +124,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("分组序号") private String groupSeq; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Transient @ApiParam("Vin") private String vinCode; @@ -181,10 +185,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { private Integer masterStatus; @Transient - @ApiParam("产品条码") - private String productSn; - - @Transient @ApiParam("队列类型") private Integer queueType; From ae6ffa27f485c8dc61694b5f71fef69e865a82ce Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 16 Sep 2020 21:15:50 +0800 Subject: [PATCH 065/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 28 +++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 +++ .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 35 +++++++++++++++++++++- 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 926f68f..341490d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.base.tool; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; @@ -649,6 +650,33 @@ public class DdlPreparedPack { } } + + /** + * 多个字段列or查询 + * + * @param data + * @param columnNames + * @param columnNamesKey + * @param packBean + */ + public static void getMultOrPackString(String data, List columnNames, String columnNamesKey, DdlPackBean packBean) { + StringBuffer sbf = new StringBuffer(" and ( "); + if (StringUtil.isEmpty(columnNamesKey)) { + columnNamesKey = "mult_column_name"; + } + for (int i = 0; i < columnNames.size(); i++) { + String columnName = columnNames.get(i); + sbf.append(" model." + columnName + "=:m_" + columnNamesKey); + if (i == columnNames.size() - 1) { + continue; + } + sbf.append(" or "); + } + sbf.append(" )"); + packBean.addColumnQuery(columnNamesKey, sbf.toString(), data); + + } + /** * 封装in String查询语句 * 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 68738c4..fda0174 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 @@ -265,6 +265,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @ApiParam(value = "jis料架号") private String queueGroupNo; + @Transient + @ApiParam(value = "来源存储区/目标存储区") + private Integer srcOrDestZoneno; + 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/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index a587db3..6312970 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -9,7 +9,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -154,6 +158,12 @@ public class WmsStockQuan extends BaseBean { @Transient private Integer isSnapshot; + + @Transient + @ApiParam(value = "应有数量") + private Double theoryQty; + + public Integer getIsSnapshot() { return this.isSnapshot == null ? 0 : this.isSnapshot; } @@ -229,11 +239,34 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; + this.sumQty = sumQty; this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; } + public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + this.organizeCode = organizeCode; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partName; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.sumQty = sumQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.scrapQty = scrapQty; + } public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; From 5e0c0a40517b452b0d4da8281ca165315b6f66d0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 16 Sep 2020 21:18:13 +0800 Subject: [PATCH 066/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 ef66f02..9b0e4ed 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 @@ -1203,8 +1203,15 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { + List columnNames = new ArrayList<>(); + columnNames.add("srcZoneNo"); + columnNames.add("destZoneNo"); + DdlPreparedPack.getMultOrPackString(wmsMoveDetails.getZoneNo(), columnNames, null, packBean); + } else { + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + } DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean); DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); From 1072b4fd046ba5d07e495da9c46c649d6445bed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 16 Sep 2020 22:47:10 +0800 Subject: [PATCH 067/329] =?UTF-8?q?=E3=80=90=E5=8D=8A=E6=88=90=E5=93=81?= =?UTF-8?q?=E9=A2=84=E8=A3=85=E9=98=9F=E5=88=97=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/bean/MesQueueOrder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index eb70530..aa802ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -168,7 +168,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, - String createDatetime,String modifyUser,String modifyDatetime) { + String createDatetime,String modifyUser,String modifyDatetime,String workType) { this.seq = seq; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -179,6 +179,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.workType = workType; } } From 17dae8208170089ee5c2ac10b690c76e387408e5 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 17 Sep 2020 07:53:52 +0800 Subject: [PATCH 068/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E5=B7=A5=E5=8D=95=E7=9A=84=E6=BB=91=E5=8A=A8=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 5 +++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 17 +++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 52fb00f..4ca4350 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : MES_生产计划主表 @@ -86,6 +87,10 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS") private Integer workOrderPlanStatus; + @Transient + @ApiParam("是否要从拉动计算中扣除") + private boolean needMinutPullQty = false; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index bce6ced..1840675 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -72,13 +72,18 @@ public class WmsWorkCenter extends BaseBean { searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; - - /** - * 分钟 - **/ - @Column(name = "ADVANCE_PULL_TIMES", columnDefinition = "int default 0") + @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180") @ApiParam(value = "提前拉动时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) - private Integer advancePullTimes; + private Integer preReadyMinute; + + @Column(name = "PULL_RANGE_MINUTE", columnDefinition = "int default 180") + @ApiParam(value = "拉动区间时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer pullRangeMinute; + @Column(name = "NEXT_PULL_TIME", columnDefinition = "varchar(50) default '' ") + @ApiParam(value = "下次拉动时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private String nextPullTime; } From f9db132861acda07d57feea80d613b71bc344900 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 17 Sep 2020 10:24:42 +0800 Subject: [PATCH 069/329] =?UTF-8?q?=E5=9D=A4=E6=B3=B0SWEBU9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 691defd..6e210ce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -11,7 +11,8 @@ public class WmsInterfaceEnumUtil { MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), - WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"); + WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"), + SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"); private int value; private String name; From a9b18733ec1541423e4362c772ba0fa4d330e035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 17 Sep 2020 16:27:33 +0800 Subject: [PATCH 070/329] =?UTF-8?q?=E3=80=9011218=2019081-=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E7=B3=BB=E7=BB=9F=E5=A2=9E=E5=8A=A0PLC=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E6=8E=A7=E5=88=B6=E4=B8=89=E8=89=B2=E7=81=AF-20200910?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 20 ++++++++++++++++++++ .../i3plus/pojo/andon/model/CommonMsgModel.java | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index 385b069..cc45276 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -51,6 +51,22 @@ public class AndonPLC extends BaseBean implements Serializable { @ApiParam(value = "IP地址") private String nodeIP; + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + + @Column(name = "OPC_URL") + @ApiParam("OPCUA路径") + private String opcUrl; + + @Column(name = "NAME_SPACE_INDEX") + @ApiParam("空间索引") + private Integer nameSpaceIndex = 2; + @Column(name = "CHANNEL_NAME") @ApiParam(value = "通道名称") private String channelName; @@ -67,6 +83,10 @@ public class AndonPLC extends BaseBean implements Serializable { @ApiParam(value = "标签类型") private String tagType; + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + @Column(name = "GROUP_NO") @ApiParam(value = "分组号") private String groupNo; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java index 47588b4..b6ac672 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,7 +32,7 @@ public class CommonMsgModel implements Serializable { private String msgType; @ApiModelProperty("消息数据") - private Map msgData; + private Map msgData = new HashMap<>(); @ApiModelProperty("流程状态集合") private List routeStatusList; From 21ca0a9d0d74ff3bcbb1f34228b650032ca83f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 17 Sep 2020 16:47:02 +0800 Subject: [PATCH 071/329] =?UTF-8?q?=E3=80=9011437=2019081-=E5=8D=8A?= =?UTF-8?q?=E6=88=90=E5=93=81=E9=A2=84=E8=A3=85=E9=98=9F=E5=88=97=E4=BC=98?= =?UTF-8?q?=E5=8C=96-20200917=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/bean/MesQueueOrder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index aa802ef..5d1f42f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -168,7 +168,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, - String createDatetime,String modifyUser,String modifyDatetime,String workType) { + String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo) { this.seq = seq; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -180,6 +180,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; this.workType = workType; + this.orderNo = orderNo; } } From e18ad44c14385fd39239d38645207c2dfe987332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 17 Sep 2020 19:27:04 +0800 Subject: [PATCH 072/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index dcf9033..70fab83 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -12,10 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -88,6 +85,14 @@ public class MesBom extends BaseBean implements Serializable { @ApiParam("BOM代码") private String bomCode; + @Transient + @ApiParam(value = "过程条码") + public String serialNumber; + + @Transient + @ApiParam(value = "已拆解数量") + public Double scrapQty = 0d; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From cce1d91650e03ae7f9ce1b092a91a291449c4ba8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 17 Sep 2020 21:33:31 +0800 Subject: [PATCH 073/329] =?UTF-8?q?=E5=AE=A2=E9=80=80=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E8=BF=94=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 73 ++++++++++++++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 38 +++++++- .../pojo/mes/bean/MesQueueJitActualDetail.java | 20 ++++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 8 ++ .../i3plus/pojo/mes/model/QueueJitActualModel.java | 102 +++++++++++++++++++++ .../pojo/mes/model/QueueJitActualModule.java | 40 -------- .../i3plus/pojo/mes/model/QueueOrderModel.java | 17 ++++ 7 files changed, 256 insertions(+), 42 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 77340aa..83defd0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3325,7 +3325,8 @@ public class MesEnumUtil { SPARE_PART_PRODUCTION(100, "备件生产"), REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), - REVERSE_SPRAY_ORDER(130, "反喷工单"); + REVERSE_SPRAY_ORDER(130, "反喷工单"), + SPARE_RETURN_REPAIR(140, "客退备件返修"); private int value; private String description; @@ -7252,4 +7253,74 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT队列明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_DETAIL_STATUS { + NORMAL(10, "正常"), + WASHED_MATERIAL(20, "已冲料"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_DETAIL_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; + } + } + + /** + * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIS_BACKFLUSH_STATUS { + BACKFLUSH("BACKFLUSH", "正常回冲扣减"), + REPAIR("REPAIR", "返修冲料"); + + private String value; + private String description; + + JIS_BACKFLUSH_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-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 9c495fe..413d343 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 @@ -1884,7 +1884,8 @@ public class MesPcnEnumUtil { SPARE_PART_PRODUCTION(100, "备件生产"), REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), - REVERSE_SPRAY_ORDER(130, "反喷工单"); + REVERSE_SPRAY_ORDER(130, "反喷工单"), + SPARE_RETURN_REPAIR(140, "客退备件返修"); private int value; private String description; @@ -5211,4 +5212,39 @@ public class MesPcnEnumUtil { } } + /** + * 是否展示放空队列 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHOW_VENTING_QUEUE { + CREATE(10, "显示"), + SHIPMENT(20, "不显示"); + + private int value; + private String description; + + SHOW_VENTING_QUEUE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 742a516..ca86eb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -96,6 +96,22 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("组件编号") private String assyNo; + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲标识") + private String jisBackflushStatus = "BACKFLUSH"; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "IS_EMPTY") + @ApiParam("是否放空") + private Integer isEmpty; + @Transient @ApiParam("工单类型") private Integer woType; @@ -108,6 +124,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("数量") private long qty; + @Transient + @ApiParam("是否拆解件") + private Integer isDisPart; + public MesQueueJitActualDetail() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index e33fd3a..505fd9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -128,6 +128,14 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; + @Column(name = "IS_EMPTY") + @ApiParam("是否放空") + private Integer isEmpty; + + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲标识") + private String jisBackflushStatus; + @Transient @ApiParam("Vin") private String vinCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java new file mode 100644 index 0000000..4cee1fd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/20 9:02 下午 + * @Modify: + */ +@Data +@Api("JIT队列列表Model") +public class QueueJitActualModel { + + private Long id; + @ApiParam("vin") + private String vinCode; + @ApiParam("排序号") + private Double seq; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + @ApiParam("JIT排序号") + private String jitSeq; + + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("工单类型") + public Integer workType; + + @ApiParam("工单类型") + public String workTypeName; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("明细状态名称") + private Integer detailStatus; + + @ApiParam("明细状态名称") + private String detailStatusName; + + @ApiParam("创建人") + private String createUser; + + @ApiParam("创建时间") + private String createDatetime; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("用量") + private Double qty = 0d; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料号") + private String partName; + + + public QueueJitActualModel() { + + } + + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode, + String productSn, Integer detailStatus, String createUser, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.workType = workType; + this.custProdLineCode = custProdLineCode; + this.produceCtgyCode = produceCtgyCode; + this.productSn = productSn; + this.detailStatus = detailStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + } + + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String partNo, String partName, String produceCtgyCode, Double qty, + String createUser, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.partNo = partNo; + this.partName = partName; + this.qty = qty; + this.createUser = createUser; + this.createDatetime = createDatetime; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java deleted file mode 100644 index 4cfc59e..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Author: jokelin - * @Date: 2020/3/20 9:02 下午 - * @Modify: - */ -@Data -public class QueueJitActualModule { - - private Long id; - @ApiParam("vin") - private String vinCode; - @ApiParam("排序号") - private Double seq; - @ApiParam("分组队列编号") - private String queueGroupNo; - @ApiParam("组内编号") - private Integer groupNo; - @ApiParam("JIT排序号") - private String jitSeq; - - public QueueJitActualModule() { - - } - - public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) { - this.id = id; - this.vinCode = vinCode; - this.seq = seq; - this.queueGroupNo = queueGroupNo; - this.groupNo = groupNo; - this.jitSeq = jitSeq; - } - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 8dc57e7..b16d1f9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -106,6 +106,14 @@ public class QueueOrderModel implements Serializable { private String jitSeq; private Integer status; + @ApiParam("回冲标识") + private String jisBackflushStatus; + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("是否放空") + private Integer isEmpty; + public QueueOrderModel() { } @@ -350,4 +358,13 @@ public class QueueOrderModel implements Serializable { this.jitSeq = jitSeq; this.status = status; } + + // getQueueJitActualDetailByNo + public QueueOrderModel(Long id, String jisActualNo, String serialNumber, String vinCode, String jisBackflushStatus) { + this.id = id; + this.jisActualNo = jisActualNo; + this.serialNumber = serialNumber; + this.vinCode = vinCode; + this.jisBackflushStatus = jisBackflushStatus; + } } From e6b5caa61c7c0b0b4ff8b810ee34f18925595e58 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 17 Sep 2020 20:52:08 +0800 Subject: [PATCH 074/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 8 +++++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 2ad5530..8902313 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -88,6 +88,11 @@ public class WmsCSRange extends BaseBean { @AnnoOutputColumn(hidden = true) public String areaNo; + @Transient + @ApiParam("存储区") + @AnnoOutputColumn(hidden = true) + public String basZoneNo; + public WmsCSRange(){} public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ @@ -96,8 +101,9 @@ public class WmsCSRange extends BaseBean { this.partNameRdd = partNameRdd; } - public WmsCSRange(String zoneNo, String areaNo, String partNo, String partNameRdd) { + public WmsCSRange(String zoneNo, String basZoneNo, String areaNo, String partNo, String partNameRdd) { this.zoneNo = zoneNo; + this.basZoneNo = basZoneNo; this.areaNo = areaNo; this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 6312970..6dafc68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -247,7 +247,7 @@ public class WmsStockQuan extends BaseBean { public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, - Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { this.organizeCode = organizeCode; this.whNo = whNo; this.zoneNo = zoneNo; @@ -262,7 +262,7 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; - this.sumQty = sumQty; + this.totalQty = totalQty; this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; 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 9b0e4ed..4e8f778 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 @@ -1203,7 +1203,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); - if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { + if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && !StringUtil.isEmpty(wmsMoveDetails.getZoneNo())) { List columnNames = new ArrayList<>(); columnNames.add("srcZoneNo"); columnNames.add("destZoneNo"); From 10d5276fbb95d8cb1eb875b5438e2ea5044e295d Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 17 Sep 2020 23:43:44 +0800 Subject: [PATCH 075/329] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E6=B5=8B=20?= =?UTF-8?q?=E6=BC=94=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 145 +++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 +- .../i3plus/pojo/mes/bean/MesGenerateQcOrder.java | 49 +++++++ .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 + .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 14 +- .../i3plus/pojo/mes/bean/MesQcOrderRecord.java | 11 +- .../repository/MesGenerateQcOrderRepository.java | 16 +++ 7 files changed, 240 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index ec7d0e5..3dc606c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7217,4 +7217,149 @@ public class MesEnumUtil { } } + + /** + * 质检单审批处理意见 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_ORDER_APPROVAL_CHOICE { + + STOP_LINE(10, "停线"), + RELEASE(20, "放行"); + + private int value; + private String description; + + QC_ORDER_APPROVAL_CHOICE(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) + public enum CHECK_RESULT { + + PASS(10, "通过"), + NON_PASS(20, "不通过"), + CONCESSION_PRODUCTION(30, "让步生产"); + + private int value; + private String description; + + CHECK_RESULT(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) + public enum QC_ORDER_APPROVAL_TYPE { + + STOP_LINE(10, "停线"), + RELEASE(20, "放行"); + + private int value; + private String description; + + QC_ORDER_APPROVAL_TYPE(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) + public enum QC_ORDER_DETAIL_CHECK_RESULT { + + OK(10, "OK"), + NG(20, "NG"); + + private int value; + private String description; + + QC_ORDER_DETAIL_CHECK_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-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 bcb59d9..40c069d 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 @@ -80,7 +80,9 @@ public class MesPcnEnumUtil { return value; } - public String getData() { return data; } + public String getData() { + return data; + } public String getDescription() { return description; @@ -5216,9 +5218,9 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_CHECK_DATA_SOURCE { - DB(10, "10", "数据库"), - PLC(20, "20", "PLC"), - MANUAL_INPUT(30, "30", "人工输入"); + MANUAL_INPUT(10, "10", "人工输入"), + DB(30, "30", "数据库"), + PLC(20, "20", "PLC"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java new file mode 100644 index 0000000..b353da2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_GENERATE_QC_ORDER") +@Api("待生成检验单") +public class MesGenerateQcOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 14873669015484197L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "IS_GENERATED") + @ApiParam("是否生成了末检单") + private Integer isGenerated = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "GENERATE_TIME") + @ApiParam("生成时间") + private String generateTime; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 1b50bdb..c6c488a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -100,6 +100,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("任务单类型") private String checkValueType; + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + @Column(name = "MAXIMUM") @ApiParam("最大数") private Double maximum = 0d; 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 7e25367..0ff6d06 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 @@ -14,6 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -29,7 +30,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QC_ORDER") @Api("MES_检验单") -public class MesQcOrder extends BaseBean implements Serializable { +public class MesQcOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -5412635747424111476L; @Column(name = "ORDER_NO") @@ -84,9 +85,9 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("状态") private Integer status; - @Column(name = "CHECK_REULST") + @Column(name = "CHECK_RESULT") @ApiParam("检测整体结果") - private Integer checkReulst = 0; + private Integer checkResult = 0; @Column(name = "MEMO") @ApiParam("备注") @@ -116,9 +117,14 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("任务单类型") private String checkOrderType; + @Deprecated @ApiParam(value = "检测结果") @Transient - private String reulstStatus; + private String resultStatus; + + @ApiParam(value = "显示按钮") + @Transient + private List buttons; @ApiParam(value = "产品条码") @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java index 72337e6..e49d31d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.io.Serializable; @@ -26,7 +27,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_ORDER_RECORD") +@Table(name = "MES_QC_ORDER_RECORD", indexes = { + @Index(columnList = "QC_ORDER_DETAIL_ID"), + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "ORDER_NO") +}) @Api("MES_检验单检验记录") public class MesQcOrderRecord extends BaseBean implements Serializable { private static final long serialVersionUID = -5245624982023882232L; @@ -51,4 +56,8 @@ public class MesQcOrderRecord extends BaseBean implements Serializable { @ApiParam("检测顺序") private Integer checkSeq; + @Column(name = "QC_ORDER_DETAIL_ID") + @ApiParam("质检单明细id") + private Long qcOrderDetailId; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.java new file mode 100644 index 0000000..c97836d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.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.MesGenerateQcOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesGenerateQcOrderRepository extends BaseRepository { +} From 8a392814aa897e55c8c818f0474699661ae62ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 18 Sep 2020 11:32:07 +0800 Subject: [PATCH 076/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E6=B6=82=E8=A3=85=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/PaintOnLineModel.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java index 4b7addd..10b1c11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java @@ -29,6 +29,9 @@ public class PaintOnLineModel { @ApiParam("物料名称") private String partNameRdd; + @ApiParam("颜色代码") + private String colorCode; + @ApiParam("颜色") private String color; @@ -47,9 +50,24 @@ public class PaintOnLineModel { @ApiParam("圈数") private Integer rounds; + @ApiParam("小车号") + private String smallCarNo; + + @ApiParam("车数") + private Integer smallCarAmount; + @ApiParam("过程条码") private String serialNumber; @ApiParam("是否虚拟件") private Integer isFictive = 2; + + @ApiParam("反喷标识") + private String reverseSprayMark; + + @ApiParam("备注") + private String memo; + + @ApiParam("工单类型") + private String workType; } From 20b40ce29475e4b919299efe06011ce32c52f6c5 Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 18 Sep 2020 15:02:14 +0800 Subject: [PATCH 077/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E4=B8=AD=E8=88=AA?= =?UTF-8?q?-DB=E5=A4=8D=E6=A0=B8=E9=A1=B9=20=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) 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 9c495fe..dfb9f7f 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 @@ -5211,4 +5211,45 @@ public class MesPcnEnumUtil { } } + /** + * 中航DB数据检查配置-DB复核项 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DB_DATA_CHECK_ITEM { + PART_NO_NULL(10, "物料为空复核"), + PART_NO_ORDER(20, "零件工单匹对复核"), + SERIA_LNUMBER_REPEAT(30, "过程条码重复复核"), + SERIA_LNUMBER_NULL(40, "过程条码为空复核"), + PRODUCT_SN_REPEAT(50, "产品二维码重复复核"), + PRODUCT_SN_NULL(60, "产品二维码为空复核"), + KEY_DATA_FILED_NULL(70, "质量关键字段为空复核"), + QC_FAIL_MAX_COUNT(80, "缺陷类型连续超过设定数复核"); + + private int value; + private String description; + + MES_DB_DATA_CHECK_ITEM(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } From f14cc48243d2dd97324ed6df2ee912239efeafc3 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 18 Sep 2020 18:57:43 +0800 Subject: [PATCH 078/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 f9b3812..d14fe0e 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 @@ -520,6 +520,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("物料库位") private String partLocateNo; + @Transient + @ApiParam("数量检查") + private Integer checkQyt; + 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 4e8f778..01ba990 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 @@ -1203,18 +1203,20 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); + //实时库存待处理数据 if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && !StringUtil.isEmpty(wmsMoveDetails.getZoneNo())) { List columnNames = new ArrayList<>(); columnNames.add("srcZoneNo"); columnNames.add("destZoneNo"); DdlPreparedPack.getMultOrPackString(wmsMoveDetails.getZoneNo(), columnNames, null, packBean); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.MOVE_ORDER_STATUS.BE_HANDLE.getValue(), "itemStatus", packBean); } else { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); } DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean); - DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", packBean); DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", packBean); @@ -1359,6 +1361,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); + if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { + DdlPreparedPack.getNumberBiggerPack(0, "qty", result); + } if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) { wmsStockSn.setQualityDateTimeStart(""); } From 998e87b61d634cf4d2f9a1b53da76ca5282b4445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 18 Sep 2020 19:52:32 +0800 Subject: [PATCH 079/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E8=BF=87=E7=A8=8B=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A5=E6=89=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index b1bb580..a4c6cd6 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 @@ -213,7 +213,9 @@ public class MesPcnEnumUtil { public enum METHOD_TYPE { EXEC(10, "执行方法"), - COMPLETE(20, "完成方法"); + COMPLETE(20, "完成方法"), + HNC_ISSUED(30, "队列自动下达"), + LABEL_PROPERTIES(40, "标签属性查询方法"); private int value; private String description; From ea875c1a3bb3a286d6f78c83a753f2a23c367844 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 20:50:39 +0800 Subject: [PATCH 080/329] =?UTF-8?q?SWEB=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + .../i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 4 + .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 4 +- .../i3plus/pojo/sweb/bean/SwebRequireAlarm.java | 75 ++++++++++++++++++ .../i3plus/pojo/sweb/bean/SwebVendorStock.java | 75 ++++++++++++++++++ .../pojo/sweb/bean/SwebVendorSupplierCapcity.java | 92 ++++++++++++++++++++++ .../repository/SwebRequireAlarmRepository.java | 16 ++++ .../sweb/repository/SwebVendorStockRepository.java | 16 ++++ .../SwebVendorSupplierCapcityRepository.java | 16 ++++ .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 43 ++++++++++ 10 files changed, 340 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 24d3342..df92d67 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -263,6 +263,7 @@ public class WmsEnumUtil { this.description = description; } + public int getValue() { return value; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 723d9cb..8ea25cf 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -109,6 +109,10 @@ public class SwebPurchaseOrder extends BaseBean { @ApiParam(value = "订单来源") private Integer orderSource; + @Column(name = "IS_EXT_ADD") + @ApiParam(value = "是否追加") + private Integer isExtAdd; + @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 开始时间") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 80833fe..6037326 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -55,9 +55,9 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam(value = "零件名称") private String partName; - /*@ApiParam(value = "订单类型", example = "1") + @ApiParam(value = "订单类型", example = "1") @Column(name = "ORDER_TYPE") - public Integer orderType;*/ + public Integer orderType; @ApiParam("零件类型") @Column(name = "PART_TYPE") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java new file mode 100644 index 0000000..accc6b4 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 库存需求报警 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Data +@Table(name = "SWEB_REQUIRE_ALARM") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("库存需求报警") +public class SwebRequireAlarm extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "VENDOR_CODE") + @ApiParam("供应商代码") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "START_QTY") + @ApiParam("开班库存") + private Double startQty; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警级别") + private String alarmLevel; + + @Column(name = "REASON") + @ApiParam("原因分析") + private String reason; + + @Column(name = "TRACK_REMARK") + @ApiParam("跟踪情况") + private String trackRemark; + + @Column(name = "COUNT_DATE") + @ApiParam("日期") + private Double countDate; + + @Transient + @ApiParam("日期") + private String dateStart; + + @Transient + @ApiParam("日期") + private String dateEnd; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java new file mode 100644 index 0000000..3e8547b --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 供应商安全库存 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_STOCK") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("供应商安全库存") +public class SwebVendorStock extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "VENDOR_CODE") + @ApiParam("供应商代码") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "SAFE_TYPE") + @ApiParam("安全库存计算类型") + private Integer safeType; + + @Column(name = "SAFE_VALUE") + @ApiParam("计数值") + private String safeValue; + + @Column(name = "QTY") + @ApiParam("库存数量") + private Double qty; + + @Column(name = "COUNT_MONTH") + @ApiParam("月份") + private String countMonth; + + @Column(name = "COUNT_WEEK") + @ApiParam("周") + private String countWeek; + + @Transient + @ApiParam("日期") + private String dateStart; + + @Transient + @ApiParam("日期") + private String dateEnd; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java new file mode 100644 index 0000000..f0f2d7e --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 供应商供货能力 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-16 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_SUPPLIER_CAPCITY") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("供应商供货能力") +public class SwebVendorSupplierCapcity extends BaseBean { + private static final long serialVersionUID = 2327910806789997252L; + + @Column(name = "VENDOR_CODE") + @ApiParam("供应商代码") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "CURRENT_QTY") + @ApiParam("当前库存") + private Double currentQty; + + @Column(name = "PLAN_PRODUCT_QTY") + @ApiParam("计划生产或到货") + private Double planProductQty; + + @Column(name = "PLAN_REQUEST_QTY") + @ApiParam("计划需求数量") + private Double planRequestQty; + + @Column(name = "END_QTY") + @ApiParam("期末库存") + private Double endQty; + + @Column(name = "IS_DANGER") + @ApiParam("是否存在风险") + private Integer isDanger; + + @Column(name = "DANGER_SPEC") + @ApiParam("风险描述") + private String dangerSpec; + + @Column(name = "STATUS") + @ApiParam("状态") + private String status; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + + @Column(name = "TRACK_DATE") + @ApiParam("日期") + private String trackDate; + + @Transient + @ApiParam("日期") + private String dateStart; + + @Transient + @ApiParam("日期") + private String dateEnd; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java new file mode 100644 index 0000000..e9397f8 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebRequireAlarm; +import org.springframework.stereotype.Repository; + +/** + * @Description : 库存需求报警 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Repository +public interface SwebRequireAlarmRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java new file mode 100644 index 0000000..1616b4b --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorStock; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商安全库存 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Repository +public interface SwebVendorStockRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java new file mode 100644 index 0000000..653d469 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorSupplierCapcity; +import org.springframework.stereotype.Repository; + +/** + * @Description :供应商供货能力 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Repository +public interface SwebVendorSupplierCapcityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 276b52b..e81e51b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -203,4 +203,47 @@ public class SwebHqlPack { DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(details, result); } + + public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(capcity.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result); + if (!StringUtil.isEmpty(capcity.getDateStart())) { + DdlPreparedPack.getStringBiggerPack(capcity.getDateStart(), "trackDate", result); + } + if (!StringUtil.isEmpty(capcity.getDateEnd())) { + DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result); + } + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(capcity, result); + } + + public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(alarm.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); + if (!StringUtil.isEmpty(alarm.getDateStart())) { + DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); + } + if (!StringUtil.isEmpty(alarm.getDateEnd())) { + DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); + } + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(alarm, result); + } + + public static DdlPackBean getSwebVendorStock(SwebVendorStock stock) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(stock.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); +// if (!StringUtil.isEmpty(alarm.getDateStart())) { +// DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); +// } +// if (!StringUtil.isEmpty(alarm.getDateEnd())) { +// DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); +// } + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(stock, result); + } } From 2c3571b014d54bd5d5fb28e877825c505086afdb Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 18 Sep 2020 21:12:16 +0800 Subject: [PATCH 081/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index d30ca85..8169f1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -242,12 +242,16 @@ public class WmsDocMovementMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer pickingOrderStatus; + /** + * 备注2 + **/ @Column(name = "SECONDARY_REMAKE") - @ApiParam(value = "备注2") + @ApiParam(value = "单据原因") private String secondaryRemake; + /**备注3**/ @Column(name = "THIRD_REMAKE") - @ApiParam(value = "备注3") + @ApiParam(value = "客户类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue") private String thirdRemake; From 5c104e036fdb78ed3581acb6d70efa75779834f5 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 21:24:26 +0800 Subject: [PATCH 082/329] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..3751cf9 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..a6c1bea 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..0a2f9d4 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..5f809e6 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..557548a 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..34a7337 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..670eb15 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..ce2dc01 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..b8c9643 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..1d29933 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..284225c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..7ff16c9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..353a02b 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..b125cee 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..c9d54a9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..39f1e2f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..df01041 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..0cfb344 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..ae014e9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From b253a020b917943916ad60ce28578943a428544e Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 21:43:36 +0800 Subject: [PATCH 083/329] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..0a44fb0 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 6749bda5588dbbbb041324291f845023fa4bbd0a Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 21:47:27 +0800 Subject: [PATCH 084/329] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0a44fb0..aca1465 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 5f144781c925bed8162dbbde1f8675db78bbcb2f Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 22:01:56 +0800 Subject: [PATCH 085/329] =?UTF-8?q?SWEB=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..0a44fb0 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From fa467a2e0d814a1eb32a80d25615e213b0547af0 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 22:10:50 +0800 Subject: [PATCH 086/329] =?UTF-8?q?sweb=E5=90=88=E5=B9=B6dev=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0a44fb0..aca1465 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 95f008a60267ad9f38361a1585410f57b6a43663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 19 Sep 2020 13:20:40 +0800 Subject: [PATCH 087/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E6=B7=BB=E5=8A=A0=E7=BB=84=E8=A3=85=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=89=98=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=89=A9=E6=96=99=E9=A2=9C=E8=89=B2=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BB=8E=E7=89=A9=E6=96=99=E8=A1=A8=E4=B8=AD=E5=8F=96=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index bd59557..eb0072f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -104,6 +104,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("颜色代码") private String colorCode; + @Column(name = "COLOR_NAME") + @ApiParam("颜色名称") + private String colorName; + @Column(name = "SHELVES_AMOUNT") @ApiParam("挂架数") private Integer shelvesAmount; From 895eb461aba98df24c36e1bda4426567bf8a9ec8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 19 Sep 2020 13:31:40 +0800 Subject: [PATCH 088/329] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 26 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 8 +++++++ .../i3plus/pojo/mes/model/DataReviewModel.java | 9 ++++++++ .../pojo/mes/model/ProductDataCacheModel.java | 3 +++ 4 files changed, 46 insertions(+) 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 a4c6cd6..ebde426 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,32 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 物料校验项数据查询类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_CHECK_DATA_TYPE { + ALL_DATA(1, "所有数据"), + LAST_DATA(2, "最后一条数据"); + + private int value; + private String description; + + PART_CHECK_DATA_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + + public String getDescription() { + return description; + } + } + + /** * 注塑生产操作模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 8cbe1c3..90ec210 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -53,6 +53,14 @@ public class MesPartCheck extends BaseBean implements Serializable { @ApiParam("记录数量表达式") private String recordNumSpelExpress; + @Column(name = "DATA_TYPE") + @ApiParam("数据查询类型") + private Integer dataType = 1; + + @Column(name = "LIMIT_TIMES") + @ApiParam("限定检测次数") + private Integer limitTimes; + @Column(name = "RECORD_NUM_DESC") @ApiParam("校验表达式描述") private String recordNumDesc; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 843eb9c..77997e5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -22,6 +22,12 @@ public class DataReviewModel { @ApiParam("实际数量") private String realNum; + @ApiParam("限定次数") + private String limitTimes; + + @ApiParam("检测次数") + private String checkTimes; + @ApiParam("对象代码") private String objectCode; @@ -31,6 +37,9 @@ public class DataReviewModel { @ApiParam("是否合格") private String reviewResult; + @ApiParam("显示标识") + private String showFlag; + @ApiParam("关键件颜色") private String keyPartColor; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java index 16d5f94..ae6e97a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java @@ -21,4 +21,7 @@ public class ProductDataCacheModel { @ApiParam("字段名称") private List productDataModelList; + @ApiParam("创建时间") + private String createDatetime; + } From 10edb8ebaedebe43b23cbf051c07219ee265137b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 19 Sep 2020 17:51:17 +0800 Subject: [PATCH 089/329] =?UTF-8?q?Finish=20Task=20#2184=20Cost:8h=202184?= =?UTF-8?q?=2006=201.2.3.7.1=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BF=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index 1840675..e221563 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -74,16 +74,16 @@ public class WmsWorkCenter extends BaseBean { @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180") @ApiParam(value = "提前拉动时间") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer preReadyMinute; @Column(name = "PULL_RANGE_MINUTE", columnDefinition = "int default 180") @ApiParam(value = "拉动区间时间") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer pullRangeMinute; @Column(name = "NEXT_PULL_TIME", columnDefinition = "varchar(50) default '' ") @ApiParam(value = "下次拉动时间") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private String nextPullTime; } 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 01ba990..366c361 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 @@ -219,13 +219,18 @@ public class WmsHqlPack { DdlPackBean packBean = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getErpSrcNo(), "erpSrcNo", packBean); DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean); + + getStringBuilderPack(wmsDocMovementMaster, packBean); return packBean; From 72502a863bb3b65e68a31ff129c7e70b6734585d Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 19 Sep 2020 19:32:21 +0800 Subject: [PATCH 090/329] Fix Bug #11490 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 ++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 55 +++++++++++++++++++++- .../pojo/mes/bean/MesQueueJitActualDetail.java | 2 +- .../pojo/mes/bean/MesWorkCellPointGroup.java | 4 ++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 5 +- 5 files changed, 67 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 69d0cb2..769dc34 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3326,7 +3326,8 @@ public class MesEnumUtil { REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), - SPARE_RETURN_REPAIR(140, "客退备件返修"); + SPARE_RETURN_REPAIR(140, "客退备件返修"), + HOP_SEQ_ORDER(150, "跳序工单"); private int value; private String description; @@ -6658,7 +6659,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_SIDE { POSITIVE(10, "A", "正面"), - REVERSE_SIDE(20, "B", "背面"); + REVERSE_SIDE(20, "B", "背面"), + SPECIAL_SIDE(30, "C", "特殊件"); private Integer value; private String code; 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 ebde426..c076230 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 @@ -1915,7 +1915,8 @@ public class MesPcnEnumUtil { REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), - SPARE_RETURN_REPAIR(140, "客退备件返修"); + SPARE_RETURN_REPAIR(140, "客退备件返修"), + HOP_SEQ_ORDER(150, "跳序工单"); private int value; private String description; @@ -5374,4 +5375,56 @@ public class MesPcnEnumUtil { } } + /** + * 队列 料架摆放位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_SIDE { + POSITIVE(10, "A", "正面"), + REVERSE_SIDE(20, "B", "背面"), + SPECIAL_SIDE(30, "C", "特殊件"); + + private Integer value; + private String code; + private String description; + + GROUP_SIDE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index ca86eb4..f0f5944 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -110,7 +110,7 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @Column(name = "IS_EMPTY") @ApiParam("是否放空") - private Integer isEmpty; + private Integer isEmpty = 2; @Transient @ApiParam("工单类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 91a7275..719ae64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -75,6 +75,10 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; + @Transient @ApiParam("显示颜色") private String color; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index b16d1f9..5268375 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -336,7 +336,8 @@ public class QueueOrderModel implements Serializable { } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) { + public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType, + String partNo, String prodCfgTypeCode) { this.id = id; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; @@ -344,6 +345,8 @@ public class QueueOrderModel implements Serializable { this.organizeCode = organizeCode; this.produceCategoryCode = produceCategoryCode; this.workType = workType; + this.partNo = partNo; + this.prodCfgTypeCode = prodCfgTypeCode; } // getQueueJitActualJitSeq From 352db6a7fad14c0f4a61484fda78d6d535b4d0c6 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sat, 19 Sep 2020 19:39:28 +0800 Subject: [PATCH 091/329] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8B=89=E5=8A=A8?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E4=BF=9D=E5=AD=98=E5=88=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsServiceLog.java | 71 ++++++++++++++++++++++ .../wms/repository/WmsServiceLogRepository.java | 16 +++++ 2 files changed, 87 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java new file mode 100644 index 0000000..0e015db --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsServiceLog.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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.Lob; +import javax.persistence.Table; + +/** + * @Description : 用户需要查询的服务调用详细日志 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-19 15:54 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_SERVICE_LOG") +@Api("服务调用详细日志") +public class WmsServiceLog extends BaseBean { + + private static final long serialVersionUID = 1285495680337747968L; + + @Column(name = "CALL_TIME") + @ApiParam("调用时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String callTIme; + + @Column(name = "SERVICE_CODE") + @ApiParam("服务代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String serviceCode; + + @Column(name = "SERVICE_NAME") + @ApiParam("服务名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String serviceName; + + @Column(name = "JOB_CODE") + @ApiParam(value = "JOB代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String jobCode; + + @Column(name = "JOB_NAME") + @ApiParam(value = "JOB名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String jobName; + + @Lob + @Column(name = "OUTPUT_MESSAGE") + @ApiParam(value = "输出信息") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String outPutMessage; + + @Column(name = "LEVEL") + @ApiParam(value = "日志级别") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String level; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java new file mode 100644 index 0000000..75ea2be --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsServiceLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsServiceLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 服务调用详细日志表 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-19 16:04 + * @Modify: + **/ +@Repository +public interface WmsServiceLogRepository extends BaseRepository { +} From d0553746133788d6762f3b83130e66ad0288d585 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 20 Sep 2020 11:11:21 +0800 Subject: [PATCH 092/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=9F=A5=E8=AF=A2SQL=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index ac880ab..398154c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -204,4 +204,10 @@ public class WmsDocFgDetail extends BaseBean { public WmsDocFgDetail() { } + + public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) { + this.sn = sn; + this.mfgLocNo = mfgLocNo; + this.partNo = partNo; + } } From 0c93ee587787071010ea290b968d430506b18438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 20 Sep 2020 11:19:14 +0800 Subject: [PATCH 093/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF=E5=92=8C=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A1=A5=E6=89=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 4 ++++ 1 file changed, 4 insertions(+) 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 bcac673..05301f8 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 @@ -394,6 +394,10 @@ public class MesPcnHqlPack { DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); } + if (!StringUtils.isEmpty(mesPackage.getWorkOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); } From 16a2d75a1720660c15f5fcc148a2dbd8c2de008f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sun, 20 Sep 2020 11:20:20 +0800 Subject: [PATCH 094/329] =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5job=E7=9A=84sqlserver=E4=B8=8D=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index ac880ab..398154c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -204,4 +204,10 @@ public class WmsDocFgDetail extends BaseBean { public WmsDocFgDetail() { } + + public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) { + this.sn = sn; + this.mfgLocNo = mfgLocNo; + this.partNo = partNo; + } } From d5e356938ee53b5ca1561b805636811c442768c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 20 Sep 2020 16:59:54 +0800 Subject: [PATCH 095/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=BB=84=E6=89=98=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ 2 files changed, 8 insertions(+) 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 c809906..4c1f98a 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 @@ -156,6 +156,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("明细总数") private Integer detailTotal = 0; + @Transient + @ApiParam("托包规数量") + private Double qty2; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 772a97b..b9a1af3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -206,6 +206,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("电检结果") private String electricResult; + @Transient + @ApiParam("包规数量") + private Double packageQty; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") From 232abdafd328a045d4e82f8a1c4ee106df9e9c3d Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Sun, 20 Sep 2020 20:21:16 +0800 Subject: [PATCH 096/329] =?UTF-8?q?10984=20=E7=BB=84=E8=A3=85=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=AE=B1=E6=9D=A1=E7=A0=81=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=EF=BC=81-2020-09-01,=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) 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 bcac673..bf668e5 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 @@ -107,6 +107,8 @@ public class MesPcnHqlPack { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.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; } From 8fb9760f82e5bff4f20a68bd1297cb859b50b3ac Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Sun, 20 Sep 2020 20:37:46 +0800 Subject: [PATCH 097/329] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E5=B5=8C=E5=A5=97=E4=BA=86=EF=BC=8C=E6=AD=A4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E7=94=A8=E5=B0=B1=E5=88=A0=E6=8E=89?= =?UTF-8?q?=E3=80=82StationRequestBean->MesStateMachineStatus->StepResult-?= =?UTF-8?q?>StationRequestBean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 2fb1c74..db1831e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -98,9 +98,9 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("前端显示颜色") private String color; - @Transient - @ApiParam("状态执行情况") - private StepResult stepResult; +// @Transient +// @ApiParam("状态执行情况") +// private StepResult stepResult; @Transient @ApiParam("是否执行下个扫描信息") From e7196c3f7fc4ed5dc1c9d2ce6fffb1c3c54b1153 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 21 Sep 2020 09:32:53 +0800 Subject: [PATCH 098/329] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=2010923=201?= =?UTF-8?q?0894?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java index ba1090a..2d1e39c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java @@ -43,5 +43,13 @@ public class MesWorkCellStatus extends BaseBean implements Serializable { @ApiParam("超时状态") private Integer timeOutStatus; + @Column(name = "DELAY_HELP_STATUS") + @ApiParam("延迟帮助状态") + private Integer delayHelpStatus; + + @Column(name = "EMERGENCY_STOP_STATUS") + @ApiParam("紧急停止状态") + private Integer emergencyStopStatus; + } From 07f6aabd72f5700be42c8e9baa5236865f8144f8 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Sep 2020 10:36:59 +0800 Subject: [PATCH 099/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 8169f1f..01fecb2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -334,6 +334,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "电话号码") private String custTel; + @Transient + @ApiParam(value = "过滤业务类型") + private String filterBusiType; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } 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 366c361..541097e 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 @@ -218,10 +218,18 @@ public class WmsHqlPack { public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { DdlPackBean packBean = new DdlPackBean(); - //查询参数封装 + //查询参数封装PROD_SCRAP DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); + //滤掉业务类型 + if (!StringUtil.isEmpty(wmsDocMovementMaster.getFilterBusiType())) { + List filterBusiType = new ArrayList<>(); + for (String busiType : wmsDocMovementMaster.getFilterBusiType().split(",")) { + filterBusiType.add(Integer.parseInt(busiType)); + } + DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", packBean); + } DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getErpSrcNo(), "erpSrcNo", packBean); From f22239501530b743763e73132b9f6169d948e005 Mon Sep 17 00:00:00 2001 From: songss Date: Mon, 21 Sep 2020 10:50:05 +0800 Subject: [PATCH 100/329] =?UTF-8?q?=E8=A5=84=E9=98=B3=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E6=A0=B8=E7=94=9F=E4=BA=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=B7=A5=E6=AD=A5=E3=80=82?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E6=A0=B8=E7=94=9F=E4=BA=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A8=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDbCheckRecord.java | 84 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java | 69 ++++++++++++++++++ .../mes/repository/MesDbCheckRecordRepository.java | 12 ++++ .../mes/repository/MesDbDataCheckRepository.java | 12 ++++ 4 files changed, 177 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java new file mode 100644 index 0000000..f25605d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: MES-中航DB数据复核不通过记录表 + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DB_CHECK_RECORD") +@Api("中航复核异常记录表") +public class MesDbCheckRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6727925715356900171L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。 + @Column(name = "DB_CHECK_ITEM") + @ApiParam("DB复核项") + private String dbReview; + + @Column(name = "ERROR_FILED_CODE") + @ApiParam("异常取值字段") + private String errorFiledCode; + + @Column(name = "ERROR_DESC") + @ApiParam("异常描述") + private String errorDesc; + + @Column(name = "PRODUCT_DATA_ID") + @ApiParam("生产记录表主键ID") + private String productDataId; + + //是否停线：1=是，2=否 + @Column(name = "IS_STOP_LINE") + @ApiParam("是否停线") + private Integer isStopLine; + + //审批状态：10=待审批，20=已审批 + @Column(name = "STATUS") + @ApiParam("审批状态") + private Integer status; + + @Transient + @ApiParam("按钮名称") + private String btnName; + + @Transient + @ApiParam("按钮颜色") + private String btnColor; + + @Transient + @ApiParam("按钮类别") + private String btnType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java new file mode 100644 index 0000000..d59c599 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbDataCheck.java @@ -0,0 +1,69 @@ +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-中航DB数据检查配置表 + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DB_DATA_CHECK") +@Api("中航DB数据检查配置表") +public class MesDbDataCheck extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6889751438239451959L; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。 + @Column(name = "DB_CHECK_ITEM") + @ApiParam("DB复核项") + private Integer dbCheckItem; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + //是否停线：1=是，2=否 + @Column(name = "IS_STOP_LINE") + @ApiParam("是否停线") + private Integer isStopLine; + + @Column(name = "KEY_DATA_FILED") + @ApiParam("质量关键字段") + private String keyDataFiled; + + @Column(name = "QC_FILED_CODE") + @ApiParam("缺陷类型字段") + private String qcFiledCode; + + @Column(name = "QC_FILED_VALUE") + @ApiParam("缺陷类型合格值") + private String qcFiledValue; + + @Column(name = "QC_FAIL_MAX_COUNT") + @ApiParam("缺陷连续不合格预警次数") + private String qcFailMaxCount; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java new file mode 100644 index 0000000..076d22a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbCheckRecordRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDbCheckRecord; + +/** + * @Description: + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +public interface MesDbCheckRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java new file mode 100644 index 0000000..b9c44b8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDbDataCheckRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDbDataCheck; + +/** + * @Description: + * @CreateDate: 2020/9/14 + * @Author: simon.song + */ +public interface MesDbDataCheckRepository extends BaseRepository { +} From d92c669f79194f7269a9a3d43021ab6ae112de64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 21 Sep 2020 11:37:07 +0800 Subject: [PATCH 101/329] =?UTF-8?q?=E3=80=9011493=2020042=20=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=9D=A1=E7=A0=81=E6=A8=A1=E7=89=88=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0=200921?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 505fd9c..3e94f7b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -200,6 +200,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("等级名称") private String gradeName; + @Transient + @ApiParam("客户产线代码") + private String custProdLineCode; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } From 706d0fc43d04bcc2bed0b6ff79e01fc69be78d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 21 Sep 2020 12:16:43 +0800 Subject: [PATCH 102/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 4d0bcef..1843779 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -183,6 +183,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("父阶物料号") private String parentPartNo; + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus = 10; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") 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 bdaa9c9..a364f73 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 @@ -169,6 +169,12 @@ public class MesPcnHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(mesWorkOrder.getPrintStatus()) && mesWorkOrder.getPrintStatus() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getPrintStatus(), "printStatus", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean); + } if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } else { From 4ffe517015397a52aae22d28a62f9a151712c9a1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Sep 2020 14:53:57 +0800 Subject: [PATCH 103/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 19 +++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 341490d..0205650 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -624,6 +624,25 @@ public class DdlPreparedPack { } } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param sufColumnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, String sufColumnName, DdlPackBean packBean) { + if (data != null && data.size() > 0) { + String destColumnName = columnName; + if (!StringUtil.isEmpty(sufColumnName)) { + destColumnName = destColumnName + "_" + System.currentTimeMillis(); + } + packBean.addColumnQuery(destColumnName, " and model." + columnName + " not in (:m_" + destColumnName + ")", data); + } + } + /** * 封装in String查询语句 * 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 541097e..0634370 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 @@ -228,7 +228,7 @@ public class WmsHqlPack { for (String busiType : wmsDocMovementMaster.getFilterBusiType().split(",")) { filterBusiType.add(Integer.parseInt(busiType)); } - DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", packBean); + DdlPreparedPack.getNotInPackList(filterBusiType, "busiType", System.currentTimeMillis() + "", packBean); } DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); From 0d0905c454ffc8b90aca990661df9e1192e19d93 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 21 Sep 2020 14:56:51 +0800 Subject: [PATCH 104/329] =?UTF-8?q?sweb=E5=90=88=E5=B9=B6dev=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java index accc6b4..5807d18 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -63,7 +63,11 @@ public class SwebRequireAlarm extends BaseBean { @Column(name = "COUNT_DATE") @ApiParam("日期") - private Double countDate; + private String countDate; + + @Column(name = "REQUEST_QTY") + @ApiParam("需求数量") + private String requestQty; @Transient @ApiParam("日期") From 0c044eed9136b825646be473f70360721256a5a8 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Sep 2020 15:11:04 +0800 Subject: [PATCH 105/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 01fecb2..7cd233a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -251,7 +251,7 @@ public class WmsDocMovementMaster extends BaseBean { /**备注3**/ @Column(name = "THIRD_REMAKE") - @ApiParam(value = "客户类型") + @ApiParam(value = "财务类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue") private String thirdRemake; From 673c6d0fe22d6a89c9ecd8a2b74bbd9210d4ff6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 21 Sep 2020 18:12:48 +0800 Subject: [PATCH 106/329] =?UTF-8?q?fix(softswitch):ftp-linux=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=B8=AD=E6=96=87=E4=BB=B6=E8=AF=BB=E5=8F=96=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index f7fbfb9..93a159f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -66,6 +67,15 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "ftp编码") private Integer encode; + @Column(name = "CONNECTION_MODE") + @ApiParam(value = "ftp连接模式") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.class) + private Integer connectionMode; + + public String getConnectionModeTxt(){ + return connectionMode == null ? "无" : BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.valueOfDescription(connectionMode); + } + @Column(name = "IS_READ_AND_EMPTY") @ApiParam(value = "读取并清空") private Integer isReadAndEmpty; From d6f4fa7f92b4a7724d198f71583cd929fc5dd3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 21 Sep 2020 18:18:58 +0800 Subject: [PATCH 107/329] =?UTF-8?q?feat(softswitch):=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8A=A5=E6=96=87=E5=A4=84=E7=90=86=E7=8A=B6=E6=80=81=E5=8F=8A?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 55 ++++++++++++++++++++-- .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 4 ++ 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 97c8733..6cbc54a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -830,7 +830,8 @@ public class BlockSoftSwitchEnumUtil { public enum SUIT_PROCESS_STATUS { UNPROCESSED(10, "未处理"), PROCESSING(20, "处理中"), - PROCESS(30, "已处理"); + PROCESS(30, "已处理"), + PROCESS_FAIL(40, "处理失败"); private int value; private String description; @@ -878,7 +879,8 @@ public class BlockSoftSwitchEnumUtil { REQUEST_ORGIN_PARAM(20, "请求原始参数"), ORIGINAL_MESSAGE(30, "原始报文"), CONVERTED_MESSAGE(40, "转换报文"), - SUIT_SEND_MESSAGE(50, "适配发送报文"); + SUIT_SEND_MESSAGE(50, "适配发送报文"), + PROCESS_RESULT(60, "处理结果"); private int value; private String description; @@ -919,6 +921,52 @@ public class BlockSoftSwitchEnumUtil { } /** + * ftp连接模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FTP_CONNECTION_MODE { + LOCAL_ACTIVE_MODE(10, "本地主动模式"), + LOCAL_PASSIVE_MODE(20, "本地被动模式"), +// REMOTE_ACTIVE_MODE(30, "远程主动模式"), + REMOTE_PASSIVE_MODE(40, "远程被动模式"); + + private final int value; + private final String description; + + FTP_CONNECTION_MODE(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; + } + + public static FTP_CONNECTION_MODE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return FTP_CONNECTION_MODE.LOCAL_ACTIVE_MODE; + } + } + + /** * 脚本类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -957,7 +1005,6 @@ public class BlockSoftSwitchEnumUtil { } public static BS_SCRIPT_TYPE valueOf(int val) { - String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; @@ -1003,7 +1050,6 @@ public class BlockSoftSwitchEnumUtil { } public static BS_SCRIPT_LANGUAGE valueOf(int val) { - String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; @@ -1050,7 +1096,6 @@ public class BlockSoftSwitchEnumUtil { } public static BS_SCRIPT_EXECUTE_METHOD valueOf(int val) { - String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index a7d0e35..d3af46c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -138,6 +138,10 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "脚本结果") private String scriptResult; + @Column(name = "PROCESS_RESULT") + @ApiParam(value = "处理结果") + private String processResult; + /************************************** 临时属性 ***************************************/ @Transient From 735838e27f12c69f1724faba1dd71a3adb8c3cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 21 Sep 2020 18:41:31 +0800 Subject: [PATCH 108/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=B4=A7=E6=80=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 1843779..0d056b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -185,7 +185,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Column(name = "PRINT_STATUS") @ApiParam("打印状态") - private Integer printStatus = 10; + private Integer printStatus; @Version @Column(name = "LOCK_VERSION") From 41efdd4de8d02fdf839c5cab97854cba1192b13b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 21 Sep 2020 18:51:00 +0800 Subject: [PATCH 109/329] =?UTF-8?q?=E3=80=902798=20=E6=AD=A6=E6=B1=89PRD-A?= =?UTF-8?q?MP-WMS2AMP=E5=90=8C=E6=AD=A5=E6=8B=89=E5=8A=A8=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=BA=93=E5=AD=98=E6=8E=A5=E5=8F=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/util/StringUtil.java | 13 +++++++++++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 12 +++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java index 6a7a274..d9c48c7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java @@ -12,11 +12,11 @@ import java.util.regex.Pattern; public class StringUtil { public static boolean isEmpty(Object obj){ - + if(obj ==null || obj.toString().trim().equals("")){ return true; } - + return false; } @@ -33,4 +33,13 @@ public class StringUtil { } return fieldNames; } + + public static boolean isEmptyAndNull(Object obj){ + + if(obj == null || obj.toString().trim().equals("") || "null".equalsIgnoreCase(obj.toString().trim())){ + return true; + } + + return false; + } } 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 f9b3812..df3cbdf 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 @@ -520,6 +520,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("物料库位") private String partLocateNo; + @Transient + @ApiParam("数量总和") + private Double sumQty; + public WmsStockSn() { } @@ -850,5 +854,11 @@ public class WmsStockSn extends BaseBean { this.organizeCode = organizeCode; } - + public WmsStockSn(WmsStockSn wmsStockSn, Double sumQty) { + this.partNo = wmsStockSn.getPartNo(); + this.vendorNo = wmsStockSn.getVendorNo(); + this.unit = wmsStockSn.getUnit(); + this.partNameRdd = wmsStockSn.getPartNameRdd(); + this.sumQty = sumQty; + } } From ffb45cf3dd9b9f9e66ea5799b43c672ef9b7099b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Sep 2020 22:15:24 +0800 Subject: [PATCH 110/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 0634370..9f24499 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 @@ -1666,6 +1666,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "snOneBarCode", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getItem(), "item", result); DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); From c4f161e958a7462314bf277dc4729717d70a97af Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Sep 2020 09:28:08 +0800 Subject: [PATCH 111/329] Start Task #2795 --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index ce53f9e..297711e 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -117,6 +117,10 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam(value = "重量") private Double weight; + @Column(name = "VEN_PRODUCT_TIME") + @ApiParam(value = "供应商生产日期") + private String venProductTime; + @Transient @ApiParam(value = "合同号") private String refNo; From bc383d573b183c6e69afff4c124104f096f1a3d5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 22 Sep 2020 09:36:22 +0800 Subject: [PATCH 112/329] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=B9=E6=AE=8A=E6=A0=87=E7=A4=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 +-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 49 ++++++++++++++++++++- .../main/java/cn/estsh/i3plus/pojo/mes/.DS_Store | Bin 8196 -> 0 bytes .../i3plus/pojo/mes/bean/IfQueueShipping.java | 4 ++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 8 ++++ .../pojo/mes/bean/MesWorkCellPointGroup.java | 8 ++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 14 ++++-- 7 files changed, 81 insertions(+), 8 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 769dc34..17e9493 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -4526,7 +4526,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), - EMPTYING(20, "放空"); + EMPTYING(20, "放空"), + ERR_PERCH(30, "异常占位"); private int value; private String description; @@ -6659,8 +6660,7 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_SIDE { POSITIVE(10, "A", "正面"), - REVERSE_SIDE(20, "B", "背面"), - SPECIAL_SIDE(30, "C", "特殊件"); + REVERSE_SIDE(20, "B", "背面"); private Integer value; private String code; 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 9fe3ede..63ea616 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 @@ -2165,6 +2165,16 @@ public class MesPcnEnumUtil { 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; + } } /** @@ -5381,8 +5391,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_SIDE { POSITIVE(10, "A", "正面"), - REVERSE_SIDE(20, "B", "背面"), - SPECIAL_SIDE(30, "C", "特殊件"); + REVERSE_SIDE(20, "B", "背面"); private Integer value; private String code; @@ -5467,4 +5476,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 客户JIT生产队列特殊标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { + NORMAL(10, "正常"), + EMPTYING(20, "放空"), + ERR_PERCH(30, "异常占位"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store deleted file mode 100644 index cc05df3a1b6d4ff9f06fe9c784d439d6dd3e4565..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMU2GIZ9G~A&V3)3Riy#HNaB?6;0c(r47{KcXRcJ{o*V6J~kG+k5V>F^hiEje>DEMI12bCrYi4W=n>VrO@i6qAOpPjwZT96lGPa`8_viTYgYm`y~?7%BIhlDao_Sn_j)ZO*w<}38*Q^_I-OpJ9+=)vZrtsDF;95B5#5~tW2({YaCgb z9Byc+rF#8?BO|gTEm+>RwZCxq=d4&U{HmM~aWRSUkk)udQf z(QKuNexF4{az_>NsoC=vFRfWs*RU?VajZhEoO8P}PuW3GJAt*wGQI7(pEn)Da`yHN z@weAow0tXPo868+V9J$PDUVfDEm(MGwWbM!YYrvTzCzC0U$BCMYD$vAF_PL6WtTyZ zvc)y{D2Ak-rZ_bEGHr>rlWST$lS(6USfSmkbo=zglBx^C)k>|>{UlLAR(;V^uRNgj z*m};iWz`VlG%62iy+whxthS5J^~yZ0FYgWv&=h@H^fhTMT0bAQL-&KuLDS)n^daeJ zYHdq2Z9CUB83unK;?~K}Lq4R^HG&tZ5b~BF+vm@*nJH_5% zXV_VGo_)f;U|+M#>?ig!U55S2t|9>mbFdI8EW_Pcj#{k82Bgu1&De%s^g+iS?1hCV z;Nt)eVii?$w=UN&&JGDacitWIlgsY8Z_U~b z&ErJ))7ziO!H{@@Ss~*}j0#`&BpQ!}D?wSbxJ3PHi$N@o9wMxHK;r90ohhuVQ%fb{ znkq%jnibSMttP^zQoU-mOq^GzMWO5JC1STaU1*htMw$4pmPOii>q*>KtYyTY!r-!TK_sKQ-XfqJaP!y#Q;(S}ZR;W1>;gMMVO8#x#l zfCCr%iM)p}f~PTx!y$Q(5P4s~ah$-5c!@~-Cf>rSaT33WbNHAjd=Zx-YL+P5F`2UX zb|Phq8PBm@XD{`Y>?fPYt(ze*O&C=1tzzSi@BeQWCf3IY#0dP05kOgMrnQ+SaHEZs zpS6>ecT?tx+l>ktx==CcB7oZCe;86dNv7N<9m!E4sfW@(ei2|A@%R6)e!9lr|B#pe G_2Lh!2}*ka diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index fbe8994..c9b462d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -146,4 +146,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "VERSION") @ApiParam("版本号") private String version; + + @Column(name = "SPECIAL_FLAG") + @ApiParam("特殊标识") + private Integer specialFlag; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 5d1f42f..88771e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -112,6 +112,14 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("等级代码") private String gradeCode; + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Column(name = "SPECIAL_FLAG") + @ApiParam("特殊标识") + private Integer specialFlag; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 719ae64..b539f74 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -91,6 +91,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("产品位置代码") private String produceCategoryCode; + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Transient + @ApiParam("状态") + private String statusName; + public double getQueueSeqVal() { return this.queueSeq == null ? 0 : this.queueSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 5268375..70b769e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -113,6 +113,8 @@ public class QueueOrderModel implements Serializable { @ApiParam("是否放空") private Integer isEmpty; + @ApiParam("特殊标识") + private Integer specialFlag; public QueueOrderModel() { } @@ -199,7 +201,8 @@ public class QueueOrderModel implements Serializable { // getPrintSnQueueOrderModel public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo, - String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber, String custProdLineCode) { + String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, + String groupSeq, String serialNumber, String custProdLineCode, Integer specialFlag, String workType) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -216,6 +219,8 @@ public class QueueOrderModel implements Serializable { this.groupSeq = groupSeq; this.serialNumber = serialNumber; this.custProdLineCode = custProdLineCode; + this.specialFlag = specialFlag; + this.workType = workType; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, @@ -259,7 +264,7 @@ public class QueueOrderModel implements Serializable { //getWaitQueueOrderModelNoSnMgn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode, - String vinCode, String formulaContent, String queueGroupNo) { + String vinCode, String formulaContent, String queueGroupNo, String jitSeq) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -279,11 +284,13 @@ public class QueueOrderModel implements Serializable { this.vinCode = vinCode; this.formulaContent = formulaContent; this.queueGroupNo = queueGroupNo; + this.jitSeq = jitSeq; } //getAlreadyQueueOrderModelNoSnMgn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo, String produceCategoryCode) { + String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, + String queueGroupNo, String produceCategoryCode, String jitSeq) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -300,6 +307,7 @@ public class QueueOrderModel implements Serializable { this.formulaContent = formulaContent; this.queueGroupNo = queueGroupNo; this.produceCategoryCode = produceCategoryCode; + this.jitSeq = jitSeq; } //getAlreadyQueueOrderModelNoSn From 2f953ac22344252c696b95994c400b19f5d3dae5 Mon Sep 17 00:00:00 2001 From: songss Date: Tue, 22 Sep 2020 11:57:19 +0800 Subject: [PATCH 113/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=AD=E8=88=AADB=E5=A4=8D=E6=A0=B8=E9=A1=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=82=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDbCheckRecord.java | 2 +- .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java index f25605d..fd18f12 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -45,7 +45,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable { //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。 @Column(name = "DB_CHECK_ITEM") @ApiParam("DB复核项") - private String dbReview; + private String dbCheckItem; @Column(name = "ERROR_FILED_CODE") @ApiParam("异常取值字段") 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 a364f73..46b468c 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 @@ -341,6 +341,29 @@ public class MesPcnHqlPack { return packBean; } + public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getDbCheckItem())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getDbCheckItem(), "dbCheckItem", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getErrorFiledCode())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) { + DdlPreparedPack.getStringLikerPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) { + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean); + } + if (!StringUtils.isEmpty(dbCheckRecord.getStatus())) { + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean); + } + return packBean; + } + /** * 按条件分页查询产品条码补打印数据 * From 73809df82700f32aa44f3d98a0a6fb34516f3447 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Sep 2020 13:48:48 +0800 Subject: [PATCH 114/329] =?UTF-8?q?=E5=90=88=E5=B9=B6swebtest=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java index accc6b4..5807d18 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -63,7 +63,11 @@ public class SwebRequireAlarm extends BaseBean { @Column(name = "COUNT_DATE") @ApiParam("日期") - private Double countDate; + private String countDate; + + @Column(name = "REQUEST_QTY") + @ApiParam("需求数量") + private String requestQty; @Transient @ApiParam("日期") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java index 3e8547b..4d7e3b7 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java @@ -65,6 +65,10 @@ public class SwebVendorStock extends BaseBean { @ApiParam("周") private String countWeek; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient @ApiParam("日期") private String dateStart; From 053b609d88d542b613b1cc8cfa4ebac3d4434faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 22 Sep 2020 14:02:54 +0800 Subject: [PATCH 115/329] =?UTF-8?q?=E3=80=9011559=2019081-MESOP30=E6=96=99?= =?UTF-8?q?=E7=AE=B1=E4=BA=8C=E6=AC=A1=E6=A0=A1=E9=AA=8C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=A7=A6=E5=8F=9120200922=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 17e9493..56a6580 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -69,16 +69,21 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { - MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(20, "展示组件"), - BUTTON_MODULE(30, "按钮组件"), - TIMING_MODULE(40, "定时组件"); + MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"), + REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"), + BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"), + TIMING_MODULE(40, "TIMING_MODULE", "定时组件"), + PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"), + PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"), + ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件"); private int value; + private String data; private String description; - WORK_MODULE_TYPE(int value, String description) { + WORK_MODULE_TYPE(int value, String data, String description) { this.value = value; + this.data = data; this.description = description; } @@ -86,6 +91,10 @@ public class MesEnumUtil { return value; } + public String getData() { + return data; + } + public String getDescription() { return description; } @@ -708,7 +717,8 @@ public class MesEnumUtil { EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"), - BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"); + BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"), + WO_TYPE("WO_TYPE", "客户JIT队列工单类型"); private String value; private String description; @@ -4779,7 +4789,8 @@ public class MesEnumUtil { public enum WORK_CELL_MONITOR_TYPE { MONITOR(10, "监听组件"), SHOW(20, "展示组件"), - BUTTON(30, "按钮组件"); + BUTTON(30, "按钮组件"), + PROCESS_MONITOR(40, "工序监听组件"); private int value; private String description; From d0502744508758f3bf8c894e221b07641bade31d Mon Sep 17 00:00:00 2001 From: songss Date: Tue, 22 Sep 2020 16:04:22 +0800 Subject: [PATCH 116/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MesProductDataModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java new file mode 100644 index 0000000..ce492d7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @CreateDate: 2020/9/22 + * @Author: simon.song + */ +@Data +public class MesProductDataModel { + @ApiParam("生产数据表主键ID") + private String id; + + @ApiParam("工位代码") + private String workCellCode; + + @ApiParam("工位名称") + private String workCellName; + + @ApiParam("产品包装model") + private List productDataModelList; + +} From 696695ef0e8de74c9d4aff103e4d3f79dd916e89 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 22 Sep 2020 17:12:32 +0800 Subject: [PATCH 117/329] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=2010923=2010894?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 20 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java | 5 +++++ 2 files changed, 25 insertions(+) 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 c076230..8788520 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 @@ -5427,4 +5427,24 @@ public class MesPcnEnumUtil { } } + /** + * 过程检测检测检测结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_MONITOR_OBJECT_TYPE { + ORGANIZE("10"), + WORK_SHOP("20"), + WORK_CENTER("30"); + + private String value; + + BOARD_MONITOR_OBJECT_TYPE(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java index 7077a43..aa78191 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -45,4 +46,8 @@ public class MesBoardDisplay extends BaseBean implements Serializable { @Column(name = "ROLL_SPEED") @ApiParam("滚动速度") private Integer rollSpeed; + + @Transient + @ApiParam("跑马灯字体颜色") + private String fontColor; } From a285532d22bd862a50487b3c0bccd3dee73ab243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=8F=8C=E5=8F=8C?= Date: Tue, 22 Sep 2020 17:14:27 +0800 Subject: [PATCH 118/329] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'.DS=5FStore'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Tue, 22 Sep 2020 17:14:58 +0800 Subject: [PATCH 119/329] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'.DS=5FStore'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Tue, 22 Sep 2020 17:19:49 +0800 Subject: [PATCH 120/329] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=8E=89.DS=5FStore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e1e35d5..b86a41d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ target *.class .md *.log -*.properties \ No newline at end of file +*.properties +.DS_Store \ No newline at end of file From fc351f559916fbdb611c652aef7be806d8a92ada Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 22 Sep 2020 17:37:14 +0800 Subject: [PATCH 121/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9f24499..8f75c78 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 @@ -1375,7 +1375,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { - DdlPreparedPack.getNumberBiggerPack(0, "qty", result); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "qty", result); } if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) { wmsStockSn.setQualityDateTimeStart(""); From 612c919e5fb56a4e186c3f0a122df1429fff51c6 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 22 Sep 2020 21:23:33 +0800 Subject: [PATCH 122/329] =?UTF-8?q?bypass=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 48 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 8 ++++ 2 files changed, 56 insertions(+) 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 63ea616..5043169 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 @@ -5512,4 +5512,52 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_CATEGORY_NAME { + + FL("FL", "前右"), + FR("FR", "前左"), + RL("RL", "后左"), + RR("RR", "后右"); + + private String description; + private String value; + + PRODUCE_CATEGORY_NAME(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index e438425..926b291 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -170,4 +170,12 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "零件号") public String partNo; + @Transient + @ApiParam(value = "客户零件号") + public String custPartNo; + + @Transient + @ApiParam(value = "qty") + public Integer qty; + } From e9ce24d6f9eee61e7947f0100aaca2962de951df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 23 Sep 2020 14:16:08 +0800 Subject: [PATCH 123/329] =?UTF-8?q?=E3=80=902794=2009=20ext=2019081-?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8F=98=E6=9B=B4-20200813=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/bean/MesDefectRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 9c5f0e9..26ca667 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -95,6 +95,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("后移数量") private Integer backwardNum; + @Transient + @ApiParam("质量状态") + private Integer qcStatus; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } From 3c1c6c8c55ea19ffceecf611232767ebbccd9155 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 23 Sep 2020 14:39:44 +0800 Subject: [PATCH 124/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=20password?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index f759312..d46f990 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -192,6 +192,9 @@ public class StationRequestBean implements Serializable { @ApiParam("创建时间") private String packageNo; + @ApiParam("密码") + private String password; + @Override public String toString() { return "StationRequestBean{" + From 816557085f1376e203373cdc9a1908b63f1f4400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 23 Sep 2020 15:06:46 +0800 Subject: [PATCH 125/329] =?UTF-8?q?fix(base):=E4=BF=AE=E6=94=B9=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E9=A1=B5=E5=8F=96=E5=80=BC=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index 2b2895b..ffa8853 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -114,7 +114,7 @@ public class Pager { } public int getCurrentPage() { - return currentPage; + return currentPage < 1 ? 1 : currentPage; } public void setCurrentPage(int currentPage) { From 11750e9bf1184c01a7b75b5564cff06834d63d92 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Wed, 23 Sep 2020 17:34:02 +0800 Subject: [PATCH 126/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E7=9A=84pojo=EF=BC=8C=E7=A1=AE=E4=BF=9D?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E5=8A=9F=E8=83=BD=E5=8F=AF=E4=BB=A5=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/snapshot/SnapshotBean.java | 153 +++++++++++++++++++++ .../wms/bean/snapshot/WmsMoveDetailsSnapshot.java | 34 ++++- .../wms/bean/snapshot/WmsMoveMasterSnapshot.java | 4 +- .../pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java | 8 +- .../wms/bean/snapshot/WmsStockQuanSnapshot.java | 3 +- .../pojo/wms/bean/snapshot/WmsStockSnSnapshot.java | 3 +- 6 files changed, 185 insertions(+), 20 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java new file mode 100644 index 0000000..8a1e6b4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java @@ -0,0 +1,153 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +@Data +@MappedSuperclass +public class SnapshotBean implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @GenericGenerator(name = "generator", strategy = "increment") + @GeneratedValue(generator = "generator") + @Column(name = "snap_id") + private Long snapId; + + //此处使用hibernate的主键策略方式 + //手动设置,使用iplus-platform-common中的idtool生成 + //将Long类型系列化成String避免精度丢失 + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="ORGANIZE_CODE", nullable = false) + @ApiParam(value ="组织代码") +// @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) + public String organizeCode; + + @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) + @ApiParam(value = "有效性",example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + public Integer isValid; //CommonEnumUtil.IS_VAILD; + + @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否已删除",example = "2") + @AnnoOutputColumn(hidden = true) + //逻辑删除，软删除 + public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA + + @Column(name="CREATE_USER",updatable = false) + @ApiParam(value = "创建用户") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String createUser; + + @Column(name="CREATE_DATE_TIME",updatable = false) + @ApiParam(value = "创建日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String createDatetime; + + @Column(name="MODIFY_USER") + @ApiParam(value = "修改人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String modifyUser; + + @Column(name="MODIFY_DATE_TIME") + @ApiParam(value = "修改日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String modifyDatetime; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeEnd; + + @Transient + @ApiParam(value = "排序属性") + @AnnoOutputColumn(hidden = true) + public String orderByParam = ""; + + @Transient + @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") + @AnnoOutputColumn(hidden = true) + //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc + public transient Integer ascOrDesc = 1; + + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid.intValue(); + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + } + + //排序方式 + public String orderBy(){ + String result = ""; + if (orderByParam!=null&&orderByParam.trim().length()>0) { + result = " order by " + orderByParam; + if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + }else{ + result += " desc"; + } + } + return result; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java index 29477e4..f830b47 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -32,7 +33,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单明细信息") -public class WmsMoveDetailsSnapshot extends BaseBean { +public class WmsMoveDetailsSnapshot extends SnapshotBean { private static final long serialVersionUID = -4095410692227226944L; @@ -141,6 +142,31 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @Transient private Long finishedCounts; + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomVersion; + + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer consignation = 2; + + @Column(name = "GROUP_NO") + @ApiParam("分组号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String groupNo; + + @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ApiParam(value = "已处理数量", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + public Double handledQty; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + @Transient @ApiParam("交易类型") private String transTypeCode; @@ -182,10 +208,6 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @ApiParam("创建时间") private String createDateTime; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java index 7679f39..bf4419e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; 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; @@ -31,7 +30,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单主表信息") -public class WmsMoveMasterSnapshot extends BaseBean { +public class WmsMoveMasterSnapshot extends SnapshotBean { private static final long serialVersionUID = 3569874772643448726L; @@ -150,7 +149,6 @@ public class WmsMoveMasterSnapshot extends BaseBean { @ApiParam(value = "设备编号") public String fixId; - @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index 453d372..79bb4c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; 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; @@ -33,7 +32,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单条码信息") -public class WmsMoveSnSnapshot extends BaseBean { +public class WmsMoveSnSnapshot extends SnapshotBean { private static final long serialVersionUID = 2588101374261238353L; @@ -189,11 +188,6 @@ public class WmsMoveSnSnapshot extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; - public WmsMoveSnSnapshot() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index 724a81d..c927e7d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -33,7 +32,7 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "库存信息", description = "库存信息") -public class WmsStockQuanSnapshot extends BaseBean { +public class WmsStockQuanSnapshot extends SnapshotBean { private static final long serialVersionUID = 8335719859185712904L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java index 8d15ecc..62a730f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; 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; @@ -45,7 +44,7 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "库存条码信息", description = "库存条码信息") -public class WmsStockSnSnapshot extends BaseBean { +public class WmsStockSnSnapshot extends SnapshotBean { private static final long serialVersionUID = 8641922373097608315L; From ba6470baad6c7e3b901001e0d03b471f6f38eba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 23 Sep 2020 17:41:07 +0800 Subject: [PATCH 127/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=BB=84=E6=89=98=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=89=98=E5=8C=85=E8=A7=84=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index eb0072f..9e6b793 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -128,6 +128,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("是否小尺寸物料") private Integer isSmallSize = 1; + @Column(name = "QTY2") + @ApiParam(value = "二级包装数量") + private Double qty2; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; From 4bfb903e5417ea37c510d25c8004e7d439edefb1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Sep 2020 19:07:17 +0800 Subject: [PATCH 128/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E9=82=A3=E5=8F=91=E8=BF=90=E6=8F=90=E4=BA=A4=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E9=87=8D=E5=A4=8D&=E7=9B=98=E7=82=B9=E6=8F=90=E4=BA=A4sql?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 4ce5d3c..a805f86 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -39,4 +39,7 @@ public class WmsStockFifoModel { @ApiParam("默认规则") private String defaultRule; + + @ApiParam("同批次") + private boolean fifoSameBatch; } 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 8f75c78..3e5609b 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 @@ -1375,7 +1375,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { - DdlPreparedPack.getNumberBiggerPackContainsZero(0, "qty", result); + DdlPreparedPack.getNumberBiggerPackContainsZero(0.0, "qty", result); } if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) { wmsStockSn.setQualityDateTimeStart(""); From 979e18c4a7bd6ab82d0f8fff24e01cb354c10b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 24 Sep 2020 09:08:11 +0800 Subject: [PATCH 129/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E6=B6=82=E8=A3=85=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 9e6b793..b7bcc1c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -129,7 +129,7 @@ public class MesPart extends BaseBean implements Serializable { private Integer isSmallSize = 1; @Column(name = "QTY2") - @ApiParam(value = "二级包装数量") + @ApiParam(value = "包装数量") private Double qty2; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 469a7e1..8ded48c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -44,6 +44,9 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("不良处理类型") private String defectType; + @ApiParam("反喷标识") + private String reverseSprayMark; + @ApiParam("列名") private List> headModelList; From 9fb8962e4e991e710e91af826aef7e082cf101bc Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 24 Sep 2020 09:15:41 +0800 Subject: [PATCH 130/329] =?UTF-8?q?=E5=AE=A2=E9=80=80=E4=BB=B6bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 926b291..5ecb56c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -178,4 +178,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "qty") public Integer qty; + @Transient + @ApiParam("工单类型") + private String woTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java index 4cee1fd..64e9e70 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -36,6 +36,9 @@ public class QueueJitActualModel { public String workTypeName; @ApiParam("客户产线代码") + private String custPlantCode; + + @ApiParam("客户产线代码") private String custProdLineCode; @ApiParam("产品位置代码") @@ -73,13 +76,13 @@ public class QueueJitActualModel { } - public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode, + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custPlantCode, String produceCtgyCode, String productSn, Integer detailStatus, String createUser, String createDatetime) { this.id = id; this.vinCode = vinCode; this.jisActualNo = jisActualNo; this.workType = workType; - this.custProdLineCode = custProdLineCode; + this.custPlantCode = custPlantCode; this.produceCtgyCode = produceCtgyCode; this.productSn = productSn; this.detailStatus = detailStatus; @@ -94,6 +97,7 @@ public class QueueJitActualModel { this.jisActualNo = jisActualNo; this.partNo = partNo; this.partName = partName; + this.produceCtgyCode = produceCtgyCode; this.qty = qty; this.createUser = createUser; this.createDatetime = createDatetime; From 2d2ff0ddb171597bc3667d3928afad685674f237 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 24 Sep 2020 09:40:30 +0800 Subject: [PATCH 131/329] =?UTF-8?q?=E3=80=902801=20=E6=AD=A6=E6=B1=89PRD-A?= =?UTF-8?q?MP-WMS2SAP=E5=9B=9E=E4=BC=A0TWD=E8=AE=A2=E5=8D=95=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=BB=93=E6=9E=9C=E6=8E=A5=E5=8F=A3=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/WmsMoveToERP.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 1e55325..733c9d0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -236,6 +236,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "客户单号") private String custOrderNo; + @Column(name = "IS_SYNC2") + @ApiParam("同步标识2") + public Integer isSync2 = CommonEnumUtil.FALSE; + @Transient private Long shippingId; From 708985be2ad9e9369e21aac584675429bd8f0f78 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 24 Sep 2020 14:22:58 +0800 Subject: [PATCH 132/329] =?UTF-8?q?=E4=B8=AD=E8=88=AA=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8A=A5=E8=AD=A6=20#1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 18 ++++++++ .../pojo/mes/pcn/bean/MesEquAlarmRecord.java | 53 ++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.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 025fe04..b8719b6 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 @@ -4791,6 +4791,24 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_TYPE { + STANDARD(10, "标准"), + EQU_WORKING_SIGNAL(20, "设备作业信号"); + + private int value; + private String description; + + PLC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + } + /** * mes设备状态 */ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java new file mode 100644 index 0000000..25fe6ee --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java @@ -0,0 +1,53 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/23 18:47 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_ALARM_RECORD", indexes = { + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("设备自动报警记录表") +public class MesEquAlarmRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1675134362612851879L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警等级") + private Integer alarmLevel; + + @Column(name = "ALARM_START_TIME") + @ApiParam("报警开始时间") + private String alarmStartTime; + + @Column(name = "ALARM_STOP_TIME") + @ApiParam("报警开始时间") + private String alarmStopTime; +} From b376450d4b1c5ef37439b7f1de7fbabcef5dc933 Mon Sep 17 00:00:00 2001 From: songss Date: Thu, 24 Sep 2020 14:55:35 +0800 Subject: [PATCH 133/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E5=BC=82=E5=B8=B8=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesDbCheckRecord.java | 2 +- .../pojo/mes/model/MesDbCheckRecordModel.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java index fd18f12..5a8223f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -57,7 +57,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable { @Column(name = "PRODUCT_DATA_ID") @ApiParam("生产记录表主键ID") - private String productDataId; + private Long productDataId; //是否停线：1=是，2=否 @Column(name = "IS_STOP_LINE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java new file mode 100644 index 0000000..2b5b50c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @CreateDate: 2020/9/24 + * @Author: simon.song + */ +@Data +public class MesDbCheckRecordModel { + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partDesc; + + @ApiParam("异常取值字段") + private String errorFiledCode; + + @ApiParam("异常描述") + private String errorDesc; + + public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String errorFiledCode, String errorDesc) { + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partDesc = partDesc; + this.errorFiledCode = errorFiledCode; + this.errorDesc = errorDesc; + } +} 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 46b468c..3e7316f 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 @@ -353,7 +353,7 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean); } if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) { - DdlPreparedPack.getStringLikerPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); } if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) { DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean); From b8e34a34b5c49f370c6d87b1270c3a4056923a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 24 Sep 2020 14:59:56 +0800 Subject: [PATCH 134/329] =?UTF-8?q?=E3=80=9011561=2019081-=E5=AE=89?= =?UTF-8?q?=E7=81=AFpushPLC=E6=8E=A7=E5=88=B6=E4=B8=89=E8=89=B2=E7=81=AF-?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E6=9C=AA=E6=8E=A7=E5=88=B6=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D-20200924=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonPlcColorCfg.java | 54 ++++++++++++++++++++++ .../repository/IAndonPlcColorCfgRepository.java | 17 +++++++ 2 files changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java new file mode 100644 index 0000000..5893a1d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.andon.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 + * @CreateDate : 2019-03-07 09:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="ANDON_PLC_COLOR_CFG") +@Api(value="PLC三色灯控制") +public class AndonPlcColorCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3284234821448131212L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name="RED_PLC_CODE") + @ApiParam(value ="红灯PLC代码") + private String redPlcCode; + + @Column(name="YELLOW_PLC_CODE") + @ApiParam(value ="黄灯PLC代码") + private String yellowPlcCode; + + @Column(name="GREEN_PLC_CODE") + @ApiParam(value ="绿灯PLC代码") + private String greenPlcCode; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java new file mode 100644 index 0000000..1de89d8 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; +import cn.estsh.i3plus.pojo.andon.bean.AndonPlcColorCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonPlcColorCfgRepository extends BaseRepository { +} From 373e5026c5b8ca5913e2c3dffd2c2fc66d96596d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 24 Sep 2020 15:21:39 +0800 Subject: [PATCH 135/329] =?UTF-8?q?=E3=80=902794=2009=20ext=2019081-?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8F=98=E6=9B=B4-20200813=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/bean/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index b7bcc1c..f26050e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -155,4 +155,8 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("拉动数量") private Double pullQty; + + @Transient + @ApiParam("BOM用量") + private Double bomQty = 0d; } From 543058b3a5e6e28791346f6f572581c7d3d46833 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 24 Sep 2020 15:49:36 +0800 Subject: [PATCH 136/329] =?UTF-8?q?=E5=90=88=E5=B9=B6sweb=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..0a44fb0 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 0f1f437a9e9b73d6645d90c70611f96f34fa03b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 24 Sep 2020 16:25:26 +0800 Subject: [PATCH 137/329] =?UTF-8?q?=E3=80=902794=2009=20ext=2019081-?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8F=98=E6=9B=B4-20200813=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/bean/MesRepairRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index d717a56..8ddba7c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -100,4 +100,8 @@ public class MesRepairRecord extends BaseBean implements Serializable { @Transient @ApiParam("缺陷集合") private List mesDefectList; + + @Transient + @ApiParam("质量状态") + private Integer qcStatus; } From d7edc3a309517b45c6d492330da672ef7ba65a2b Mon Sep 17 00:00:00 2001 From: songss Date: Thu, 24 Sep 2020 17:27:43 +0800 Subject: [PATCH 138/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=E8=AE=B0=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/MesProductDataDefectModel.java | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java new file mode 100644 index 0000000..6af729e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @CreateDate: 2020/9/24 + * @Author: simon.song + */ +@Data +public class MesProductDataDefectModel { + + @ApiParam("生产工单") + private String orderNo; + + @ApiParam("产品编码") + private String partNo; + + @ApiParam("产品名称") + private String partDesc; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("缺陷类型") + private String errorFiledCode; + + @ApiParam("缺陷原因") + private String errorDesc; + + @ApiParam("下线时间") + private String offlineTime; + + public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String errorFiledCode, String errorDesc, String offlineTime) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partDesc = partDesc; + this.productSn = productSn; + this.errorFiledCode = errorFiledCode; + this.errorDesc = errorDesc; + this.offlineTime = offlineTime; + } +} From 4bd47e64c31121d8da4de788dddfee3760a08fc8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 24 Sep 2020 20:03:25 +0800 Subject: [PATCH 139/329] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84-=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=90=8D=E7=A7=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 9dfdc8c..27e1ab2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -173,4 +173,8 @@ public class WmsInterfaceDataMapper extends BaseBean { @ColumnDefault("10") @AnnoOutputColumn(refClass = WmsEnumUtil.SOFT_DATA_FORM.class, refForeignKey = "value", value = "description", required = false) public Integer softDataType; + + @ApiParam("接口名称") + @Column(name = "INTERFACE_NAME") + public String interfaceName; } 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 3e5609b..6c0f1d4 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 @@ -2543,6 +2543,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getDestBeanName(), "destBeanName", result); DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getBusiRoute(), "busiRoute", result); DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getGroupName(), "groupName", result); + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getInterfaceName(), "interfaceName", result); getStringBuilderPack(wmsInterfaceDataMapper, result); From 604c1443cadf32d9a67589e07bd76ca9533c4930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Sep 2020 09:41:15 +0800 Subject: [PATCH 140/329] =?UTF-8?q?=E3=80=90=E4=B8=89=E8=89=B2=E7=81=AF?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=BF=A1=E6=81=AF=E5=9F=BA=E7=A1=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 05520d5..9038150 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -1100,4 +1100,17 @@ public class AndonHqlPack { DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean); return packBean; } + + /** + * 安灯 PLC三色灯控制信息查询条件封装 + * @param andonPlcColorCfg + * @return + */ + public static DdlPackBean getAndonPlcColorCfg(AndonPlcColorCfg andonPlcColorCfg) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCellCode(), "workCellCode", result); + getStringBuilderPack(andonPlcColorCfg, result); + return result; + } } From 605b7e846a2af31071c29eb47ead7e7e27a2ca7f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Fri, 25 Sep 2020 10:17:44 +0800 Subject: [PATCH 141/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=99=9A=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index b1643f2..af6faf9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -19,6 +19,7 @@ import javax.persistence.Table; * @Author dragon * @CreateDate 2019/6/19 21:23 * @Modify + * 2020-09-24 18:58 Rock.Yu 增加 Category 属性，Magna 的 BOM 是多层结构，需要靠这个字段标记是否虚阶 */ @Data @Entity @@ -82,4 +83,11 @@ public class WmsBomTotal extends BaseBean { @Column(name = "SID") @ApiParam(value = "SID") private String sid; + + /** + * SAP Category == 5 表示零件是虚阶 + */ + @Column(name = "CATEGORY") + @ApiParam(value = "是否虚阶物料") + private String category; } From 0f46a23c7af8cb64bacfff45c2f2076ae285b617 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 25 Sep 2020 11:07:03 +0800 Subject: [PATCH 142/329] =?UTF-8?q?Fix=20bug#11611=2019081-=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93-=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=90=8E=E6=92=A4=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index df92d67..fc8dbdb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -865,7 +865,8 @@ public class WmsEnumUtil { OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"), OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"), WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"), - WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"); + WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), + OTHER_IN(730, "OTHER_IN", "其它入库"); private int value; private String code; From 8c633f0bc33de2b31e270ee60382f5a45f733e79 Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 25 Sep 2020 11:22:07 +0800 Subject: [PATCH 143/329] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MesDbCheckRecordModel.java | 18 +++++++++--------- .../pojo/mes/model/MesProductDataDefectModel.java | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java index 2b5b50c..1fa374a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -13,23 +13,23 @@ public class MesDbCheckRecordModel { @ApiParam("过程条码") private String serialNumber; - @ApiParam("物料号") + @ApiParam("零件号") private String partNo; - @ApiParam("物料名称") + @ApiParam("零件名称") private String partDesc; - @ApiParam("异常取值字段") - private String errorFiledCode; + @ApiParam("缺陷类型") + private String defectType; - @ApiParam("异常描述") - private String errorDesc; + @ApiParam("缺陷原因") + private String defectDesc; - public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String errorFiledCode, String errorDesc) { + public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String defectType, String defectDesc) { this.serialNumber = serialNumber; this.partNo = partNo; this.partDesc = partDesc; - this.errorFiledCode = errorFiledCode; - this.errorDesc = errorDesc; + this.defectType = defectType; + this.defectDesc = defectDesc; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java index 6af729e..fec884f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java @@ -24,21 +24,21 @@ public class MesProductDataDefectModel { private String productSn; @ApiParam("缺陷类型") - private String errorFiledCode; + private String defectType; @ApiParam("缺陷原因") - private String errorDesc; + private String defectDesc; @ApiParam("下线时间") private String offlineTime; - public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String errorFiledCode, String errorDesc, String offlineTime) { + public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String defectType, String defectDesc, String offlineTime) { this.orderNo = orderNo; this.partNo = partNo; this.partDesc = partDesc; this.productSn = productSn; - this.errorFiledCode = errorFiledCode; - this.errorDesc = errorDesc; + this.defectType = defectType; + this.defectDesc = defectDesc; this.offlineTime = offlineTime; } } From d9d7e47ca7f7697e934852229af09c42e91c43e6 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 25 Sep 2020 11:53:06 +0800 Subject: [PATCH 144/329] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=94=AF=E4=B8=80=E7=B4=A2=E5=BC=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 3e94f7b..dff8934 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -26,7 +26,7 @@ import java.io.Serializable; @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO") }, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO", "PRODUCE_CATEGORY_CODE"}) }) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { @@ -64,7 +64,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("生产类型") private String workType; - @Column(name = "PRODUCE_CATEGORY_CODE") + @Column(name = "PRODUCE_CATEGORY_CODE", nullable = false) @ApiParam("产品位置") private String produceCategoryCode; From a939c689f3b58982da44438fc3032d48558241d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 25 Sep 2020 16:11:54 +0800 Subject: [PATCH 145/329] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2814?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 6c0f1d4..e686c57 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 @@ -1594,6 +1594,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsScriptModule(), "isScriptModule", result); return result; } From d5486603541040736c70b5f5dcc9561684c114c6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 26 Sep 2020 14:02:21 +0800 Subject: [PATCH 146/329] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index db1831e..08e820a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -102,7 +102,4 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { // @ApiParam("状态执行情况") // private StepResult stepResult; - @Transient - @ApiParam("是否执行下个扫描信息") - private boolean execNextScan = false; } From 14d2af59d68bdc4442781e3ce385379bd7a5c61f Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Sat, 26 Sep 2020 15:34:21 +0800 Subject: [PATCH 147/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=BA=A7BOM?= =?UTF-8?q?=E7=94=9F=E6=95=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index af6faf9..c276781 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -30,6 +30,11 @@ import javax.persistence.Table; @Api("全量BOM") public class WmsBomTotal extends BaseBean { private static final long serialVersionUID = 8196235268344152723L; + /** + * 麦格纳 SAP 中表示虚阶BOM的代码 + */ + public static final String MGANA_BOM_HAS_CHILD = "5"; + @Column(name = "PART_NO") @ApiParam("父物料号") private String partNo; @@ -90,4 +95,12 @@ public class WmsBomTotal extends BaseBean { @Column(name = "CATEGORY") @ApiParam(value = "是否虚阶物料") private String category; + + /** + * 是否包含子阶 + * @return + */ + public boolean hasChild() { + return category != null && category.trim().equals(MGANA_BOM_HAS_CHILD); + } } From 85feb7927a7c8bfbc078f65ba355b58a04eb0a89 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 26 Sep 2020 15:50:32 +0800 Subject: [PATCH 148/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4505d1a..c55e93f 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 @@ -1524,7 +1524,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public double findMaxByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) { if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { - StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); + StringBuffer sb = new StringBuffer("select max(CAST(model." + sumPropertyName + " as integer)) from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb, paramName, paramValue); if(StringUtils.isNotBlank(groupByName)){ sb.append(" group by model." + groupByName); From f2177fdc1ea1f5e39f2635bbfe158bc7c91c00a8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 26 Sep 2020 17:32:47 +0800 Subject: [PATCH 149/329] =?UTF-8?q?bypass=E6=95=B0=E6=8D=AE=E9=87=87?= =?UTF-8?q?=E9=9B=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java index 935cbde..b7c05dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java @@ -35,4 +35,7 @@ public class BypassModel { @ApiParam("状态") private String status; + @ApiParam("颜色") + private String color; + } From f591139bed01ebb7571d8992eaaa3ca81b335908 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 26 Sep 2020 19:57:48 +0800 Subject: [PATCH 150/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 556316e..82d05f2 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 @@ -115,7 +115,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; From e11e83330959d4a31ad73bf58767a60d66f63595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 27 Sep 2020 13:26:44 +0800 Subject: [PATCH 151/329] =?UTF-8?q?refactor(opcua):=E8=B0=83=E6=95=B4pojo?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-hardswitch/pom.xml | 6 ++ .../i3plus/pojo/hardswitch/bean/OpcUAParam.java | 69 ++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-hardswitch/src/main/java/cn/estsh/i3plus/pojo/hardswitch/bean/OpcUAParam.java diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0a44fb0..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -42,6 +42,12 @@ + + + i3plus.pojo + i3plus-pojo-base + + ${project.artifactId}-${project.version} diff --git a/modules/i3plus-pojo-hardswitch/src/main/java/cn/estsh/i3plus/pojo/hardswitch/bean/OpcUAParam.java b/modules/i3plus-pojo-hardswitch/src/main/java/cn/estsh/i3plus/pojo/hardswitch/bean/OpcUAParam.java new file mode 100644 index 0000000..654b74b --- /dev/null +++ b/modules/i3plus-pojo-hardswitch/src/main/java/cn/estsh/i3plus/pojo/hardswitch/bean/OpcUAParam.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.hardswitch.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-11-12 17:03 + * @Modify: + **/ +@Data +public class OpcUAParam { + + //opc.tcp://127.0.0.1:49320 + @ApiParam("ua服务地址") + private String serverUrl; + + /** + * 命名空间索引 + * 地址所在的 OPC UA 服务器命名空间的索引。 + */ + @ApiParam("命名空间索引") + private Integer namespaceIndex; + + /** + * 标记地址 + * 通道.设备.标记 + */ + @ApiParam("标记地址") + private String tagAddress; + + /** + * 标记值 + */ + @ApiParam("标记值") + private String tagValue; + + /** + * 标记值类型 + */ + @ApiParam("标记值类型") +// @AnnoOutputColumn(refClass = OpcUAEnumUtil.OPC_UA_TAG_VALUE_TYPE.class) + private String tagValueType; + public String getTagValueTypeVal(){ + return tagValueType == null ? "10" : tagValueType; + } + + /** + * 用户名 + */ + @ApiParam("用户名") + private String userName; + + /** + * 用户密码 + */ + @ApiParam("用户密码") + private String password; + + /** + * 请求间隔 + */ + @ApiParam("请求间隔") + private Double requestInterval = 500.0; + +} From 171f39cf01ddd87d72a650b2bf471943ae7a7a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 27 Sep 2020 13:31:52 +0800 Subject: [PATCH 152/329] =?UTF-8?q?revert:=E8=BF=98=E5=8E=9Fpojo=20pom.xml?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 8129ca5bee335cdc25db15754d000c1b2f37e6f2 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 27 Sep 2020 20:32:40 +0800 Subject: [PATCH 153/329] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=AD=A6=20?= =?UTF-8?q?mes=E7=AB=AF=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/bean/MesTaktAlarmContinuousConfig.java | 50 +++++++++++++++++ .../pojo/mes/bean/MesTaktAlarmLevelConfig.java | 62 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesTaktAlarmRecord.java | 55 +++++++++++++++++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 3 +- .../i3plus/pojo/mes/model/TaktAlarmCacheModel.java | 19 +++++++ .../MesTaktAlarmContinuousConfigRepository.java | 14 +++++ .../MesTaktAlarmLevelConfigRepository.java | 14 +++++ .../repository/MesTaktAlarmRecordRepository.java | 14 +++++ 8 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TaktAlarmCacheModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmContinuousConfigRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmLevelConfigRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java new file mode 100644 index 0000000..9e6a71c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java @@ -0,0 +1,50 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/27 15:59 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TAKT_LEVEL_CONFIG", indexes = { + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("节拍故障等级配置表") +public class MesTaktAlarmContinuousConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = -1046263075313178823L; + + @Column(name = "WORK_CETNER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "CONTINUOUS_DETERMINE") + @ApiParam("连续判断的等级代码") + private String continuousDetermine; + + @Column(name = "CONTINUOUS_SECOND") + @ApiParam("连续秒数") + private Integer continuousSecond; + + @Column(name = "CONTINUOUS_COUNT") + @ApiParam("发生次数") + private Integer continuousCount; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java new file mode 100644 index 0000000..1c3567c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java @@ -0,0 +1,62 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/27 15:59 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TAKT_LEVEL_CONFIG", indexes = { + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("节拍故障等级配置表") +public class MesTaktAlarmLevelConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = -3550230985173772736L; + + @Column(name = "WORK_CETNER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "LEVEL_CODE") + @ApiParam("等级代码") + private String levelCode; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Column(name = "IS_STOP_LINE") + @ApiParam("是否停线") + private Integer isStopLine; + + @Column(name = "IS_TRIGGER_ANDON") + @ApiParam("是否触发安灯") + private Integer isTriggerAndon; + + @Column(name = "MIN_MULTIPLE") + @ApiParam("最小倍数") + private Double minMultiple; + + @Column(name = "MAX_MULTIPLE") + @ApiParam("最大倍数") + private Double maxMultiple; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java new file mode 100644 index 0000000..0d8d058 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/27 15:59 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TAKT_ALARM_RECORD", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "START_TIME") +}) +@Api("节拍故障报警记录") +public class MesTaktAlarmRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 3267756779912298635L; + + @Column(name = "WORK_CETNER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name = "TAKT_SECOND") + @ApiParam("节拍 秒数") + private Integer taktSecond; + + @Column(name = "IS_ABNORMAL") + @ApiParam("是否异常") + private Integer isAbnormal = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index d46f990..3134f85 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -9,6 +9,7 @@ import lombok.Data; import java.io.Serializable; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -126,7 +127,7 @@ public class StationRequestBean implements Serializable { private String queueGroupNo; @ApiParam("数据map") - private Map dataMap = new HashMap<>(); + private Map dataMap = new LinkedHashMap<>(); @ApiParam("流程状态集合") private List fsmStates; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TaktAlarmCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TaktAlarmCacheModel.java new file mode 100644 index 0000000..128c5a8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TaktAlarmCacheModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import com.google.common.cache.Cache; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/9/27 20:11 + * @desc + */ +@Data +public class TaktAlarmCacheModel { + + private List levelCode; + + private Cache cache; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmContinuousConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmContinuousConfigRepository.java new file mode 100644 index 0000000..d4601c9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmContinuousConfigRepository.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.MesTaktAlarmContinuousConfig; + +/** + * @Description :节拍连续异常配置表 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesTaktAlarmContinuousConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmLevelConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmLevelConfigRepository.java new file mode 100644 index 0000000..543e63d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmLevelConfigRepository.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.MesTaktAlarmLevelConfig; + +/** + * @Description :节拍故障等级配置表 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesTaktAlarmLevelConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmRecordRepository.java new file mode 100644 index 0000000..02ef4fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmRecordRepository.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.MesTaktAlarmRecord; + +/** + * @Description :节拍故障记录表 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesTaktAlarmRecordRepository extends BaseRepository { +} From 65ea61fd706dc15fbaaece8569f7963dde13f41a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 27 Sep 2020 20:50:23 +0800 Subject: [PATCH 154/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=86=E6=B3=B0?= =?UTF-8?q?=E5=85=B6=E5=AE=83=E5=87=BA=E5=BA=93=E4=B8=9A=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index fc8dbdb..b28e142 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -866,7 +866,8 @@ public class WmsEnumUtil { OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"), WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"), WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), - OTHER_IN(730, "OTHER_IN", "其它入库"); + OTHER_IN(730, "OTHER_IN", "其它入库"), + OTHER_OUT(740, "OTHER_OUT", "其它出库"); private int value; private String code; From 3d8842602de1cff1b12bdc98dd2c85e52b98f7e7 Mon Sep 17 00:00:00 2001 From: Liquor Date: Mon, 28 Sep 2020 09:52:21 +0800 Subject: [PATCH 155/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86SPC-KEY-TATA?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 62 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 28 ++++++++++ 2 files changed, 90 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 56a6580..f04adef 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,38 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * MES_SPC关键数据 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SPC_KEY_DATA_OBJECT_TYPE{ + POJO_OBJECT(10,"实体对象（单表）"), + DYNAMIC(20,"动态对象（生产数据表）"); + + private Integer objectType; + private String description; + SPC_KEY_DATA_OBJECT_TYPE(Integer objectType,String description ){ + this.objectType = objectType; + this.description = description; + } + + public Integer getObjectType() { + return objectType; + } + + public void setObjectType(Integer objectType) { + this.objectType = objectType; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_EXPRESSION { GT(">", ">", "大于"), @@ -111,6 +143,36 @@ public class MesEnumUtil { } /** + * 启用还是禁用 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_VALID{ + YES(1,"启用"), + NO(2,"禁用"); + private Integer isValid; + private String description; + + IS_VALID(int isValid,String description){ + this.isValid = isValid; + this.description = description; + } + public int getIsValid() { + return isValid; + } + + public void setIsValid(int isValid) { + this.isValid = isValid; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + } + /** * 排序方式 */ public enum ASC_OR_DESC { 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 f310d79..e465c73 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 @@ -870,6 +870,34 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData,String organizeCode){ + DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); + if (!StringUtils.isEmpty(keyData.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(keyData.getFieldCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getFieldCode(), "fieldCode", packBean); + } + if (keyData.getObjectType() != null && keyData.getObjectType() != 0) { + DdlPreparedPack.getNumEqualPack(keyData.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdCondition())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdCondition(), "kdCondition", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdName())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdName(), "kdName", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdCode(), "kdCode", packBean); + } + if (keyData.getSpecLsl() != null) { + DdlPreparedPack.getNumEqualPack(keyData.getSpecLsl(), "specLsl", packBean); + } + if (keyData.getSpecUsl() != null) { + DdlPreparedPack.getNumEqualPack(keyData.getSpecUsl(), "specUsl", packBean); + } + return packBean; + } /** * MES 物料关键数据关系信息查询条件封装 * From 2bd7650d4868b8c6510a25e9f0bb1b0bdfe96311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 28 Sep 2020 11:22:24 +0800 Subject: [PATCH 156/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3pojo=E4=B8=AD=E6=89=80=E6=9C=89Double=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/IfDefectData.java | 4 +++- .../i3plus/pojo/mes/bean/IfDismantleRecord.java | 4 +++- .../i3plus/pojo/mes/bean/IfPackageDetail.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java | 4 +++- .../i3plus/pojo/mes/bean/IfProductOffLine.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 4 +++- .../i3plus/pojo/mes/bean/IfQueueShipping.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/IfRawPartData.java | 4 +++- .../i3plus/pojo/mes/bean/MesBoardEquDetail.java | 7 ++++-- .../i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 4 +++- .../i3plus/pojo/mes/bean/MesBoardWorkCell.java | 6 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 4 +++- .../i3plus/pojo/mes/bean/MesCellFeedRecord.java | 4 +++- .../i3plus/pojo/mes/bean/MesCustomerPart.java | 4 +++- .../i3plus/pojo/mes/bean/MesDefectRecord.java | 4 +++- .../i3plus/pojo/mes/bean/MesDismantleRecord.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesLocation.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesMouldPart.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 25 +++++++++++++++------- .../i3plus/pojo/mes/bean/MesOffLineRecord.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java | 8 +++---- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 7 ++++-- .../i3plus/pojo/mes/bean/MesPackageTrans.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesPartSample.java | 4 +++- .../i3plus/pojo/mes/bean/MesPartScheduleBom.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 7 ++++-- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 2 +- .../i3plus/pojo/mes/bean/MesProdWorkCenter.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 +++- .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 4 +++- .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 7 ++++-- .../pojo/mes/bean/MesQcOrderApprovalStatus.java | 4 +++- .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueOrderBom.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 10 ++++++--- .../i3plus/pojo/mes/bean/MesQueueShipping.java | 4 +++- .../pojo/mes/bean/MesQueueShippingDetail.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 4 +++- .../i3plus/pojo/mes/bean/MesScatterPartCfgBom.java | 2 +- .../pojo/mes/bean/MesScatterPartProdCfg.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesShiftRest.java | 4 +++- .../pojo/mes/bean/MesSpcControlCoefficient.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java | 10 ++++++--- .../estsh/i3plus/pojo/mes/bean/MesStationBom.java | 5 +++-- .../i3plus/pojo/mes/bean/MesTorqueDetail.java | 10 ++++++--- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 4 +++- .../i3plus/pojo/mes/bean/MesWorkCellPoint.java | 7 ++++-- .../pojo/mes/bean/MesWorkCellPointGroup.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 25 +++++++++++++++------- .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 25 +++++++++++++++------- 63 files changed, 271 insertions(+), 110 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java index ae079bb..289babc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java @@ -6,6 +6,7 @@ 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; @@ -67,7 +68,8 @@ public class IfDefectData extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; 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 index 98d4fc0..991b3a1 100644 --- 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 @@ -5,6 +5,7 @@ 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; @@ -55,7 +56,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String sn; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("产品数量") private Double qty; 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 280de6b..bab82d3 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 @@ -5,6 +5,7 @@ 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; @@ -55,7 +56,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @ApiParam("包装批次") private String lotNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java index e26bbcd..005e0d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java @@ -5,6 +5,7 @@ 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; @@ -54,7 +55,8 @@ public class IfPartPull extends BaseBean implements Serializable { @ApiParam("子物料编码") private String itemPartNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("拉动数量") private Double qty; 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 index d1dcee7..001d4cd 100644 --- 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 @@ -5,6 +5,7 @@ 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; @@ -42,7 +43,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("包装条码") private String packageNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -66,7 +68,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index 74de05a..25c6e0e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -5,6 +5,7 @@ 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; @@ -38,7 +39,8 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0D; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index c9b462d..4693daa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -6,6 +6,7 @@ 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; @@ -55,7 +56,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -115,7 +117,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料物料用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java index bb50de6..561bd95 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java @@ -5,6 +5,7 @@ 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; @@ -46,7 +47,8 @@ public class IfRawPartData extends BaseBean implements Serializable { @ApiParam("原料条码") private String serialNumber; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 16462e9..6902d49 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -6,6 +6,7 @@ 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; @@ -44,11 +45,13 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; - @Column(name = "X_AXES") + @Column(name = "X_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "横坐标") private Double xAxes = 0d; - @Column(name = "Y_AXES") + @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "纵坐标") private Double yAxes = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 2df2ad6..80d3a4e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -5,6 +5,7 @@ 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; @@ -64,7 +65,8 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @ApiParam("时段产能") private Integer hourCapacity; - @Column(name = "STOP_TIME") + @Column(name = "STOP_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("停机时间") private Double stopTime; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java index 59d5305..1140335 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java @@ -47,11 +47,13 @@ public class MesBoardWorkCell extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "X_AXES") + @Column(name = "X_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("横坐标") private Double xAxes = 0d; - @Column(name = "Y_AXES") + @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("纵坐标") private Double yAxes = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index a5a8a52..96d5dce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -6,6 +6,7 @@ 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; @@ -60,7 +61,8 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料数量") private Double rawQty; 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 index aec9dcf..62e56c9 100644 --- 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 @@ -6,6 +6,7 @@ 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; @@ -59,7 +60,8 @@ public class MesCellFeedRecord extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index 92bcd86..71e21af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -6,6 +6,7 @@ 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; @@ -50,7 +51,8 @@ public class MesCustomerPart extends BaseBean implements Serializable { @ApiParam("客户物料颜色") private String customerPartColor; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 26ca667..54d14d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -5,6 +5,7 @@ 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; @@ -84,7 +85,8 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index 6a682d7..d57df5e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -5,6 +5,7 @@ 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; @@ -60,7 +61,8 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @ApiParam("生产工单号") private String workOrderNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("产品数量") private Double qty; 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 3bbe40e..06a48ba 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 @@ -6,6 +6,7 @@ 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; @@ -41,7 +42,8 @@ public class MesFiCfg extends BaseBean implements Serializable { @ApiParam("客户代码") private String custCode; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java index b17f81d..00839db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java @@ -5,6 +5,7 @@ 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; @@ -37,11 +38,13 @@ public class MesKeyData extends BaseBean implements Serializable { @ApiParam("关键数据名称") private String keyDataName; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据上限") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据下限") private Double lowerLimit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index 752cdd2..c7a6e6d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -5,6 +5,7 @@ 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; @@ -47,11 +48,13 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("关键数据数量") private Integer keyDataCount; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据上限") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据下限") private Double lowerLimit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java index 581368f..2ab848c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java @@ -6,6 +6,7 @@ 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; @@ -47,7 +48,8 @@ public class MesLocation extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java index 698ffde..0e42446 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -6,6 +6,7 @@ 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; @@ -39,7 +40,8 @@ public class MesMouldPart extends BaseBean implements Serializable { @ApiParam("模具代码") private String mouldCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 43454da..bd5d000 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -5,6 +5,7 @@ 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; @@ -68,11 +69,13 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("结束时段") private String endTime; - @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)") + @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("总生产时间") private Double totalRunTime; - @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)") + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("总停机时间") private Double totalStopTime; @@ -92,27 +95,33 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("实际节拍") private Integer actualTakt; - @Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("时间开动率") private Double timeRate; - @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("性能开动率") private Double taktRate; - @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("良品率") private Double qualifiedRate; - @Column(name = "OEE", columnDefinition = "decimal(18,4)") + @Column(name = "OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE") private Double oee; - @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)") + @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE目标值") private Double targetOee; - @Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)") + @Column(name = "MIN_OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE警戒值") private Double minOee; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java index bc7b401..5637728 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java @@ -5,6 +5,7 @@ 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; @@ -55,7 +56,8 @@ public class MesOffLineRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index dac14a4..37a9793 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java @@ -40,22 +40,22 @@ public class MesPackSpec extends BaseBean implements Serializable { @ApiParam("包装规格名称") private String specName; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量", example = "0") private Double qty = 0d; - @Column(name = "QTY2") + @Column(name = "QTY2", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量2", example = "0") private Double qty2; - @Column(name = "QTY3") + @Column(name = "QTY3", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量3", example = "0") private Double qty3; - @Column(name = "QTY4") + @Column(name = "QTY4", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量4", example = "0") private Double qty4; 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 4c1f98a..e1e09fd 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 @@ -6,6 +6,7 @@ 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; @@ -42,11 +43,13 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "PACK_SPEC_QTY") + @Column(name = "PACK_SPEC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("包装规格数量") private Double packSpecQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java index 230f503..77c9ed0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java @@ -6,6 +6,7 @@ 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; @@ -43,7 +44,8 @@ public class MesPackageTrans extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index f26050e..95ae538 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -6,6 +6,7 @@ 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; @@ -48,7 +49,8 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("零件规格") private String partSpec; - @Column(name = "PART_SPEC_QTY") + @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("标准包规数量") private Double partSpecQty; @@ -128,7 +130,8 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("是否小尺寸物料") private Integer isSmallSize = 1; - @Column(name = "QTY2") + @Column(name = "QTY2", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "包装数量") private Double qty2; 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 index 4b756ee..9ad4d4b 100644 --- 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 @@ -6,6 +6,7 @@ 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; @@ -37,7 +38,8 @@ public class MesPartSample extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index ac42795..7689354 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -5,6 +5,7 @@ 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; @@ -37,7 +38,8 @@ public class MesPartScheduleBom extends BaseBean implements Serializable { @ApiParam("关联物料号") private String itemPartNo; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index d5f6ed3..55bd48c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -6,6 +6,7 @@ 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; @@ -52,11 +53,13 @@ public class MesPlanOrder extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "PLAN_QTY") + @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划数量") private Double planQty; - @Column(name = "DECOMPOSE_QTY") + @Column(name = "DECOMPOSE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("分解数量") private Double decomposeQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 94ceddd..91b3ecd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -68,7 +68,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料条码") private String kpSn; - @Column(name = "KP_QTY") + @Column(name = "KP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "原材料数量", example = "0") private Double kpQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index ed640d7..b463839 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -6,6 +6,7 @@ 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; @@ -48,7 +49,8 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("料箱编号") private String rackNo; - @Column(name = "TARGET_PASS_RATE") + @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("目标合格率") private Double targetPassRate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index b9a1af3..4cd5e8a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -5,6 +5,7 @@ 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; @@ -52,7 +53,8 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 0f176b5..76c61d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -5,6 +5,7 @@ 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; @@ -53,7 +54,8 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index c6c488a..2a00ea2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -5,6 +5,7 @@ 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; @@ -104,11 +105,13 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("检测值配置编号") private String checkCfgNo; - @Column(name = "MAXIMUM") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大数") private Double maximum = 0d; - @Column(name = "MINIMUM") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小数") private Double minimum = 0d; 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 0ff6d06..ed50194 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 @@ -6,6 +6,7 @@ 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; @@ -49,11 +50,13 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; - @Column(name = "FINISH_QTY") + @Column(name = "FINISH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("已检数量") private Double finishQty = 0D; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0D; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java index c1774c7..2b8d481 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java @@ -6,6 +6,7 @@ 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; @@ -45,7 +46,8 @@ public class MesQcOrderApprovalStatus extends BaseBean implements Serializable { @ApiParam("工单号") private String workOrderNo; - @Column(name = "PLAN_QTY") + @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划数量") private Double planQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 6fefde1..fb90c4c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -6,6 +6,7 @@ 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; @@ -80,11 +81,13 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("已检数量") private Integer finishQty; - @Column(name = "MAXIMUM") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大数") private Double maximum = 0d; - @Column(name = "MINIMUM") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小数") private Double minimum = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 4a6ca87..8035a05 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -6,6 +6,7 @@ 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; @@ -48,7 +49,8 @@ public class MesQueueJis extends BaseBean implements Serializable { @ApiParam("车号") private String carNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 5ecb56c..dd46d65 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.*; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -50,7 +51,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("客户标识号") private String custFlagNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index cde084a..93f729c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.*; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,7 +53,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index b55af50..04d6155 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -5,6 +5,7 @@ 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; @@ -53,7 +54,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @ApiParam("选配码") private String vehicleCode; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index 5177ba9..f7eedab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -5,6 +5,7 @@ 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; @@ -51,7 +52,8 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @ApiParam("道口") private String dockNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 88771e3..5162f3d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -5,6 +5,7 @@ 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; @@ -52,7 +53,8 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("产品配置名称") private String prodCfgNameRdd; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index e1066b7..61ad875 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -5,6 +5,7 @@ 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; @@ -51,7 +52,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index dff8934..1a8a0d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -5,6 +5,7 @@ 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; @@ -48,11 +49,13 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细序号") private Double seq; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -112,7 +115,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("队列序号") private Double queueSeq; - @Column(name = "FINSIH_QTY") + @Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("已生产数量") private Double finsihQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java index bc23151..3337e50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java @@ -5,6 +5,7 @@ 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; @@ -51,7 +52,8 @@ public class MesQueueShipping extends BaseBean implements Serializable { @ApiParam("客户标识号") private String custFlagNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java index 6f0005e..575899c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -5,6 +5,7 @@ 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; @@ -67,11 +68,13 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable { @ApiParam("分组序号") private String groupSeq; - @Column(name = "qty") + @Column(name = "qty", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index ee3e3b5..dd7a8eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -6,6 +6,7 @@ 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; @@ -48,7 +49,8 @@ public class MesRawPartSn extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java index fd2e7c3..f1b5039 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java @@ -64,7 +64,7 @@ public class MesScatterPartCfgBom extends BaseBean implements Serializable { @ApiParam("零件标志值") private String partFlagValue; - @Column(name = "QTY", columnDefinition = "decimal(18,3)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "用量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index a95f2be..f562fd3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -5,6 +5,7 @@ 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; @@ -162,11 +163,13 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @ApiParam("是否截至顺序号") private Integer isEndSeq; - @Column(name = "MULTIMEDIA_PLUG_QTY") + @Column(name = "MULTIMEDIA_PLUG_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("多媒体插头数量") private Double multimediaPlusQty; - @Column(name = "QUALIFIED_COUNT") + @Column(name = "QUALIFIED_COUNT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("应收合格数") private Double qualifiedCount; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 8263d3e..6f4c169 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -5,6 +5,7 @@ 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; @@ -69,7 +70,8 @@ public class MesScrapRecord extends BaseBean implements Serializable { @ApiParam("工单编号") private String workOrderNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 3fd79bb..fe879fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -6,6 +6,7 @@ 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; @@ -51,7 +52,8 @@ public class MesShift extends BaseBean implements Serializable { @ApiParam("下班时间") private String endTime; - @Column(name = "WORK_TIMES") + @Column(name = "WORK_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("作业时长") private Double workTimes; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index ef567e2..ae77fe6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -6,6 +6,7 @@ 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; @@ -43,7 +44,8 @@ public class MesShiftRest extends BaseBean implements Serializable { @ApiParam("开始时间") private String startTime; - @Column(name = "REST_TIMES") + @Column(name = "REST_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("休息时长") private Double restTimes; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java index 4c896fc..a90ab6f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java @@ -5,6 +5,7 @@ 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; @@ -44,7 +45,8 @@ public class MesSpcControlCoefficient extends BaseBean implements Serializable { @ApiParam("系数描述") private String coefficientDesc; - @Column(name = "COEFFICIENT_VALUE") + @Column(name = "COEFFICIENT_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("系数值") private Double coefficientValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java index 774a869..f1c2cfd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java @@ -5,6 +5,7 @@ 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; @@ -36,15 +37,18 @@ public class MesSpcKeyData extends BaseBean implements Serializable { @ApiParam("关键数据名称") private String kdName; - @Column(name = "NOMINAL_VALUE") + @Column(name = "NOMINAL_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("公称值") private Double nominalValue; - @Column(name = "SPEC_USL") + @Column(name = "SPEC_USL", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("规格上限") private Double specUsl; - @Column(name = "SPEC_LSL") + @Column(name = "SPEC_LSL", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("规格下限") private Double specLsl; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 7cd1e59..e159d8e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -57,7 +57,7 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0") private Double qty; @@ -86,7 +86,8 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "绑定物料类型") private Integer bindPartType = 20; - @Column(name = "FEED_WARNING_QTY") + @Column(name = "FEED_WARNING_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "投料预警值") private Double feedWarningQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java index 56743f5..e303080 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java @@ -6,6 +6,7 @@ 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; @@ -35,15 +36,18 @@ public class MesTorqueDetail extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大值") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小值") private Double lowerLimit; - @Column(name = "TORQUE_DETAIL_VALUE") + @Column(name = "TORQUE_DETAIL_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("扭矩值") private Double torqueValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 571dd6c..0739b8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -7,6 +7,7 @@ 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; @@ -70,7 +71,8 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工位等级") private Integer grade; - @Column(name = "TARGET_PASS_RATE") + @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("目标合格率") private Double targetPassRate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 9ab0cb3..fb8ef53 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -7,6 +7,7 @@ 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; @@ -42,11 +43,13 @@ public class MesWorkCellPoint extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "QUEUE_SEQ") + @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列主表序号") private Double queueSeq; - @Column(name = "QUEUE_DETAIL_SEQ") + @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细表序号") private Double queueDetailSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index b539f74..4ca4471 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -5,6 +5,7 @@ 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; @@ -51,11 +52,13 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("主队列编号") private String orderNo; - @Column(name = "QUEUE_SEQ") + @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列主表序号") private Double queueSeq; - @Column(name = "QUEUE_DETAIL_SEQ") + @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细表序号") private Double queueDetailSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 0d056b6..7582002 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -6,6 +6,7 @@ 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; @@ -50,23 +51,28 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "COMPLETE_QTY") + @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("完成数量") private Double completeQty; - @Column(name = "REPAIR_QTY") + @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("返修数量") private Double repairQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("报废数量") private Double scrapQty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("工单序号") private Double seq; @@ -146,15 +152,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户订单号") private String custOrderNo; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; - @Column(name = "FI_COMPLETE_QTY") + @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检完成数量") private Double fiCompleteQty; - @Column(name = "FI_GENERATE_QTY") + @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检生成数量") private Double fiGenerateQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 6213888..18be551 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -5,6 +5,7 @@ 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; @@ -47,23 +48,28 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "COMPLETE_QTY") + @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("完成数量") private Double completeQty; - @Column(name = "REPAIR_QTY") + @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("返修数量") private Double repairQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("报废数量") private Double scrapQty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("工单序号") private Double seq; @@ -139,15 +145,18 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("客户订单号") private String custOrderNo; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; - @Column(name = "FI_COMPLETE_QTY") + @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检完成数量") private Double fiCompleteQty; - @Column(name = "FI_GENERATE_QTY") + @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检生成数量") private Double fiGenerateQty; From 72faca1092fbd5ca75d5e1ea8d97ce20917f4d80 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Mon, 28 Sep 2020 11:59:45 +0800 Subject: [PATCH 157/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 3bfe3b7..6913225 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -8,10 +8,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.*; import java.io.Serializable; /** @@ -26,7 +23,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_OPT_PARAM") +@Table(name = "MES_PROD_ROUTE_OPT_PARAM", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "PROCESS_CODE"), + @Index(columnList = "STEP_CODE") +}) @Api("产品流程配置操作参数表") public class MesProdRouteOptParam extends BaseBean implements Serializable { private static final long serialVersionUID = -5043197912658757665L; From 0d20685a5570e0a5ca68f4f2e06fee8b1a61deaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 28 Sep 2020 16:06:19 +0800 Subject: [PATCH 158/329] =?UTF-8?q?fix(softswitch):ftp=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=99=A8=E5=B9=B6=E5=8F=91=E8=AF=BB=E5=8F=96=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/softswitch/SuitServerModel.java | 1 + .../estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 3 +++ .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java | 15 +++++++++++++++ .../estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 1 + .../i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 9 +++++++++ 5 files changed, 29 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index e859e21..f80ec78 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -41,6 +41,7 @@ public class SuitServerModel implements Serializable { private String requestId; // 传输单对象 @XmlElement(name = "data") + @XStreamAlias("data") private Object obj; // 传输集合 private List list; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index 93a159f..bce2e0d 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -123,6 +123,9 @@ public class BsSuitCaseFTP extends BaseBean { @Transient @ApiParam(value = "临时适配路径") private String tempSuitFilePath; + @Transient + @ApiParam(value = "临时适配路径") + private List ftpFileList; @Transient @ApiParam(value = "适配文件列表") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index 7e2b460..9e98bc4 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -85,4 +85,19 @@ public class BsSuitFile extends BaseBean { @ApiParam(value = "处理时间") private String processTime; + public void setFtpPathInfo(String ftpPathInfo){ + if(ftpPathInfo == null){ + return; + } + + int pathIdx = ftpPathInfo.lastIndexOf("/"); + if (pathIdx == -1) { + this.setFolderPath("/"); + this.setFileName(ftpPathInfo); + }else{ + this.setFolderPath(ftpPathInfo.substring(0,pathIdx+1)); + this.setFileName(ftpPathInfo.substring(pathIdx + 1)); + } + } + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index d3af46c..f13d15b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -128,6 +128,7 @@ public class BsSuitRecord extends BaseBean { @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class) private Integer processState; @Column(name = "PROCESS_TIME") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index cfa357f..e163e9e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -430,4 +430,13 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean); return ddlPackBean; } + + public static DdlPackBean packHqlCheckSuitFile(BsSuitFile bsSuitFile){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitFile); + DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitFile.getFileName(),"fileName",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitFile.getFolderPath(),"folderPath",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(bsSuitFile.getId(),"id",ddlPackBean); + return ddlPackBean; + } } From 83bfaaceab95c29cd3430653eedb54f05f83bd1b Mon Sep 17 00:00:00 2001 From: Liquor Date: Mon, 28 Sep 2020 17:01:09 +0800 Subject: [PATCH 159/329] =?UTF-8?q?=E5=AF=B9SPC-KEY-TATA=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E8=BF=9B=E8=A1=8C=E4=BA=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 22 +++++++++++++++------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index f04adef..dbdd6a1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -20,19 +20,27 @@ public class MesEnumUtil { POJO_OBJECT(10,"实体对象（单表）"), DYNAMIC(20,"动态对象（生产数据表）"); - private Integer objectType; + private Integer value; private String description; - SPC_KEY_DATA_OBJECT_TYPE(Integer objectType,String description ){ - this.objectType = objectType; + SPC_KEY_DATA_OBJECT_TYPE(Integer value,String description ){ + this.value = value; this.description = description; } + public static String valueOfDesc(String val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + return values()[i].description; + } + } + return null; + } - public Integer getObjectType() { - return objectType; + public Integer getValue() { + return value; } - public void setObjectType(Integer objectType) { - this.objectType = objectType; + public void setValue(Integer value) { + this.value = value; } public String getDescription() { 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 e465c73..46ee53a 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 @@ -2327,6 +2327,25 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesSpcKeyData(MesSpcKeyData spcKeyData) { + DdlPackBean packBean = getAllBaseData(spcKeyData.getOrganizeCode()); + if (!StringUtils.isEmpty(spcKeyData.getIsValid())) { + DdlPreparedPack.getNumEqualPack(spcKeyData.getIsValid(), "isValid", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getKdCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getKdCode(), "kdCode", packBean); + } + if (spcKeyData.getObjectType() != null) { + DdlPreparedPack.getNumEqualPack(spcKeyData.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getFieldCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getFieldCode(), "fieldCode", packBean); + } + return packBean; + } /** * 监听任务查询条件封装 * From ebb965f46df2acc7d2fb4d1e9a3090f48b65d10a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 28 Sep 2020 17:36:50 +0800 Subject: [PATCH 160/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E6=B7=BB=E5=8A=A0=E7=9C=8B=E6=9D=BF=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 39 +++++++++++- .../i3plus/pojo/mes/bean/MesBoardCustomerData.java | 44 ++++++++++++++ .../i3plus/pojo/mes/bean/MesBoardSubmenu.java | 71 ++++++++++++++++++++++ .../repository/MesBoardCustomerDataRepository.java | 15 +++++ .../mes/repository/MesBoardSubMenuRepository.java | 15 +++++ 5 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index dbdd6a1..6f5ca2c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -5264,7 +5264,8 @@ public class MesEnumUtil { BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), - BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"); + BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), + BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", " 麦格纳产能看板"); private String code; private String description; @@ -7551,4 +7552,40 @@ public class MesEnumUtil { return tmp; } } + + /** + * mes 看板展示类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHOW_TYPE { + + PICTURE(10, "图片"), + VIDEO(20, "视频"); + + private int value; + private String description; + + SHOW_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java new file mode 100644 index 0000000..9509fc5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.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; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:47 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_CUSTOMER_DATA") +@Api("MES_看板客户相关信息") +public class MesBoardCustomerData extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3871945569470777555L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "COMPLAIN_PLAN_QTY") + @ApiParam("客户抱怨目标数量") + private Integer complainPlanQty; + + @Column(name = "COMPLAIN_ACTUAL_QTY") + @ApiParam("客户抱怨实际数量") + private Integer complainActualQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java new file mode 100644 index 0000000..052a1c3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:47 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SUBMENU") +@Api("MES_看板子菜单") +public class MesBoardSubmenu extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6544735793917822548L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "ITEM_NAME") + @ApiParam("子项名称") + private String itemName; + + @Column(name = "ICON") + @ApiParam("ICO图标") + private String icon; + + @Column(name = "SEQ") + @ApiParam("顺序号") + private Integer seq; + + /** + * 10-图片 20-视频 + */ + @Column(name = "SHOW_TYPE") + @ApiParam("展示类型") + private Integer showType; + + @Column(name = "PICTURE_URL") + @ApiParam("图片路径") + private String pictureUrl; + + @Column(name = "VIDEO_URL") + @ApiParam("视频路径") + private String videoUrl; + + /** + * 10-图片， 20-视频 + */ + @Transient + @ApiParam("文件类型") + private Integer fileTypeCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java new file mode 100644 index 0000000..41ee9e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardCustomerData; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardCustomerDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java new file mode 100644 index 0000000..c45b135 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardSubmenu; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardSubMenuRepository extends BaseRepository { +} From 461780e0d064ff5730ab4e2587848c3d5776cf8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 28 Sep 2020 17:40:43 +0800 Subject: [PATCH 161/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 6f5ca2c..714f433 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -5265,7 +5265,7 @@ public class MesEnumUtil { BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), - BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", " 麦格纳产能看板"); + BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"); private String code; private String description; From aa01153c4b83376b974ef75b4a7454ae09a55d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 28 Sep 2020 18:21:05 +0800 Subject: [PATCH 162/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E6=9B=B4=E6=96=B0=E7=9C=8B=E6=9D=BF=E5=AD=90=E8=8F=9C?= =?UTF-8?q?=E5=8D=95pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java index 052a1c3..55288d0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java @@ -61,11 +61,4 @@ public class MesBoardSubmenu extends BaseBean implements Serializable { @Column(name = "VIDEO_URL") @ApiParam("视频路径") private String videoUrl; - - /** - * 10-图片， 20-视频 - */ - @Transient - @ApiParam("文件类型") - private Integer fileTypeCode; } From 21f77a0e7b9b30247c96c66a8e9ef10f03da2fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 28 Sep 2020 18:55:19 +0800 Subject: [PATCH 163/329] =?UTF-8?q?fix(softswitch):ftp=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=99=A8=E5=B9=B6=E5=8F=91=E8=AF=BB=E5=8F=96=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java | 2 +- .../java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index 9e98bc4..7d4b198 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -95,7 +95,7 @@ public class BsSuitFile extends BaseBean { this.setFolderPath("/"); this.setFileName(ftpPathInfo); }else{ - this.setFolderPath(ftpPathInfo.substring(0,pathIdx+1)); + this.setFolderPath(ftpPathInfo.substring(0,pathIdx)); this.setFileName(ftpPathInfo.substring(pathIdx + 1)); } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index e163e9e..2d9e16d 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -387,6 +387,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitFile.getFolderPath(), "folderPath", ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitFile.getSuitDateTime(), "suitDateTime", ddlPackBean, false, true); ddlPackBean.setOrderByStr(bsSuitFile.orderBy()); From 815daba16d68be12c54ecd52f3c9d35f1477a07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 28 Sep 2020 18:56:05 +0800 Subject: [PATCH 164/329] =?UTF-8?q?feat(softswitch):ftp=E9=80=82=E9=85=8D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8C=89=E6=96=87=E4=BB=B6=E5=90=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/softswitch/SuitRecordModel.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java new file mode 100644 index 0000000..5367486 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-28 17:48 + * @Modify: + **/ +@Data +@ApiModel("适配记录模型") +public class SuitRecordModel { + + @ApiModelProperty("主记录") + private BsSuitRecord bsSuitRecord; + + @ApiModelProperty("适配文件") + private BsSuitFile bsSuitFile; + + public SuitRecordModel() { + } + + public SuitRecordModel(BsSuitRecord bsSuitRecord, BsSuitFile bsSuitFile) { + this.bsSuitRecord = bsSuitRecord; + this.bsSuitFile = bsSuitFile; + } +} From 037e898cd262fa06a286e155320b4ca667a22ba5 Mon Sep 17 00:00:00 2001 From: songss Date: Mon, 28 Sep 2020 19:38:24 +0800 Subject: [PATCH 165/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesControlPlan.java | 55 ++++++++++ .../i3plus/pojo/mes/bean/MesQualityStandard.java | 118 +++++++++++++++++++++ .../pojo/mes/model/MesDbCheckRecordModel.java | 11 +- .../pojo/mes/model/MesProductDataDefectModel.java | 9 ++ .../mes/repository/MesControlPlanRepository.java | 12 +++ .../repository/MesQualityStandardRepository.java | 12 +++ 6 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java new file mode 100644 index 0000000..4a3b70e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java @@ -0,0 +1,55 @@ +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控制计划-主表 + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTROL_PLAN") +@Api("中航控制计划主表") +public class MesControlPlan extends BaseBean implements Serializable { + //1. 主表字段：“产线”、“产品”、“客户”、“版本号”、“是否生效”、“状态（编辑中、待审核、已审核）”组成。（主表命名“控制计划”） + private static final long serialVersionUID = 1454433409471781390L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + +// @Column(name = "WORK_CELL_CODE") +// @ApiParam("工作单元代码") +// private String workCellCode; + + @Column(name = "product_name") + @ApiParam("产品名称") + private String productName; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "VERSION") + @ApiParam("版本号") + private String version; + + @Column(name = "EDIT_TYPE") + @ApiParam("编辑状态") + private Integer editType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java new file mode 100644 index 0000000..d8fbcef --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -0,0 +1,118 @@ +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; +import java.math.BigDecimal; + +/** + * @Description: MES质量标准-明细表（主表：控制计划MES_CONTROL_PLAN） + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUALITY_STANDARD") +@Api("中航质量标准明细表") +public class MesQualityStandard extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1454433409471781390L; + + @Column(name = "CONTROL_PLAN_ID") + @ApiParam("控制计划表主键ID") + private Long controlPlanId; + + @Column(name = "VERSION") + @ApiParam("版本") + private String version; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer CHECK_TYPE; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private String isConcession; + + @Column(name = "CHECK_INTERVAL") + @ApiParam("间隔时间") + private String checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @Column(name = "NUMBER_FLAG") + @ApiParam("个数标识") + private String numberFlag; + + @Column(name = "QTY") + @ApiParam("检测数量") + private Integer qty; + + //任务单类型,动态枚举 + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String CHECK_ORDER_TYPE; + + //数据来源：10=手工录入，20=PLC，30=DB + @Column(name = "DATA_SOURCE") + @ApiParam("数据来源") + private String DATA_SOURCE; + + //检验值类型：10=字符串，20=数值 + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("检验值类型") + private String CHECK_VALUE_TYPE; + + @Column(name = "DIFFERENCE_MAX_LIMIT") + @ApiParam("公差上限") + private BigDecimal differenceMaxLimit; + + @Column(name = "DIFFERENCE_MIN_LIMIT") + @ApiParam("公差下限") + private BigDecimal differenceMinLimit; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer IS_KEY_CHECK_ITEM; + + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String CHECK_CFG_NO; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java index 1fa374a..5d5f06c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -10,6 +10,9 @@ import lombok.Data; */ @Data public class MesDbCheckRecordModel { + @ApiParam("主键") + private Long id; + @ApiParam("过程条码") private String serialNumber; @@ -25,11 +28,15 @@ public class MesDbCheckRecordModel { @ApiParam("缺陷原因") private String defectDesc; - public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String defectType, String defectDesc) { + @ApiParam("生产记录表主键ID") + private Long productDataId; + + public MesDbCheckRecordModel(Long id, String serialNumber, String partNo, String partDesc, String defectDesc, Long productDataId) { + this.id = id; this.serialNumber = serialNumber; this.partNo = partNo; this.partDesc = partDesc; - this.defectType = defectType; this.defectDesc = defectDesc; + this.productDataId = productDataId; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java index fec884f..d825602 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java @@ -41,4 +41,13 @@ public class MesProductDataDefectModel { this.defectDesc = defectDesc; this.offlineTime = offlineTime; } + + public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String defectDesc, String offlineTime) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partDesc = partDesc; + this.productSn = productSn; + this.defectDesc = defectDesc; + this.offlineTime = offlineTime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java new file mode 100644 index 0000000..ab6c93c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesControlPlan; + +/** + * @Description: + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +public interface MesControlPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java new file mode 100644 index 0000000..0693f9c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQualityStandard; + +/** + * @Description: + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +public interface MesQualityStandardRepository extends BaseRepository { +} From 814d22fe09dd6f20563e3f6dd9ccc0ab317b615e Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 28 Sep 2020 21:03:33 +0800 Subject: [PATCH 166/329] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=AD=A6=20?= =?UTF-8?q?mes=E7=AB=AF=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/bean/MesTaktAlarmContinuousConfig.java | 8 +++++ .../i3plus/pojo/mes/bean/MesTaktAlarmRecord.java | 10 ++++-- .../estsh/i3plus/pojo/mes/model/AlarmMessage.java | 41 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java index 9e6a71c..9990170 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java @@ -47,4 +47,12 @@ public class MesTaktAlarmContinuousConfig extends BaseBean implements Serializab @ApiParam("发生次数") private Integer continuousCount; + @Column(name = "IS_STOP_LINE") + @ApiParam("是否停线") + private Integer isStopLine; + + @Column(name = "IS_TRIGGER_ANDON") + @ApiParam("是否触发安灯") + private Integer isTriggerAndon; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java index 0d8d058..b506e6a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java @@ -49,7 +49,11 @@ public class MesTaktAlarmRecord extends BaseBean implements Serializable { @ApiParam("节拍 秒数") private Integer taktSecond; - @Column(name = "IS_ABNORMAL") - @ApiParam("是否异常") - private Integer isAbnormal = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + @Column(name = "LEVEL_CODE") + @ApiParam("异常等级") + private String levelCode; + + @Column(name = "IS_PROCESSED") + @ApiParam("异常等级") + private Integer isProcessed = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java new file mode 100644 index 0000000..6c8428b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmRecord; +import lombok.Data; + +import java.util.concurrent.Delayed; +import java.util.concurrent.TimeUnit; + +/** + * @author Wynne.Lu + * @date 2020/9/28 13:26 + * @desc + */ +@Data +public class AlarmMessage implements Delayed { + + private MesTaktAlarmRecord taktAlarmRecord; + + private long time; + + public AlarmMessage(MesTaktAlarmRecord taktAlarmRecord, long time, TimeUnit unit) { + this.taktAlarmRecord = taktAlarmRecord; + this.time = System.currentTimeMillis() + (time > 0 ? unit.toMillis(time) : 0); + } + + @Override + public long getDelay(TimeUnit unit) { + return time - System.currentTimeMillis(); + } + + @Override + public int compareTo(Delayed o) { + AlarmMessage alarmMessage = (AlarmMessage) o; + long diff = this.time - alarmMessage.time; + if (diff <= 0) { + return -1; + } else { + return 1; + } + } +} From 5033c8dde0ac271f7827d5ce5f153ccb99b683b2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 29 Sep 2020 10:54:16 +0800 Subject: [PATCH 167/329] =?UTF-8?q?Fix=20bug#11661=20=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=E5=92=8C=E7=9B=AE=E6=A0=87=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 0a8b2f9..7e1103a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -57,7 +57,7 @@ public class WmsMessageStyleModel implements Serializable { } else if (actQty == transQty) {//处理完成 this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } else if (transQty < actQty) {//处理中 处理数量可以大于需求数量 - this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } } } From 79baaa4546f43be43b2929b4296ce936b498025a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 29 Sep 2020 13:13:06 +0800 Subject: [PATCH 168/329] =?UTF-8?q?Fix=20bug#11661=20=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=E5=92=8C=E7=9B=AE=E6=A0=87=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 7cd233a..bb34224 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -338,6 +338,14 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "过滤业务类型") private String filterBusiType; + @Transient + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } From 3d8d27d780db33248b845add2bef6f3eccaa8072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 29 Sep 2020 17:08:54 +0800 Subject: [PATCH 169/329] =?UTF-8?q?=E3=80=9011374=2020027-=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=BB=B4=E6=8A=A4=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=88=E9=99=84=E4=BB=B6=E6=98=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=A8=A1=E6=9D=BF=EF=BC=89-20200915=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 2 +- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 714f433..78e2d68 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7588,4 +7588,81 @@ public class MesEnumUtil { return tmp; } } + + /** + * mes 数据来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_DATA_SOURCE { + MANUAL_INPUT(10, "10", "人工输入"), + DB(30, "30", "数据库"), + PLC(20, "20", "PLC"); + + private int value; + private String description; + private String code; + + QC_CHECK_DATA_SOURCE(int value, String code, String description) { + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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; + } + } + + /** + * mes 检验值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_TYPE { + STRING(10, "字符串"), + INTEGER(20, "数值"); + + private int value; + private String description; + + QC_CHECK_VALUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 2a00ea2..c215d8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -98,7 +98,7 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { private String dataSource; @Column(name = "CHECK_VALUE_TYPE") - @ApiParam("任务单类型") + @ApiParam("检测值类型") private String checkValueType; @Column(name = "CHECK_CFG_NO") From 84d5f84457e78fd9946627966a4a2a4672d550c9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 30 Sep 2020 10:47:58 +0800 Subject: [PATCH 170/329] =?UTF-8?q?=E3=80=9011629=2020021--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E7=9C=8B=E6=9D=BF=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?--0930=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 +++ 1 file changed, 3 insertions(+) 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 82d05f2..f24ff0c 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 @@ -344,6 +344,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "子位置号") private String itemSeqNo; + @ApiParam(value = "最早需求时间") + private String firstTime; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } From 944b8538625b78e26f969444f23f6f7923006cb6 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 30 Sep 2020 13:35:20 +0800 Subject: [PATCH 171/329] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=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/WmsCSOrderDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index dcc76ee..68abad8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -112,7 +112,7 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; - @Column(name = "LOT_NO", nullable = false) + @Column(name = "LOT_NO") @ColumnDefault("") @ApiParam("收货批次") public String lotNo = ""; From 61ad20717b3935449a4817eaa1f6e12afc387631 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 17:05:51 +0800 Subject: [PATCH 172/329] =?UTF-8?q?=E5=90=88=E5=B9=B6sweb=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index f3e05c4..50d0007 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -348,4 +348,13 @@ public class WmsPart extends BaseBean { this.qty = cqty; this.createDatetime = createDateTime; } + + public WmsPart(String partNo, String partName, String inLocateNo, String stockUnit, Double snp, String partSpec) { + this.partNo = partNo; + this.partName = partName; + this.inLocateNo = inLocateNo; + this.stockUnit = stockUnit; + this.snp = snp; + this.partSpec = partSpec; + } } From 94568777fbda1e078d47a759d99727e30d52aeb9 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 17:43:57 +0800 Subject: [PATCH 173/329] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 1695d75ff21b8eec50fefe7764407c1edf67e7a7 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 17:51:14 +0800 Subject: [PATCH 174/329] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From c202fa073b82e09ca44eba8b7eb7e006e6ee9b56 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 17:54:46 +0800 Subject: [PATCH 175/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9sweb=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/bean/SwebVendorAlarm.java | 65 ++++++++++++++++++++++ .../sweb/repository/SwebVendorAlarmRepository.java | 9 +++ .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 43 ++++++++++---- 3 files changed, 105 insertions(+), 12 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java new file mode 100644 index 0000000..b8acd2d --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.sweb.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 : jason.niu + * @CreateDate : 2020-09-27 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_ALARM") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("供应商报警单") +public class SwebVendorAlarm extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "VENDOR_CODE") + @ApiParam("供应商代码") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "ALARM_CONTENT") + @ApiParam("报警内容") + private String alarmContent; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警级别") + private Integer alarmLevel; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + private String orderNo; + + @Column(name = "PART_SPEC") + @ApiParam("物料描述") + private String partSpec; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java new file mode 100644 index 0000000..cfb7325 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorAlarm; +import org.springframework.stereotype.Repository; + +@Repository +public interface SwebVendorAlarmRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index e81e51b..e18520b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -204,9 +204,13 @@ public class SwebHqlPack { return buildHql(details, result); } - public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity) { + public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List vendorCodes) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(capcity.getVendorCode(), "vendorCode", result); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result); if (!StringUtil.isEmpty(capcity.getDateStart())) { @@ -219,9 +223,13 @@ public class SwebHqlPack { return buildHql(capcity, result); } - public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm) { + public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List vendorCodes) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(alarm.getVendorCode(), "vendorCode", result); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); if (!StringUtil.isEmpty(alarm.getDateStart())) { DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); @@ -233,17 +241,28 @@ public class SwebHqlPack { return buildHql(alarm, result); } - public static DdlPackBean getSwebVendorStock(SwebVendorStock stock) { + public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List vendorCodes) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(stock.getVendorCode(), "vendorCode", result); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); -// if (!StringUtil.isEmpty(alarm.getDateStart())) { -// DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); -// } -// if (!StringUtil.isEmpty(alarm.getDateEnd())) { -// DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); -// } DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(stock, result); } + + public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List vendorCodes) { + DdlPackBean result = new DdlPackBean(); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } + DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(alarm, result); + } } From af4bb83f85bd78dc71bf7e6795d073f2b98a877c Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 18:08:21 +0800 Subject: [PATCH 176/329] =?UTF-8?q?sweb=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 5816f275bf237855f773b55634c624d5def2b332 Mon Sep 17 00:00:00 2001 From: songss Date: Wed, 30 Sep 2020 18:15:13 +0800 Subject: [PATCH 177/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 114 +++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesControlPlan.java | 31 +++-- .../i3plus/pojo/mes/bean/MesQualityStandard.java | 22 ++-- .../i3plus/pojo/mes/model/MesControlPlanModel.java | 46 +++++++ .../mes/model/MesControlPlanTemplateModel.java | 136 +++++++++++++++++++++ .../pojo/mes/model/MesQualityStandardModel.java | 83 +++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 ++++ 7 files changed, 433 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 714f433..f1f1075 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7588,4 +7588,118 @@ public class MesEnumUtil { return tmp; } } + + /** + * 过程检测检测对象数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_TYPE { + STRING(10, "字符串"), + INTEGER(20, "数值"); + + private int value; + private String description; + + QC_CHECK_VALUE_TYPE(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) + public enum QC_CHECK_DATA_SOURCE { + MANUAL_INPUT(10, "10", "人工输入"), + DB(30, "30", "数据库"), + PLC(20, "20", "PLC"); + + private int value; + private String description; + private String code; + + QC_CHECK_DATA_SOURCE(int value, String code, String description) { + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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) + public enum CONTROL_PLAN_AUDIT_TYPE { + WAIT_AUDIT(10, "待审核"), + AUDIT_PASS(20, "审核通过"), + AUDIT_NON_PASS(30, "审核驳回"); + + private int value; + private String description; + + CONTROL_PLAN_AUDIT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java index 4a3b70e..b016661 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java @@ -26,30 +26,39 @@ import java.io.Serializable; @Table(name = "MES_CONTROL_PLAN") @Api("中航控制计划主表") public class MesControlPlan extends BaseBean implements Serializable { - //1. 主表字段：“产线”、“产品”、“客户”、“版本号”、“是否生效”、“状态（编辑中、待审核、已审核）”组成。（主表命名“控制计划”） + private static final long serialVersionUID = 1454433409471781390L; @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 = "product_name") - @ApiParam("产品名称") - private String productName; + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; + @Column(name = "CUST_NAME") + @ApiParam("客户名称") + private String custName; + @Column(name = "VERSION") @ApiParam("版本号") - private String version; + private Integer version; + + @Column(name = "AUDIT_TYPE") + @ApiParam("审核状态") + private Integer auditType; + + @Column(name = "IS_ENABLE") + @ApiParam("是否启用") + private Integer isEnable; - @Column(name = "EDIT_TYPE") - @ApiParam("编辑状态") - private Integer editType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java index d8fbcef..1df34df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -34,18 +34,18 @@ public class MesQualityStandard extends BaseBean implements Serializable { @ApiParam("控制计划表主键ID") private Long controlPlanId; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + @Column(name = "VERSION") @ApiParam("版本") - private String version; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; + private Integer version; //检测类型：10=首检，20=巡检，30=终检，40=发运检 @Column(name = "CHECK_TYPE") @ApiParam("检测类型") - private Integer CHECK_TYPE; + private Integer checkType; @Column(name = "CHECK_ITEM_TYPE") @ApiParam("检测项类型") @@ -87,17 +87,17 @@ public class MesQualityStandard extends BaseBean implements Serializable { //任务单类型,动态枚举 @Column(name = "CHECK_ORDER_TYPE") @ApiParam("任务单类型") - private String CHECK_ORDER_TYPE; + private String checkOrderType; //数据来源：10=手工录入，20=PLC，30=DB @Column(name = "DATA_SOURCE") @ApiParam("数据来源") - private String DATA_SOURCE; + private String dataSource; //检验值类型：10=字符串，20=数值 @Column(name = "CHECK_VALUE_TYPE") @ApiParam("检验值类型") - private String CHECK_VALUE_TYPE; + private String checkValueType; @Column(name = "DIFFERENCE_MAX_LIMIT") @ApiParam("公差上限") @@ -109,10 +109,10 @@ public class MesQualityStandard extends BaseBean implements Serializable { @Column(name = "IS_KEY_CHECK_ITEM") @ApiParam("是否关键检测项") - private Integer IS_KEY_CHECK_ITEM; + private Integer isKeyCheckItem; @Column(name = "CHECK_CFG_NO") @ApiParam("检测值配置编号") - private String CHECK_CFG_NO; + private String checkCfgNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java new file mode 100644 index 0000000..4dab68a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +public class MesControlPlanModel { + + @ApiParam("控制计划主键ID") + private Long id; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户名称") + private String custName; + + @ApiParam("版本号") + private Integer version; + + @ApiParam("审核状态") + private Integer auditType; + + @ApiParam("是否启用") + private Integer isEnable; + + @ApiParam("质量标准数组") + private List standardList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java new file mode 100644 index 0000000..df5b532 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java @@ -0,0 +1,136 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Description: 控制计划导入模板 + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +@Api(value="控制计划导入模板",description = "控制计划导入模板") +public class MesControlPlanTemplateModel extends BaseBean { + + private static final long serialVersionUID = 6846982556729401884L; + + @ApiParam("工作中心代码") + @AnnoOutputColumn + private String workCenterCode; + + @ApiParam("物料编码") + @AnnoOutputColumn + private String partNo; + + @ApiParam("物料名称") + @AnnoOutputColumn + private String partName; + + @ApiParam("客户代码") + @AnnoOutputColumn + private String custCode; + + @ApiParam("客户名称") + @AnnoOutputColumn + private String custName; + + @ApiParam("控制计划版本号") + @AnnoOutputColumn + private Integer controlPlanVersion; + + @ApiParam("是否启用") + @AnnoOutputColumn + private Integer isEnable; + +// @Column(name = "IS_ENABLE") +// @ApiParam("是否启用") +// private Integer isEnable; + + @ApiParam("工作单元代码") + @AnnoOutputColumn + private String workCellCode; + + @ApiParam("质量标准版本") + @AnnoOutputColumn + private Integer qualityStandardVersion; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @ApiParam("检测类型") + @AnnoOutputColumn + private Integer checkType; + + @ApiParam("检测项类型") + @AnnoOutputColumn + private String checkItemType; + + @ApiParam("检测项") + @AnnoOutputColumn + private String checkItem; + + @ApiParam("检测标准") + @AnnoOutputColumn + private String checkStandard; + + @ApiParam("检测指导") + @AnnoOutputColumn + private String checkGuide; + + @ApiParam("频率") + @AnnoOutputColumn + private String checkFrequency; + + @ApiParam("是否允许让步") + @AnnoOutputColumn + private String isConcession; + + @ApiParam("间隔时间") + @AnnoOutputColumn + private String checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @ApiParam("个数标识") + @AnnoOutputColumn + private String numberFlag; + + @ApiParam("检测数量") + @AnnoOutputColumn + private Integer qty; + + //任务单类型,动态枚举 + @ApiParam("任务单类型") + @AnnoOutputColumn + private String checkOrderType; + + //数据来源：10=手工录入，20=PLC，30=DB + @ApiParam("数据来源") + @AnnoOutputColumn + private String dataSource; + + //检验值类型：10=字符串，20=数值 + @ApiParam("检验值类型") + @AnnoOutputColumn + private String checkValueType; + + @ApiParam("公差上限") + @AnnoOutputColumn + private BigDecimal differenceMaxLimit; + + @ApiParam("公差下限") + @AnnoOutputColumn + private BigDecimal differenceMinLimit; + + @ApiParam("是否关键检测项") + @AnnoOutputColumn + private Integer isKeyCheckItem; + + @ApiParam("检测值配置编号") + @AnnoOutputColumn + private String checkCfgNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java new file mode 100644 index 0000000..dce1aa2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Description: + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +public class MesQualityStandardModel { + + @ApiParam("质量标准主键ID") + private Long id; + + @ApiParam("控制计划表主键ID") + private Long controlPlanId; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("版本") + private Integer version; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项类型") + private String checkItemType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("是否允许让步") + private String isConcession; + + @ApiParam("间隔时间") + private String checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @ApiParam("个数标识") + private String numberFlag; + + @ApiParam("检测数量") + private Integer qty; + + //任务单类型,动态枚举 + @ApiParam("任务单类型") + private String checkOrderType; + + //数据来源：10=手工录入，20=PLC，30=DB + @ApiParam("数据来源") + private String dataSource; + + //检验值类型：10=字符串，20=数值 + @ApiParam("检验值类型") + private String checkValueType; + + @ApiParam("公差上限") + private BigDecimal differenceMaxLimit; + + @ApiParam("公差下限") + private BigDecimal differenceMinLimit; + + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @ApiParam("检测值配置编号") + private String checkCfgNo; +} 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 46ee53a..da89988 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 @@ -3389,4 +3389,27 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean); return packBean; } + + public static DdlPackBean getControlPlan(MesControlPlan controlPlan) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(controlPlan.getOrganizeCode(), controlPlan.getIsValid()); + if (!StringUtils.isEmpty(controlPlan.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCenterCode(), "workCenterCode", packBean); + } +// if (!StringUtils.isEmpty(controlPlan.getWorkCellCode())) { +// DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCellCode(), "workCellCode", packBean); +// } + if (!StringUtils.isEmpty(controlPlan.getPartNo())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getCustCode())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getCustCode(), "custCode", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getVersion())) { + DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getVersion(), "version", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getAuditType())) { + DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getAuditType(), "auditType", packBean); + } + return packBean; + } } From a5b81cb6767410c204954a62cb1617748d2beba5 Mon Sep 17 00:00:00 2001 From: songss Date: Wed, 30 Sep 2020 18:18:47 +0800 Subject: [PATCH 178/329] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ---------------------- 1 file changed, 77 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 6c69d58..7b07732 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7667,83 +7667,6 @@ public class MesEnumUtil { } /** - * 过程检测检测对象数据类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QC_CHECK_VALUE_TYPE { - STRING(10, "字符串"), - INTEGER(20, "数值"); - - private int value; - private String description; - - QC_CHECK_VALUE_TYPE(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) - public enum QC_CHECK_DATA_SOURCE { - MANUAL_INPUT(10, "10", "人工输入"), - DB(30, "30", "数据库"), - PLC(20, "20", "PLC"); - - private int value; - private String description; - private String code; - - QC_CHECK_DATA_SOURCE(int value, String code, String description) { - this.value = value; - this.description = description; - this.code = code; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - 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) From 5a0178f5dff338c4cccd51edaea2cc525f44c719 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 30 Sep 2020 18:26:38 +0800 Subject: [PATCH 179/329] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 90d94f35c8a6b12995a0a3ac5caacf102e27ee19 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 5 Oct 2020 22:07:28 +0800 Subject: [PATCH 180/329] =?UTF-8?q?Fix=20bug#11683=20=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E5=8D=95-=E5=B7=B2=E6=94=B6=E8=B4=A7=E6=95=B0=E9=87=8F-?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index e26eba3..8fe824f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -126,6 +126,10 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "零件名称") public String partNameRdd; + @Transient + @ApiParam(value = "收货数量") + public Double qty; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -152,4 +156,16 @@ public class WmsQCMaster extends BaseBean { this.partNameRdd = partNameRdd; this.createDatetime = createDatetime; } + + public WmsQCMaster(String orderNo, Double qty, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + this.orderNo = orderNo; + this.qty = qty; + this.vendorNo = vendorNo; + this.VendorDesc = VendorDesc; + this.refType = refType; + this.refSrc = refSrc; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.createDatetime = createDatetime; + } } From 3d5729e28b4500fe12d85842734bbea5d2471c28 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 6 Oct 2020 20:41:17 +0800 Subject: [PATCH 181/329] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=98=9F=E5=88=97=E5=A2=9E=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index 9aac6f4..69724ce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -52,4 +52,8 @@ public class WmsPrintingQueue extends BaseBean{ @Column(name="PRINT_STATUS") @ApiParam("打印状态") private Integer printStatus; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编码") + private String vendorNo; } \ No newline at end of file From a3100a71e55b174ba99cf432128735dd0998d7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 9 Oct 2020 15:14:06 +0800 Subject: [PATCH 182/329] =?UTF-8?q?=E3=80=909666=2019073-=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E6=8A=A5=E8=A1=A8=EF=BC=9A=E5=B7=A5=E4=BD=8D=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E8=A1=A8-=E5=88=A0=E9=99=A4=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E3=80=81=E8=AE=BE=E5=A4=87=E3=80=82=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=97=B6=E9=95=BF-20200721=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 20826ec..aad4948 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -290,6 +290,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { @ApiParam(value ="响应时长-分钟") private Integer downtime; + @Transient + @ApiParam(value ="故障时长-分钟") + private Integer brokenTime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; @@ -313,7 +317,9 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { * @param alarmCode * @param andonCount */ - public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellCode,String workCellNameRdd, String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, String alarmCode, Long andonCount) { + public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellCode,String workCellNameRdd, + String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, + String alarmCode, Long andonCount,String callTime,String resetTime) { this.workCenterCode = workCenterCode; this.workCenterNameRdd = workCenterNameRdd; this.workCellNameRdd = workCellNameRdd; @@ -324,6 +330,8 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { this.shiftNameRdd = shiftNameRdd; this.alarmCode = alarmCode; this.andonCount = andonCount; + this.callTime = callTime; + this.resetTime = resetTime; } /** From c117515b6931c0f5d4b33aca5abdb9dfffa72b78 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 9 Oct 2020 17:06:03 +0800 Subject: [PATCH 183/329] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 120 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java | 43 ++++++++ .../i3plus/pojo/mes/bean/MesLineOperation.java | 67 ++++++++++++ .../mes/bean/MesTaktAlarmContinuousConfig.java | 12 ++- .../pojo/mes/bean/MesTaktAlarmLevelConfig.java | 14 ++- .../i3plus/pojo/mes/bean/MesTaktAlarmRecord.java | 4 +- .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 4 + .../pojo/mes/bean/MesWorkCenterMonitorLog.java | 63 +++++++++++ .../estsh/i3plus/pojo/mes/model/AlarmMessage.java | 12 ++- .../i3plus/pojo/mes/model/EquAutoAlarmModel.java | 34 ++++++ .../mes/repository/MesLineOperationRepository.java | 16 +++ .../MesWorkCenterMonitorLogRepository.java | 13 +++ 12 files changed, 396 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquAutoAlarmModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineOperationRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterMonitorLogRepository.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 b8719b6..4fb7ac3 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 @@ -5598,4 +5598,124 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 设备自动报警 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EQU_AUTO_ALARM_TYPE { + + NORMAL(10, "正常"), + RUNNING(20, "正在运行"), + ERROR(30, "发生异常"); + + private String description; + private Integer value; + + EQU_AUTO_ALARM_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + + /** + * 过程检测数据源类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LINE_OPERATION_TYPE { + DB(10, "数据库"), + PLC(20, "PLC"); + + private int value; + private String description; + + LINE_OPERATION_TYPE(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) + public enum WORK_CENTER_MONITOR_BUSI_TYPE { + EQU_ALARM(10, "设备自动报警"); + + private int value; + private String description; + + WORK_CENTER_MONITOR_BUSI_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java new file mode 100644 index 0000000..67387e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquAlarmLog.java @@ -0,0 +1,43 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/16 2:42 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_ALARM_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("设备自动报警日志") +public class MesEquAlarmLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -494552645021304934L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "MESSAGE") + @ApiParam("异常信息") + private String message; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java new file mode 100644 index 0000000..7610ada --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineOperation.java @@ -0,0 +1,67 @@ +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 + * @date 2020/9/29 17:25 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LINE_OPERATION") +@Api(value = "产线 开线或停线") +public class MesLineOperation extends BaseBean implements Serializable { + private static final long serialVersionUID = -710375930652577157L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "OBJECT_TYPE") + @ApiParam("对象类型") + private Integer objectType; + + /** + * MesDataSource dsCode 或者plcCode + */ + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OP_TYPE") + @ApiParam("操作类型 开线、停线") + private Integer opType; + + /** + * 仅db jdbc 进行行更新 example:update a set b=:b + */ + @Column(name = "DB_OP_CMD") + @ApiParam("db操作指令") + private String dbOpCmd; + + /** + * 反写plc的值 + */ + @Column(name = "PLC_OP_VALUE") + @ApiParam("plc更新值") + private String plcOpValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java index 9990170..3d405cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java @@ -24,14 +24,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_TAKT_LEVEL_CONFIG", indexes = { +@Table(name = "MES_TAKT_ALARM_CONTINUOUS_CONFIG", indexes = { @Index(columnList = "WORK_CENTER_CODE") }) @Api("节拍故障等级配置表") public class MesTaktAlarmContinuousConfig extends BaseBean implements Serializable { private static final long serialVersionUID = -1046263075313178823L; - @Column(name = "WORK_CETNER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; @@ -55,4 +55,12 @@ public class MesTaktAlarmContinuousConfig extends BaseBean implements Serializab @ApiParam("是否触发安灯") private Integer isTriggerAndon; + @Column(name = "OBJECT_TYPE") + @ApiParam("对象类型") + private Integer objectType; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java index 1c3567c..60c3f9f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java @@ -31,7 +31,7 @@ import java.io.Serializable; public class MesTaktAlarmLevelConfig extends BaseBean implements Serializable { private static final long serialVersionUID = -3550230985173772736L; - @Column(name = "WORK_CETNER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; @@ -51,6 +51,10 @@ public class MesTaktAlarmLevelConfig extends BaseBean implements Serializable { @ApiParam("是否触发安灯") private Integer isTriggerAndon; + @Column(name = "ANDON_API_TYPE") + @ApiParam("安灯接口类型") + private Integer andonApiType; + @Column(name = "MIN_MULTIPLE") @ApiParam("最小倍数") private Double minMultiple; @@ -59,4 +63,12 @@ public class MesTaktAlarmLevelConfig extends BaseBean implements Serializable { @ApiParam("最大倍数") private Double maxMultiple; + @Column(name = "OBJECT_TYPE") + @ApiParam("对象类型") + private Integer objectType; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java index b506e6a..3da16b9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java @@ -33,7 +33,7 @@ import java.io.Serializable; public class MesTaktAlarmRecord extends BaseBean implements Serializable { private static final long serialVersionUID = 3267756779912298635L; - @Column(name = "WORK_CETNER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; @@ -54,6 +54,6 @@ public class MesTaktAlarmRecord extends BaseBean implements Serializable { private String levelCode; @Column(name = "IS_PROCESSED") - @ApiParam("异常等级") + @ApiParam("是否完成") private Integer isProcessed = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index f961799..bebe2dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -79,6 +79,10 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("序号") private Integer seq; + @Column(name = "IS_EQU_MONITOR") + @ApiParam("是否需要设备自动报警") + private Integer isEquMonitor; + @Transient @ApiParam(value = "子集列表") private List childTreeList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java new file mode 100644 index 0000000..38e8073 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenterMonitorLog.java @@ -0,0 +1,63 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/16 2:42 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CENTER_MONITOR_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("工位监控异常信息") +public class MesWorkCenterMonitorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = 1432794181428753903L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单") + private String workOrderNo; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序") + private String processCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程") + private String routeCode; + + @Column(name = "MESSAGE") + @ApiParam("异常信息") + private String message; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + private Integer busiType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java index 6c8428b..7c8b17f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AlarmMessage.java @@ -1,8 +1,11 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmContinuousConfig; +import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmLevelConfig; import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmRecord; import lombok.Data; +import java.util.List; import java.util.concurrent.Delayed; import java.util.concurrent.TimeUnit; @@ -16,10 +19,17 @@ public class AlarmMessage implements Delayed { private MesTaktAlarmRecord taktAlarmRecord; + private List levelConfigs; + + private List continuousConfigs; + private long time; - public AlarmMessage(MesTaktAlarmRecord taktAlarmRecord, long time, TimeUnit unit) { + public AlarmMessage(MesTaktAlarmRecord taktAlarmRecord, List levelConfigs, + List continuousConfigs, long time, TimeUnit unit) { this.taktAlarmRecord = taktAlarmRecord; + this.levelConfigs = levelConfigs; + this.continuousConfigs = continuousConfigs; this.time = System.currentTimeMillis() + (time > 0 ? unit.toMillis(time) : 0); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquAutoAlarmModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquAutoAlarmModel.java new file mode 100644 index 0000000..f25fce6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquAutoAlarmModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/29 11:42 + * @desc + */ +@Data +public class EquAutoAlarmModel implements Serializable { + private static final long serialVersionUID = -8671950864141698966L; + + private String org; + + private String workCenterCode; + + private Integer takt; + + private String plcTagAddr; + + private String levelCode; + + private String startTime; + + private String endTime; + + private Integer isFinished = MesPcnEnumUtil.EQU_AUTO_ALARM_TYPE.NORMAL.getValue(); + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineOperationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineOperationRepository.java new file mode 100644 index 0000000..717784b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineOperationRepository.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.MesLineOperation; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesLineOperationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterMonitorLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterMonitorLogRepository.java new file mode 100644 index 0000000..5b6dad7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterMonitorLogRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenterMonitorLog; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesWorkCenterMonitorLogRepository extends BaseRepository { +} From 6f3f06a8f6bc2c7b8feddc16b579bd1b6f98cfde Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 10 Oct 2020 14:40:43 +0800 Subject: [PATCH 184/329] =?UTF-8?q?19048-=E6=9D=A1=E7=A0=81=E8=A1=A5?= =?UTF-8?q?=E6=89=93-=E8=A1=A5=E6=89=93=E5=8C=85=E8=A3=85=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=8F=AF=E4=BB=A5=E7=94=A8=E8=BF=87=E7=A8=8B=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=8F=8D=E6=9F=A5=E5=8C=85=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?-20201012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ 1 file changed, 4 insertions(+) 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 e1e09fd..34c8f2b 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 @@ -163,6 +163,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("托包规数量") private Double qty2; + @Transient + @ApiParam("过程条码") + private String serialNumber; + public MesPackage() { } From 33c59cf39e75da6ac447cce5aca3db70eca6f929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 10 Oct 2020 14:59:08 +0800 Subject: [PATCH 185/329] =?UTF-8?q?=E3=80=9011654=20MES=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=200928?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 7b07732..f739ff4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2055,7 +2055,10 @@ public class MesEnumUtil { MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), MES_LOCATION(570, "locationExcelService", "库位信息导入"), MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"), - MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"); + MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"), + MES_MODEL_GRADE(600, "modelGradeExcelService", "车型等级导入"), + MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"), + MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"); private int value; private String service; From 1dbb826235ac70e0da7c4f81351c8e38cacce91b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 10 Oct 2020 15:58:38 +0800 Subject: [PATCH 186/329] =?UTF-8?q?19048-=E5=96=B7=E6=B6=82=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E5=8F=91=E5=90=8E=E6=9C=AA=E7=BB=99=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=8A=B6=E6=80=81=E8=B5=8B=E5=80=BC-20201012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 33 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 33 ++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index f739ff4..ffb33ec 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3687,6 +3687,39 @@ public class MesEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PRINT_STATUS { + + UNPRINTED(10, "未打印"), + PRINTED(20, "已打印"); + + private int value; + private String description; + + WORK_ORDER_PRINT_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; + } + } + /** * MesProduceSn实体对应的printStatus值 条码表条码打印状态 */ 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 4fb7ac3..8e8a55f 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 @@ -2585,6 +2585,39 @@ public class MesPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PRINT_STATUS { + + UNPRINTED(10, "未打印"), + PRINTED(20, "已打印"); + + private int value; + private String description; + + WORK_ORDER_PRINT_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) public enum PACKAGE_PRINT_STATUS { UNPRINTED(10, "未打印"), From e97369585da1c6956b8a031f10a47feed456d8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 10 Oct 2020 17:10:16 +0800 Subject: [PATCH 187/329] =?UTF-8?q?fix(core):=E5=9C=A8=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E6=97=B6=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java index 0a4d24b..8420e4b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java @@ -106,6 +106,7 @@ public class BaseThreadLocal { public static final String INIT_INFO = "INIT_INFO"; //初始化数据 public static final String EMP_NAME = "USER_NAME"; //用户名 public static final String ORGANIZE_CODE = "ORGANIZE_CODE"; //组织代码 + public static final String LANGUAGE_CODE = "LANGUAGE_CODE"; //语言代码 public static boolean isInit(){ Object data = getData(INIT_INFO); @@ -117,9 +118,10 @@ public class BaseThreadLocal { } //初始化用户数据 - public static void initSessionUserThreadLocal(String empName, String organizeCode){ + public static void initSessionUserThreadLocal(String empName, String organizeCode,String languageCode){ setData(BaseThreadLocal.EMP_NAME, empName); setData(BaseThreadLocal.ORGANIZE_CODE, organizeCode); + setData(BaseThreadLocal.LANGUAGE_CODE, languageCode); setData(BaseThreadLocal.INIT_INFO, true); } @@ -139,4 +141,12 @@ public class BaseThreadLocal { } return organizeCode; } + //获取线程中的语言代码 + public static String getThreadLanguageCode(){ + String organizeCode = getDataStr(LANGUAGE_CODE); + if(organizeCode == null){ + organizeCode = "CN/zh"; + } + return organizeCode; + } } From c7e5524a0a794637c56343703f62d84c85da0b9e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 11 Oct 2020 14:34:10 +0800 Subject: [PATCH 188/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E4=BA=A7=E6=89=A3=E5=87=8F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E6=9D=A1=E7=A0=81=E7=8A=B6=E6=80=81=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E4=B8=BA=E5=85=A5=E5=BA=93=EF=BC=8C=E5=90=88=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index bb34224..d6123bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -117,6 +117,14 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("司机") public String driverNo; + @Column(name = "TMS_CAR_NO") + @ApiParam(value = "TMS车牌号") + private String tmsCarNo; + + @Column(name = "TMS_DRIVER_NO") + @ApiParam("TMS司机") + public String tmsDriverNo; + @Column(name = "CUST_ORDER_NO") @ApiParam(value = "客户单号") private String custOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 733c9d0..5c7fdeb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -77,6 +77,14 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("司机") public String driverNo; + @Column(name = "TMS_CAR_NO") + @ApiParam(value = "TMS车牌号") + private String tmsCarNo; + + @Column(name = "TMS_DRIVER_NO") + @ApiParam("TMS司机") + public String tmsDriverNo; + @Column(name="ITEM") @ApiParam(value = "行号") public String item; From f52f07fe77775a9bfb4d6798bd39a2f1dc5fd4c8 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 11 Oct 2020 16:51:27 +0800 Subject: [PATCH 189/329] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 97 ++++++++++++++++++++-- .../i3plus/pojo/mes/bean/IfProductOffLine.java | 7 +- .../model/excel/mgnbj/SparePartsImportModel.java | 61 ++++++++++++++ .../mes/model/excel/mgnbj/SparePartsJspModel.java | 23 +++++ .../pojo/mes/model/mgnbj/MgnBjJitPlanModel.java | 6 +- .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 6 ++ 6 files changed, 188 insertions(+), 12 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 7b07732..520d956 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -16,16 +16,18 @@ public class MesEnumUtil { * MES_SPC关键数据 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SPC_KEY_DATA_OBJECT_TYPE{ - POJO_OBJECT(10,"实体对象（单表）"), - DYNAMIC(20,"动态对象（生产数据表）"); + public enum SPC_KEY_DATA_OBJECT_TYPE { + POJO_OBJECT(10, "实体对象（单表）"), + DYNAMIC(20, "动态对象（生产数据表）"); private Integer value; private String description; - SPC_KEY_DATA_OBJECT_TYPE(Integer value,String description ){ + + SPC_KEY_DATA_OBJECT_TYPE(Integer value, String description) { this.value = value; this.description = description; } + public static String valueOfDesc(String val) { for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -154,16 +156,17 @@ public class MesEnumUtil { * 启用还是禁用 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum IS_VALID{ - YES(1,"启用"), - NO(2,"禁用"); + public enum IS_VALID { + YES(1, "启用"), + NO(2, "禁用"); private Integer isValid; private String description; - IS_VALID(int isValid,String description){ + IS_VALID(int isValid, String description) { this.isValid = isValid; this.description = description; } + public int getIsValid() { return isValid; } @@ -180,6 +183,7 @@ public class MesEnumUtil { this.description = description; } } + /** * 排序方式 */ @@ -2055,7 +2059,8 @@ public class MesEnumUtil { MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), MES_LOCATION(570, "locationExcelService", "库位信息导入"), MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"), - MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"); + MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"), + MES_SPARE_PARTS(600, "sparePartsExcelService", "备件计划导入"); private int value; private String service; @@ -7702,4 +7707,78 @@ public class MesEnumUtil { } } + /** + * edi解析方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EDI_PARSE_TYPE { + JOB(10, "定时任务解析文件"), + SPARE_PARTS(20, "备件excel上传"); + + private int value; + private String description; + + EDI_PARSE_TYPE(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; + } + } + + /** + * edi解析方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EDI_REPORT_TYPE { + JSP(1, "jsp解析"), + JSA(2, "jsa解析"); + + private int value; + private String description; + + EDI_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 001d4cd..ba85092 100644 --- 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,7 +29,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PRODUCT_OFF_LINE") @Api("生产报工表") -public class IfProductOffLine extends BaseBean implements Serializable { +public class IfProductOffLine extends BaseBean implements Serializable { private static final long serialVersionUID = -4960147948435537306L; @Column(name = "PART_NO") @@ -148,4 +149,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; + + @Column(name = "BASE_MODULE") + @ApiParam("BaseModule零件号") + private String baseModule; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java new file mode 100644 index 0000000..d649fd4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.model.excel.mgnbj; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/10 13:15 + * @desc + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Api("备件计划导入model") +public class SparePartsImportModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("用户名") + private String userName; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("客户工厂代码") + private String custPlantCode; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("JIT顺序号") + private String jitSeq; + + @ApiParam("供应商代码") + private String supplierCode; + + @ApiParam("客户零件号") + private String custPartNo; + + @ApiParam("用量") + private Double qty; + + @ApiParam("单元格编号") + private Map cellNoMap = new HashMap<>(); + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java new file mode 100644 index 0000000..71dc11c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model.excel.mgnbj; + +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/10/11 15:31 + * @desc + */ +@Data +public class SparePartsJspModel { + + private MesQueueJitPlan queueJitPlan; + + private List jitPlanBomList; + + private List jitPlanDetailList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java index a493487..d9dd5d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.mes.model.mgnbj; -import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java index b091b3a..55efd0e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * @author Wynne.Lu @@ -55,4 +57,8 @@ public class Part implements Serializable { @ApiParam("Mes物料号") private String partNo; + @ApiParam("单元格编号") + private Map cellNoMap = new HashMap<>(); + + } From 6a42b517fc38ceba497a1483097389ae7f9c6be4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 12 Oct 2020 01:14:43 +0800 Subject: [PATCH 190/329] =?UTF-8?q?Fix=20Task#2839=20=E6=AD=A6=E6=B1=89PRD?= =?UTF-8?q?-WMS&TMS=E8=A3=85=E8=BD=A6=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocSoDetails.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index aa4f0e2..afcb69b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -76,4 +76,26 @@ public class WmsDocSoDetails extends BaseBean { @Column(name = "CUST_PART_NO") @ApiParam("客户物料编码") public String custPartNo; + + + @Column(name = "REMAIN_QTY", columnDefinition = "decimal(18,8)") + @ApiParam(value = "剩余数量", example = "0") + public Double remainQty; + + @Transient + @ApiParam(value = "存储区代码") + private String zoneNo; + + @Transient + @ApiParam(value = "单据编号") + private String docOrderNo; + + @Transient + @ApiParam(value = "数量") + private Double docQty; + + @Transient + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + public Integer busiType; } From ebf03920578ee850c211e24418f5345a0aa7e517 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 12 Oct 2020 14:44:25 +0800 Subject: [PATCH 191/329] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99opt?= =?UTF-8?q?ionType=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ---------------------- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ---------------------- .../model/excel/mgnbj/SparePartsImportModel.java | 2 +- 3 files changed, 1 insertion(+), 93 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 32fd382..3af6f5c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6059,52 +6059,6 @@ public class MesEnumUtil { } /** - * MES_车型散件配置清单 选配类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_OPTION_TYPE { - - OPTION_PART(1, "选配件"), - BOM_DISASSEMBLY(2, "BOM拆解"); - - private int value; - private String description; - - MES_OPTION_TYPE(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; - } - - public static Integer descriptionOfValue(String description) { - Integer tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(description)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** * 数据格式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 8e8a55f..99133a8 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 @@ -4358,52 +4358,6 @@ public class MesPcnEnumUtil { } /** - * MES_生产队列散件清单 选配类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_OPTION_TYPE { - - OPTION_PART(1, "选配件"), - BOM_DISASSEMBLY(2, "BOM拆解"); - - private int value; - private String description; - - MES_OPTION_TYPE(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; - } - - public static Integer descriptionOfValue(String description) { - Integer tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(description)) { - tmp = values()[i].value; - } - } - return tmp; - } - } - - /** * 绑定模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java index d649fd4..91fb090 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -53,7 +53,7 @@ public class SparePartsImportModel { private String custPartNo; @ApiParam("用量") - private Double qty; + private Integer qty; @ApiParam("单元格编号") private Map cellNoMap = new HashMap<>(); From 4b65842d6ff5b4301834125de1efe56fe607da54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 12 Oct 2020 17:46:41 +0800 Subject: [PATCH 192/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=A1=B9=E7=9B=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index da89988..fcc4640 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 @@ -2246,6 +2246,9 @@ public class MesHqlPack { if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); } + if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCenterCode(), "workCenterCode", packBean); + } if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesProduceSnTravel.getCreateDateTimeStart(), From 7a29b8584896ab2b6c0dd9da5cc1727e5bc7395b Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 12 Oct 2020 19:33:20 +0800 Subject: [PATCH 193/329] =?UTF-8?q?Fix=20Bug=20#11733=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E8=B4=A7=E8=BF=9B=E5=BA=A6=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=BC=96=E8=BE=91=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 00036f6..64708ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -75,6 +75,10 @@ public class WmsASNMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; + @Column(name = "REASON") + @ApiParam(value = "原因", example = "1") + public String reason; + @ApiParam("ASN详情列表") @Transient public List asnMasterDetailsList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index ee49f3e..64ae284 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -199,6 +199,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "部门名称", example = "1") public Integer departName; + @Column(name = "REASON") + @ApiParam(value = "原因", example = "1") + public String reason; + @Transient @ApiParam("周总数") private Integer weekRcCount; From 44b5635e788e87c4db5841465590a2856780c09c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 12 Oct 2020 20:00:27 +0800 Subject: [PATCH 194/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3PO=E7=94=9F=E4=BA=A7=E4=BB=BB=E5=8A=A1=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=B3=E8=81=94=E8=A1=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index 9c33dde..65e0354 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -55,4 +55,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { @ApiParam(value = "拆分条码") public Integer splitSn; + + @ApiParam("关联单据行号") + public String refItem; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 99716c7..522d086 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -145,6 +147,11 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("交易类型") public String transTypeCodeRdd; + @Column(name = "REF_ITEM") + @ApiParam("关联单据行号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refItem; + @Transient @ApiParam("工厂代码集合") private List organizeCodeList; From 9c1965ea6ca8f830f4150bf120ab57113a80fd17 Mon Sep 17 00:00:00 2001 From: songss Date: Tue, 13 Oct 2020 11:38:28 +0800 Subject: [PATCH 195/329] =?UTF-8?q?11653=2019073=20=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index 14e008f..2c76fac 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java @@ -51,10 +51,12 @@ public class AndonCellEventCause extends BaseBean implements Serializable { @ApiParam(value = "事件原因代码") private String ecCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "安灯类型名称") private String alarmCodeName; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "事件原因描述") private String ecName; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index 6fef604..b6856ba 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java @@ -51,10 +51,12 @@ public class AndonCellEventMethod extends BaseBean implements Serializable { @ApiParam(value = "处理方法代码") private String emCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "安灯类型名称") private String alarmCodeName; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "处理方法描述") private String emName; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java index cd82b84..d4fb382 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java @@ -62,10 +62,12 @@ public class AndonCellGroupCfg extends BaseBean implements Serializable { @ApiParam(value = "纵坐标") private Float verticalAxis; + @AnnoOutputColumn(hidden = true) @Column(name = "ABNORMAL_SRC") @ApiParam(value = "异常图片") private String abnormalSrc; + @AnnoOutputColumn(hidden = true) @Column(name = "NORMAL_SRC") @ApiParam(value = "正常图片") private String normalSrc; From 629e6af9a949bea440c56420930aa1f94ef9c972 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 13 Oct 2020 16:17:18 +0800 Subject: [PATCH 196/329] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8C=87=E5=AF=BC?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java | 8 ++++++++ .../estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java | 12 +++++++++--- .../estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java | 7 ++++++- .../pojo/mes/model/excel/mgnbj/SparePartsImportModel.java | 3 --- 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java index 7e79763..0fe1e32 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java @@ -55,6 +55,14 @@ public class MesEquTaskStandard extends BaseBean implements Serializable { @ApiParam("操作指导") private String actionGuide; + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("操作指导文件路径") + private String actionGuideUrl; + + @Column(name = "FILE_ID") + @ApiParam("操作指导文件id") + private Long fileId; + @Transient @ApiParam(value = "生产线") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index e506922..212214d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -59,6 +59,10 @@ public class MesEquTaskStandardRecord extends BaseBean implements Serializable { @ApiParam("操作指导") private String actionGuide; + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("操作指导") + private String actionGuideUrl; + @Column(name = "CHECK_VALUE") @ApiParam("检测值") private String checkValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java index 2d1e39c..57704b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java @@ -2,10 +2,12 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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; @@ -41,15 +43,19 @@ public class MesWorkCellStatus extends BaseBean implements Serializable { @Column(name = "TIME_OUT_STATUS") @ApiParam("超时状态") - private Integer timeOutStatus; + private Integer timeOutStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); @Column(name = "DELAY_HELP_STATUS") @ApiParam("延迟帮助状态") - private Integer delayHelpStatus; + private Integer delayHelpStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); @Column(name = "EMERGENCY_STOP_STATUS") @ApiParam("紧急停止状态") - private Integer emergencyStopStatus; + private Integer emergencyStopStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "FINISH_COUNT") + @ApiParam("完成数量") + private Integer finishCount = 0; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java index 732f977..441bb08 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java @@ -64,6 +64,9 @@ public class MesEquTaskStandardModel implements Serializable { @ApiParam("设备类别") private String equipmentCategoryName; + @ApiParam("操作指导文件路径") + private String actionGuideUrl; + public MesEquTaskStandardModel() { @@ -72,7 +75,8 @@ public class MesEquTaskStandardModel implements Serializable { public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, - String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard) { + String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard, + String actionGuideUrl) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -90,5 +94,6 @@ public class MesEquTaskStandardModel implements Serializable { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; this.modifyDatetimeStandard = modifyDatetimeStandard; + this.actionGuideUrl = actionGuideUrl; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java index 91fb090..eaecea7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -55,7 +55,4 @@ public class SparePartsImportModel { @ApiParam("用量") private Integer qty; - @ApiParam("单元格编号") - private Map cellNoMap = new HashMap<>(); - } From 05f493b80e7f732f4fecf860abf7451a19f1e4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Oct 2020 17:17:07 +0800 Subject: [PATCH 197/329] =?UTF-8?q?feat(softswitch):=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=87=8D=E8=AF=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 4 ++ .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 5 ++ 3 files changed, 63 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 6cbc54a..23191f8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -98,6 +98,15 @@ public class BlockSoftSwitchEnumUtil { } return tmp; } + + public static SUIT_MODE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } } /** @@ -1106,4 +1115,49 @@ public class BlockSoftSwitchEnumUtil { } + /** + * 适配重试方法 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SUIT_RETRY_METHOD { + RESET_MESSAGE_STATE(10, "重置报文状态"), + RE_EXECUTE(20, "重新执行"); + + private int value; + private String description; + + private BS_SUIT_RETRY_METHOD (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; + } + + public static BS_SUIT_RETRY_METHOD valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 9b21a42..69f23a8 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -51,6 +51,10 @@ public class BsSuitCase extends BaseBean { return caseTypeId.intValue(); } + public String getCaseTypeTxt() { + return BlockSoftSwitchEnumUtil.CASE_TYPE.valueOfDescription(getCaseTypeIdVal()); + } + @Column(name = "CASE_DETAIL_ID") @ApiParam(value = "适配器明细id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index f13d15b..76b54fe 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -131,6 +131,11 @@ public class BsSuitRecord extends BaseBean { @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class) private Integer processState; + public String getProcessStateTxt() { + return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() : + BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState); + } + @Column(name = "PROCESS_TIME") @ApiParam(value = "处理时间") private String processTime; From b186af893c732488f071eba578f877db1a95b930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Oct 2020 17:17:59 +0800 Subject: [PATCH 198/329] =?UTF-8?q?feat(softswitch):ftp=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index f80ec78..0f5fcf7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -83,6 +83,13 @@ public class SuitServerModel implements Serializable { private BsSuitCaseModel bsSuitCaseModel; /** + * 适配发送报文信息 + */ + @XStreamOmitField + private String suitSendMessage; + + + /** * 请求来源 */ // @XStreamImplicit From 911f96b60d719e3fa9bbf906100f57bbf553cea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Oct 2020 17:56:41 +0800 Subject: [PATCH 199/329] =?UTF-8?q?style(softswitch):=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index dac4976..b21f150 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -54,6 +56,7 @@ public class BsSuitDataDetail extends BaseBean { @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; @Column(name = "SUIT_TYPE_NAME_RDD") @@ -81,8 +84,14 @@ public class BsSuitDataDetail extends BaseBean { @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class) private Integer processState; + public String getProcessStateTxt() { + return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() : + BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState); + } + @Column(name = "PROCESS_TIME") @ApiParam(value = "处理时间") private String processTime; From c442845f942958f549bfd93c425cd4596d1150ec Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 13 Oct 2020 20:47:45 +0800 Subject: [PATCH 200/329] =?UTF-8?q?=E8=B7=B3=E5=BA=8F=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 11 +++++++---- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java | 8 ++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 3af6f5c..03ff681 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2063,7 +2063,8 @@ public class MesEnumUtil { MES_MODEL_GRADE(600, "modelGradeExcelService", "车型等级导入"), MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"), MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"), - MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"); + MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), + MES_JISA(640, "jisaExcelService", "JISA导入"); private int value; private String service; @@ -3415,7 +3416,7 @@ public class MesEnumUtil { REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), SPARE_RETURN_REPAIR(140, "客退备件返修"), - HOP_SEQ_ORDER(150, "跳序工单"); + SEIZE_SEAT_ORDER(150, "占位工单"); private int value; private String description; @@ -4612,7 +4613,8 @@ public class MesEnumUtil { LANDED(20, "下达"), CANCEL(30, "取消"), OFFLINE(40, "下线"), - SHIPMENT(50, "发运"); + SHIPMENT(50, "发运"), + SPECIAL(60, "特殊标识"); private int value; private String description; @@ -4648,7 +4650,8 @@ public class MesEnumUtil { public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), EMPTYING(20, "放空"), - ERR_PERCH(30, "异常占位"); + ERR_PERCH(30, "异常占位"), + PERCH_HANDLE(40, "占位处理"); private int value; private String description; 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 99133a8..bcf75a5 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 @@ -1916,7 +1916,7 @@ public class MesPcnEnumUtil { REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), SPARE_RETURN_REPAIR(140, "客退备件返修"), - HOP_SEQ_ORDER(150, "跳序工单"); + SEIZE_SEAT_ORDER(150, "占位工单"); private int value; private String description; @@ -2071,6 +2071,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_ORDER_STATUS { + WAIT_LANDED(5, "待下达"), NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java index 64e9e70..31edd81 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -4,6 +4,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.HashMap; +import java.util.Map; + /** * @Description: * @Author: jokelin @@ -71,6 +74,11 @@ public class QueueJitActualModel { @ApiParam("物料号") private String partName; + @ApiParam("mgn标识") + private String mgnFlag; + + @ApiParam("单元格编号") + private Map cellNoMap = new HashMap<>(); public QueueJitActualModel() { From 08687a7e14bb65843d9318261b623958e89da76d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 14 Oct 2020 01:23:20 +0800 Subject: [PATCH 201/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index ec42f52..d0a79d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -68,7 +68,7 @@ public class WmsActionModule extends BaseBean { @Column(name = "IS_SCRIPT_MODULE", columnDefinition = "int default 2") @ApiParam(value = "是否脚本组件") - private Integer isScriptModule = FALSE; + private Integer isScriptModule; /** * 是否脚本组件 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 49ce84f..aecde2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -50,7 +50,8 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BUSI_SCENE_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=BUSI_SCENE_TYPE_DICTIONARY", listColumnName = "name", explicitColumnName = "dictionaryValue") public Integer busiSceneType; From 445821b8033c8e29bbbc2bac0d8db81bb3e568d6 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 14 Oct 2020 10:39:17 +0800 Subject: [PATCH 202/329] =?UTF-8?q?sweb=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 8ea25cf..73c18c8 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -96,7 +96,7 @@ public class SwebPurchaseOrder extends BaseBean { private String refOrderNo; @Column(name = "EXPECTED_TIME") - @ApiParam(value = "预计到货时间") + @ApiParam(value = "预计交货时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String expectedTime; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 297711e..3466256 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -121,6 +121,10 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam(value = "供应商生产日期") private String venProductTime; + @Column(name = "EXPECTED_TIME") + @ApiParam(value = "预计交货时间") + private String expectedTime; + @Transient @ApiParam(value = "合同号") private String refNo; From 8f060d4aa46f047cd9801b7614f0cf9a42741dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 14 Oct 2020 13:44:12 +0800 Subject: [PATCH 203/329] =?UTF-8?q?=E3=80=902856=2010=202.3.8=2020027-PCN?= =?UTF-8?q?=E7=AB=AF=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E9=87=87?= =?UTF-8?q?=E9=9B=86=E6=80=8E=E4=B9=88=E6=8A=A5=E8=AD=A6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesExceptionAlertCfg.java | 49 +++++++++++++++++++ .../pojo/mes/bean/MesExceptionWindowRecord.java | 55 ++++++++++++++++++++++ .../repository/MesExceptionAlertCfgRepository.java | 17 +++++++ .../MesExceptionWindowRecordRepository.java | 17 +++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 9 +++- 6 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 3af6f5c..2995304 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7771,4 +7771,49 @@ public class MesEnumUtil { } } + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_MENU_CODE { + + STATION_MONITOR("STATION_MONITOR", "工位监控"); + + private String value; + private String description; + + SRC_MENU_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java new file mode 100644 index 0000000..8c348e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionAlertCfg.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.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; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EXCEPTION_ALERT_CFG") +@Api("MES_异常提醒配置") +public class MesExceptionAlertCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895221L; + + @Column(name = "SRC_MENU_CODE") + @ApiParam("来源模块代码") + private String srcMenuCode; + + @Column(name = "SRC_MENU_NAME") + @ApiParam("来源模块名称") + private String srcMenuName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "USER_CODE_GROUP") + @ApiParam("提醒人员集合") + private String userCodeGroup; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java new file mode 100644 index 0000000..a904459 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExceptionWindowRecord.java @@ -0,0 +1,55 @@ +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 + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EXCEPTION_WINDOW_RECORD") +@Api("MES_弹窗异常提醒记录") +public class MesExceptionWindowRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895345L; + + @Column(name = "SRC_MENU_CODE") + @ApiParam("来源模块代码") + private String srcMenuCode; + + @Column(name = "USER_CODE") + @ApiParam("提醒人员") + private String userCode; + + @Column(name = "MESSAGE_TYPE") + @ApiParam("消息类型") + private Integer messageType; + + @Column(name = "MESSAGE_HEAD") + @ApiParam("提示表头") + private String messageHead; + + @Column(name = "MESSAGE_CONTENT") + @ApiParam("提示内容") + private String messageContent; + + @Column(name = "STATUS") + @ApiParam("处理状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.java new file mode 100644 index 0000000..8f81f87 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionAlertCfgRepository.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.MesExceptionAlertCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : MES_异常提醒配置 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-10-13 16:49 + * @Modify: + **/ +@Repository +public interface MesExceptionAlertCfgRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.java new file mode 100644 index 0000000..81e3258 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExceptionWindowRecordRepository.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.MesExceptionWindowRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : MES_弹窗异常提醒记录 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-10-13 16:49 + * @Modify: + **/ +@Repository +public interface MesExceptionWindowRecordRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index fcc4640..5e5ff4c 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 @@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -3415,4 +3414,12 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesExceptionAlertCfg(MesExceptionAlertCfg mesExceptionAlertCfg) { + DdlPackBean packBean = getAllBaseData(mesExceptionAlertCfg.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getSrcMenuCode(), "srcMenuCode", packBean); + DdlPreparedPack.getStringEqualPack(mesExceptionAlertCfg.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumEqualPack(mesExceptionAlertCfg.getIsValid(), "isValid", packBean); + return packBean; + } } From ee3f9415a7f78109de786f0289ebf01e6fab9645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 14 Oct 2020 18:40:04 +0800 Subject: [PATCH 204/329] =?UTF-8?q?fix(core):=E7=BB=84=E7=BB=87=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BB=A3=E7=A0=81=E6=97=A0=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index ff6f6bc..a472e9f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -1232,4 +1232,23 @@ public class CoreHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment); + + DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize); + + DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean); + + return ddlPackBean; + } + } \ No newline at end of file From 226c31878ae7168e0877f25977b21e069d200274 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 14 Oct 2020 22:35:42 +0800 Subject: [PATCH 205/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 4 ++++ 2 files changed, 8 insertions(+) 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 index 991b3a1..30cbe36 100644 --- 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 @@ -104,4 +104,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index e159d8e..6d2a731 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -152,6 +152,10 @@ public class MesStationBom extends BaseBean implements Serializable { private Integer length; @Transient + @ApiParam("缺陷代码") + private String defectCode; + + @Transient @ApiParam("校验内容") private String checkContent; From d2f9c3502a3e37c75c567e027fcc363d65f040b6 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 14 Oct 2020 22:57:33 +0800 Subject: [PATCH 206/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=98=9F=E5=88=97?= =?UTF-8?q?=E4=B9=B1=E8=B7=B3=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 1a8a0d8..ffc36d6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -220,6 +220,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { return this.qty == null ? 0.0d : this.qty; } + public double getFinsihQtyVal() { + return this.finsihQty == null ? 0.0d : this.finsihQty; + } + public int getStatusVal() { return this.status == null ? 0 : this.status; } From 7e24f4ed4a2871b3626e8c6357235858b92ba64e Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 14 Oct 2020 22:58:39 +0800 Subject: [PATCH 207/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=98=9F=E5=88=97?= =?UTF-8?q?=E4=B9=B1=E8=B7=B3=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 70b769e..b737470 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -119,6 +119,15 @@ public class QueueOrderModel implements Serializable { public QueueOrderModel() { } + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getFinsihQtyVal() { + return this.finsihQty == null ? 0.0d : this.finsihQty; + } + + public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { this.queueSeq = queueSeq; From 6d64c61848c552d72826c314ddd8586a93058453 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 15 Oct 2020 00:05:36 +0800 Subject: [PATCH 208/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9FIFO=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index a805f86..70f38db 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -1,8 +1,11 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,4 +45,14 @@ public class WmsStockFifoModel { @ApiParam("同批次") private boolean fifoSameBatch; + + @ApiParam("FIFO查询获取方式") + private Integer fifoSnByLood; + + @ApiParam("物料条码信息") + Map> snMap = new HashMap<>(); + + @ApiParam("所有推荐条码信息") + List wmsStockSnAllList = new ArrayList<>(); + } From df9474807c082a961deba469a238352cf51f15ea Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 15 Oct 2020 00:07:43 +0800 Subject: [PATCH 209/329] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=BA=93=E5=AD=98=E8=A1=A8=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=8C=E7=94=A8=E4=B9=90?= =?UTF-8?q?=E8=A7=82=E9=94=81=E6=8E=A7=E5=88=B6=E5=B9=B6=E5=8F=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 11 ++++++----- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 11 ++++++----- .../estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java | 7 +++++++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 6dafc68..e83abaa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -9,11 +9,7 @@ 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.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -119,6 +115,11 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量") private Double scrapQty; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + @Transient @ApiParam(value = "总数量") private Double totalQty; 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 8f33aa6..a0b7f2c 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 @@ -14,11 +14,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.Date; import java.util.List; @@ -229,6 +225,11 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seqNo; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java index 97dad56..4d30cc8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java @@ -21,4 +21,11 @@ public interface WmsConfigRepository extends BaseRepository { * @return 配置信息 */ WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode); + + /** + * 按照配置代码查询配置信息 + * @param configCode 配置代码 + * @return 配置信息 + */ + WmsConfig getFirstByConfigCode(String configCode); } From 8932108cd3f7dd5c8cb6c18ea3b8b7d389adccf6 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 15 Oct 2020 00:58:14 +0800 Subject: [PATCH 210/329] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B9=90=E8=A7=82=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 8 ++++---- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index e83abaa..db71644 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -115,10 +115,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量") private Double scrapQty; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; @Transient @ApiParam(value = "总数量") 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 a0b7f2c..764d333 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 @@ -225,10 +225,10 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer seqNo; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; @ApiParam(value = "仓库名称") @Transient From a49ddc004c022eb2bdda09553eddaf8b98e4e82b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 15 Oct 2020 11:26:13 +0800 Subject: [PATCH 211/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0lob?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index 8ddba7c..15600fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -85,6 +85,7 @@ public class MesRepairRecord extends BaseBean implements Serializable { @ApiParam("工位") private String workCellCode; + @Lob @Column(name = "MEMO") @ApiParam("备注") private String memo; From f58d97fb8352e4bbc63dcd5bd6925b0a42b92542 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 15 Oct 2020 14:35:41 +0800 Subject: [PATCH 212/329] =?UTF-8?q?=2011777=2019048-=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BB=B6=20=E7=BB=91=E5=AE=9A=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=85=B3=E9=94=AE=E4=BB=B6=E6=95=B0=E6=8D=AE=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E5=9B=9E=E6=BB=9A-20201012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index 1fdcdda..f1114df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord; import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -19,12 +20,15 @@ public class FutrueTaskModel { @ApiParam("实现类") private Object futrueTaskService; - @ApiParam("包装条码") + @ApiParam("工位请求bean") private StationRequestBean stationRequestBean; - @ApiParam("过程条码") + @ApiParam("产品条码表") private MesProduceSn produceSn; + @ApiParam("产品绑定记录表") + private MesProdBindRecord prodBindRecord; + @ApiParam("组织代码") private String organizeCode; From cfd0cb03ffd2a716f887e6b6d76a44323025ebd7 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 15 Oct 2020 14:36:24 +0800 Subject: [PATCH 213/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index db71644..6d1769b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -9,7 +9,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; import java.util.List; /** @@ -115,10 +120,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量") private Double scrapQty; -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public Integer lockVersion; + @Version + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") + @ApiParam(value = "乐观锁", defaultValue = "0") + public Integer lockVersion; @Transient @ApiParam(value = "总数量") @@ -221,6 +226,10 @@ public class WmsStockQuan extends BaseBean { return this.boxQty == null ? 0 : this.boxQty; } + public Integer getLockVersion() { + return this.lockVersion == null ? 0 : this.lockVersion; + } + public WmsStockQuan() { } From 233853e1e6d5865999337ff1cafbe6fb2223f77c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 15 Oct 2020 16:26:40 +0800 Subject: [PATCH 214/329] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=92=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 ++++--- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java | 4 ++++ 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 3720c98..ab52cf1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3416,7 +3416,8 @@ public class MesEnumUtil { REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), SPARE_RETURN_REPAIR(140, "客退备件返修"), - SEIZE_SEAT_ORDER(150, "占位工单"); + SEIZE_SEAT_ORDER(150, "占位工单"), + SAMPLE_ORDER(160, "样件工单"); private int value; private String description; @@ -3581,11 +3582,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_ORDER_STATUS { + WAIT_LANDED(5, "待下达"), NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), - CLOSE(40, "已关闭"), - ; + CLOSE(40, "已关闭"); private int value; private String description; 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 bcf75a5..6007e48 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 @@ -2075,8 +2075,7 @@ public class MesPcnEnumUtil { NORMAL(10, "正常"), ONLINE(20, "已上线"), OFFLINE(30, "已下线"), - CLOSE(40, "已关闭"), - ; + CLOSE(40, "已关闭"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 82bfdf1..a885bce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -79,10 +79,18 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + @Column(name = "STOCK_QTY") @ApiParam("排程实时库存") private Integer stockQty; + @Column(name = "MIN_GEN_LOT") + @ApiParam("最小生成批次") + private Integer minGenLot; + @Transient @ApiParam("物料名称") private String partName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 5162f3d..20308b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -122,6 +122,14 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("特殊标识") private Integer specialFlag; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index b677ede..cd9ba33 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -55,4 +55,8 @@ public class MesRouteProcessCell extends BaseBean implements Serializable { @ApiParam("工序代码名称") private String processCodeName; + @Transient + @ApiParam("正在生产队列数量") + private Integer genningNum; + } From 75520519de2e14f95884145dc378b09470e427b9 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 15 Oct 2020 16:51:38 +0800 Subject: [PATCH 215/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) 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 f24ff0c..9570d39 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 @@ -53,6 +53,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("行号") public String item; + @Column(name = "REF_ITEM") + @ApiParam("关联行号") + public Integer refItem; + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") From ee700ab5b0d144f55548cce067450e33b3c75a01 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 15 Oct 2020 17:41:57 +0800 Subject: [PATCH 216/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E5=A4=9A=E7=BA=A7BOM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index d97792c..f6cee5e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -273,4 +273,13 @@ public class WmsPOMasterDetails extends BaseBean { this.totalBoxes = totalBoxes.intValue(); this.qty = qty; } + + public WmsPOMasterDetails(String orderNo, String partNo, Double qty, + Double rcQty, Integer itemStatus) { + this.orderNo = orderNo; + this.partNo = partNo; + this.qty = qty; + this.rcQty = rcQty; + this.itemStatus = itemStatus; + } } From 834e3d211d67457aa69e495c0be9ac0fae80fe37 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Thu, 15 Oct 2020 19:28:43 +0800 Subject: [PATCH 217/329] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E0=E7=9A=84=E4=B8=9A=E5=8A=A1=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=9F=BA=E7=A1=80=E7=B1=BB=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 8d48efd..4120d0e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -88,7 +88,7 @@ public class MesHqlPack { public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); return packBean; } 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 3e7316f..81613fd 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 @@ -106,7 +106,7 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; @@ -122,7 +122,7 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeedRecord(MesCellFeedRecord mesCellFeedRecord, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeedRecord.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean; From c3bdf4a1624ef01d4fd6779ffa1faa85ef667050 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 15 Oct 2020 20:20:11 +0800 Subject: [PATCH 218/329] =?UTF-8?q?=E8=A7=A3=E5=86=B310330=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=89=A3=E5=87=8F=E4=B8=8D=E5=87=86=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsJobParamModel.java | 7 ++++++- .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 8 ++++++++ .../i3plus/pojo/model/wms/WmsMoveMasterModel.java | 8 ++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 24 ++++++++++++++++------ .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 4 ++++ 5 files changed, 44 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index 009c019..ca619c2 100755 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -21,7 +21,12 @@ public class WmsJobParamModel implements Serializable { private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 private Integer minuteDiff;//处理周期(分钟) - private String whereHql;//业务查询条件HQL + private List fixPartList;//需要特殊处理的零件号集合 + private String fixPartAndWhere; // 特殊零件号需要加的过滤条件 + private Integer pageSize;//数据条数 + private Integer isCheckSn;//是否检查条码存在 + private Integer erpSyncFlag;//查询SHIPPING表的条件 + public int getMinuteDiffVal() { return this.minuteDiff == null ? 0 : this.minuteDiff.intValue(); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index a718377..b92fbbe 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -19,4 +19,12 @@ public class WmsMoveDetailsModel implements Serializable { private static final long serialVersionUID = -6968143574442339454L; private WmsMoveDetails details; private List moveSnList; + + public WmsMoveDetailsModel(WmsMoveDetails details, List moveSnList) { + this.details = details; + this.moveSnList = moveSnList; + } + + public WmsMoveDetailsModel() { + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java index 0e1e684..ff464ed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java @@ -18,4 +18,12 @@ public class WmsMoveMasterModel implements Serializable { private static final long serialVersionUID = -5490167040159056107L; private WmsMoveMaster moveMaster; private List moveDetails; + + public WmsMoveMasterModel(WmsMoveMaster moveMaster, List moveDetails) { + this.moveMaster = moveMaster; + this.moveDetails = moveDetails; + } + + public WmsMoveMasterModel() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index f04cc9c..7f47f40 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -10,12 +10,8 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; +import java.util.List; /** * @Description : 库存移动单主表信息 @@ -177,6 +173,22 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("总行数") private Long itemQty; + @Transient + @ApiParam("存储区") + private String zoneNo; + + @Transient + @ApiParam("仓库") + private String whNo; + + @Transient + @ApiParam("状态集合") + private List orderStatusList; + + @Transient + @ApiParam("交易类型集合") + private List transTypeCodeList; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index edcf03a..7051b98 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -81,6 +81,10 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "交易处理组件名称") private String tmName; + @Column(name = "DIRECT") + @ApiParam(value = "交易的方向：IN,OUT,MOVE") + private String direct; + @Transient @ApiParam("菜单URL") private String menuUrl; From 1e6ca2e0bb10c67cb4b09f03ea6d7691ad88d358 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 15 Oct 2020 20:22:53 +0800 Subject: [PATCH 219/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1=20=20=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 7e86112..72f8ca9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -43,6 +43,10 @@ public class MesEquTaskPlan extends BaseBean implements Serializable { @ApiParam("作业类型") private Integer taskType; + @Column(name = "CYCLE_TYPE") + @ApiParam("周期类型") + private Integer cycleType; + @Column(name = "TASK_CYCLE") @ApiParam("周期(天)") private Integer taskCycle; From dc38d2db6fec3d3bef10ac7574de6b05a95ce277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 15 Oct 2020 21:35:04 +0800 Subject: [PATCH 220/329] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/MgnPaintPolishingReportModel.java | 42 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 13 +++++++ 2 files changed, 55 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java new file mode 100644 index 0000000..5f7725a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnPaintPolishingReportModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料描述") + private String partDesc; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("日期") + private String modifyDate; + + @ApiParam("开始日期") + private String modifyStartDate; + + @ApiParam("结束日期") + private String modifyEndDate; + + @ApiParam("抛光数量") + private Double polishingQty; + + @ApiParam("返喷标识") + private String reverseSprayMark; + + @ApiParam("打磨件物料号") + private String polishPartNo; + + @ApiParam("打磨件物料描述") + private String polishPartDesc; + + @ApiParam("组织代码") + private String organizeCode; + +} 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 fcc4640..da7b815 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 @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; +import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -3415,4 +3416,16 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesPaintPolishing(MgnPaintPolishingReportModel paintPolishingReportModel, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(paintPolishingReportModel.getOrganizeCode()); + if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) { + DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) { + DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(), + "modifyDatetime", packBean, true); + } + return packBean; + } } From 07282396d27017936bb8283b7fafc64e57a963cf Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 15 Oct 2020 22:16:55 +0800 Subject: [PATCH 221/329] =?UTF-8?q?ASN=E5=88=B0=E8=B4=A7=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 50d0007..acce643 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -221,6 +221,11 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; + @Column(name = "STD_CHECK_TIME") + @ApiParam(value = "标准质检时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer stdCheckTime; + @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "IS_VALUABLE") From cc2961d4b8d98292b3c07423d213f8d191a318ba Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 15 Oct 2020 23:34:26 +0800 Subject: [PATCH 222/329] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index a885bce..58d4473 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -92,6 +92,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { private Integer minGenLot; @Transient + @ApiParam("已下达箱数") + private Integer alreadyLandedNum; + + @Transient @ApiParam("物料名称") private String partName; } From 8ed135734d46f8d3b57b8435c31c23314f82af12 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 16 Oct 2020 00:16:57 +0800 Subject: [PATCH 223/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 6d1769b..c6e6c68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -226,10 +226,12 @@ public class WmsStockQuan extends BaseBean { return this.boxQty == null ? 0 : this.boxQty; } + public Integer getLockVersion() { return this.lockVersion == null ? 0 : this.lockVersion; } + public WmsStockQuan() { } From 1706b7a6847e8318969257b6f2d568599339fb04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 16 Oct 2020 10:58:30 +0800 Subject: [PATCH 224/329] =?UTF-8?q?=E3=80=902856=2010=202.3.8=2020027-PCN?= =?UTF-8?q?=E7=AB=AF=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E9=87=87?= =?UTF-8?q?=E9=9B=86=E6=80=8E=E4=B9=88=E6=8A=A5=E8=AD=A6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 78 ++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 3720c98..a973f4b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7775,7 +7775,7 @@ public class MesEnumUtil { } /** - * 产品位置 + * 功能模块 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SRC_MENU_CODE { 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 bcf75a5..2aeb65f 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 @@ -5704,6 +5704,84 @@ public class MesPcnEnumUtil { } } + /** + * 功能模块 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_MENU_CODE { + + STATION_MONITOR("STATION_MONITOR", "工位监控"); + + private String value; + private String description; + + SRC_MENU_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 弹窗异常提醒记录 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXCEPTION_WINDOW_RECORD_STATUS { + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private Integer value; + private String description; + + EXCEPTION_WINDOW_RECORD_STATUS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From bd9547b825ad46461281778aa15809c4a35df5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 16 Oct 2020 11:06:58 +0800 Subject: [PATCH 225/329] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesDefectRecord.java | 4 +++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 +++++++++++ 3 files changed, 59 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 017359b..44b5203 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7820,4 +7820,41 @@ public class MesEnumUtil { } } + /** + * 缺陷类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DEFECT_TYPE_CODE { + SCRAPPED("SCRAPPED", "报废"), + BACK_SPRAY("BACK_SPRAY", "返喷"), + POLISHING("POLISHING", " 抛光"), + DETERMIND("DETERMIND", " 待定"); + + private String code; + private String description; + + DEFECT_TYPE_CODE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 54d14d1..e7ae500 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -101,6 +101,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("质量状态") private Integer qcStatus; + @Transient + @ApiParam("缺陷类型名称") + private String defectActionTypeName; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } 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 56a6284..73aba57 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 @@ -3435,4 +3435,22 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesExceptionAlertCfg.getIsValid(), "isValid", packBean); return packBean; } + + public static DdlPackBean getMesPaintDefect(MesDefectRecord defectRecord, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + if (!StringUtils.isEmpty(defectRecord.getPartNo())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(defectRecord.getDefectActionType())) { + DdlPreparedPack.getStringEqualPack(defectRecord.getDefectActionType(), "defectActionType", packBean); + } + if (!StringUtils.isEmpty(defectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(defectRecord.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(defectRecord.getCreateDateTimeStart(), defectRecord.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } } From 52bdc6c664c1355f84baa64372898e7fde5781b5 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 16 Oct 2020 13:14:36 +0800 Subject: [PATCH 226/329] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=20=E6=96=B0=E5=A2=9EplanCfgCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 6 +-- .../i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java | 55 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 16 +++++++ .../repository/MesEquTaskPlanCfgRepository.java | 16 +++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 28 +++++++++-- 5 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 72f8ca9..bd89ef1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -43,9 +43,9 @@ public class MesEquTaskPlan extends BaseBean implements Serializable { @ApiParam("作业类型") private Integer taskType; - @Column(name = "CYCLE_TYPE") - @ApiParam("周期类型") - private Integer cycleType; + @Column(name = "PLAN_CFG_CODE") + @ApiParam("计划配置代码") + private String planCfgCode; @Column(name = "TASK_CYCLE") @ApiParam("周期(天)") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java new file mode 100644 index 0000000..057933b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanCfg.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :设备计划配置 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2020-10-15 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_TASK_PLAN_CFG") +@Api("设备周期作业计划配置") +public class MesEquTaskPlanCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 7734079474434307857L; + + @Column(name = "PLAN_CFG_CODE") + @ApiParam("计划配置代码") + private String planCfgCode; + + @Column(name = "BACKGROUND_COLOR") + @ApiParam("显示背景色") + private String backgroundColor; + + @Column(name = "COLOR") + @ApiParam("字体颜色") + private String color; + + @Column(name = "CYCLE") + @ApiParam("周期(天)") + private Integer taskCycle; + + @Column(name = "DISPLAY_TEXT") + @ApiParam("显示文字") + private String displayText; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 3134f85..846880d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -196,6 +196,22 @@ public class StationRequestBean implements Serializable { @ApiParam("密码") private String password; + public StationRequestBean() { + } + + public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode) { + this.organizeCode = organizeCode; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + } + + public StationRequestBean(String organizeCode, String workCenterCode, String workCellCode, String userInfo) { + this.organizeCode = organizeCode; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.userInfo = userInfo; + } + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.java new file mode 100644 index 0000000..516002d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanCfgRepository.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.MesEquTaskPlanCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskPlanCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 5e5ff4c..b2a7f93 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 @@ -869,7 +869,7 @@ public class MesHqlPack { return packBean; } - public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData,String organizeCode){ + public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); if (!StringUtils.isEmpty(keyData.getObjectCode())) { DdlPreparedPack.getStringEqualPack(keyData.getObjectCode(), "objectCode", packBean); @@ -897,6 +897,7 @@ public class MesHqlPack { } return packBean; } + /** * MES 物料关键数据关系信息查询条件封装 * @@ -1659,6 +1660,24 @@ public class MesHqlPack { } /** + * 设备任务配置 查询条件封装 + * + * @param equTaskPlanCfg + * @param organizeCode + * @return + */ + public static DdlPackBean findEquTaskPlanCfg(MesEquTaskPlanCfg equTaskPlanCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(equTaskPlanCfg, organizeCode); + if (!StringUtils.isEmpty(equTaskPlanCfg.getPlanCfgCode())) { + DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getPlanCfgCode(), "planCfgCode", packBean); + } + if (!StringUtils.isEmpty(equTaskPlanCfg.getDisplayText())) { + DdlPreparedPack.getStringLikerPack(equTaskPlanCfg.getDisplayText(), "displayText", packBean); + } + return packBean; + } + + /** * MES 类型信息查询条件封装 * * @param mesTypeCfg @@ -2348,6 +2367,7 @@ public class MesHqlPack { } return packBean; } + /** * 监听任务查询条件封装 * @@ -2409,7 +2429,7 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual,List orderList, String organizeCode) { + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, List orderList, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); @@ -2441,7 +2461,7 @@ public class MesHqlPack { queueJitActual.getCustPointEndDate(), "createDatetime", packBean, true); } - if(!CollectionUtils.isEmpty(orderList)){ + if (!CollectionUtils.isEmpty(orderList)) { DdlPreparedPack.getInPackList(orderList, "jisActualNo", packBean); } DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean); @@ -3309,6 +3329,7 @@ public class MesHqlPack { /** * 客户JIT队列下达配置 + * * @param jitIssueCfg * @param organizeCode * @return @@ -3335,6 +3356,7 @@ public class MesHqlPack { /** * 条码照片关系 + * * @param snPhotoRelation * @param organizeCode * @return From d372256a680328cb3b864624f1d4fa9b12b6b28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 16 Oct 2020 13:35:09 +0800 Subject: [PATCH 227/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=96=B7=E6=B6=82?= =?UTF-8?q?=E4=B8=8D=E8=89=AF=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 44b5203..cfb7bd5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -5310,7 +5310,8 @@ public class MesEnumUtil { BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), - BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"); + BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"), + BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"); private String code; private String description; @@ -7830,26 +7831,26 @@ public class MesEnumUtil { POLISHING("POLISHING", " 抛光"), DETERMIND("DETERMIND", " 待定"); - private String code; + private String value; private String description; - DEFECT_TYPE_CODE(String code, String description) { - this.code = code; + DEFECT_TYPE_CODE(String value, String description) { + this.value = value; this.description = description; } - public String getCode() { - return code; + public String getValue() { + return value; } public String getDescription() { return description; } - public static String valueOfDescription(String code) { + public static String valueOfDescription(String value) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { + if (values()[i].value.equals(value)) { tmp = values()[i].description; } } From 401fccd4dc6423efb7453f034e08062a623bd28c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 16 Oct 2020 16:45:01 +0800 Subject: [PATCH 228/329] =?UTF-8?q?fix(impp):DdlPreparedPack=E7=B1=BB?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=A4=A7=E4=BA=8E=E5=B0=8F=E4=BA=8E=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 0205650..e336469 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -496,6 +496,18 @@ public class DdlPreparedPack { } /** + * 封装double对象成大于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data); + } + } + + /** * 封装double对象成小于语句 * * @param columnName 列名 @@ -508,6 +520,18 @@ public class DdlPreparedPack { } /** + * 封装double对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data); + } + } + + /** * 封装double对象成小于等于语句 * * @param columnName 列名 @@ -520,6 +544,18 @@ public class DdlPreparedPack { } /** + * 封装double对象成小于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data); + } + } + + /** * 封装long或者int的整数对象成equal语句(不等于) * * @param columnName 列名 From fcc66835b89daf8a610284f85c096c08dfcde1c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 16 Oct 2020 17:57:57 +0800 Subject: [PATCH 229/329] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../pojo/mes/bean/MesBoardCustomParamCfg.java | 48 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 4 ++ .../estsh/i3plus/pojo/mes/bean/MesShiftRest.java | 8 ++++ .../cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 3 ++ .../pojo/mes/model/MgnBoardAreaYieldModel.java | 18 ++++++++ .../mes/model/MgnBoardAssembleCompRateModel.java | 21 ++++++++++ .../i3plus/pojo/mes/model/MgnBoardListModel.java | 26 ++++++++++++ .../i3plus/pojo/mes/model/MgnBoardYieldModel.java | 21 ++++++++++ .../MesBoardCustomParamCfgRepository.java | 16 ++++++++ 10 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index cfb7bd5..e4b2f2d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2436,7 +2436,8 @@ public class MesEnumUtil { NORMAL(10, "正常"), REWORK(20, "返修"), - ON_LINE(30, "上线工位"); + ON_LINE(30, "上线工位"), + QUALITY_CHECK(40, "质检工位"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.java new file mode 100644 index 0000000..98a0cd9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.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; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:49 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_CUSTOM_PARAM_CFG") +@Api("MES_看板自定义参数配置") +public class MesBoardCustomParamCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3932883827194753734L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index fe879fa..81c5005 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -61,6 +61,10 @@ public class MesShift extends BaseBean implements Serializable { @ApiParam("班次顺序") private Integer shiftSeq; + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + public int getShiftSeqVal() { return this.shiftSeq == null ? 0 : this.shiftSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index ae77fe6..11f933e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -48,4 +48,12 @@ public class MesShiftRest extends BaseBean implements Serializable { @ColumnDefault("0") @ApiParam("休息时长") private Double restTimes; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="REST_DESC") + @ApiParam("班休描述") + private String restDesc; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index 129386f..4ac3d6d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -77,4 +77,7 @@ public class BoardModel { @ApiParam("工位状态监控明细") private List boardWorkCellList; + + @ApiParam("天津麦格纳看板") + private MgnBoardAreaYieldModel mgnBoardAreaYieldModel; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java new file mode 100644 index 0000000..e40623b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAreaYieldModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardAreaYieldModel { + + @ApiParam("组装") + private MgnBoardListModel assembleBoardListModel; + + @ApiParam("涂装") + private MgnBoardListModel paintBoardListModel; + + @ApiParam("注塑") + private MgnBoardListModel injectMoldBoardListModel; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java new file mode 100644 index 0000000..e4e28cb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardAssembleCompRateModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("合格率目标值") + private String qualifiedRateTargetValue; + + @ApiParam("完成率") + private String planCompleteRate; + + @ApiParam("合格率偏差值") + private String fpyDeviationValue; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java new file mode 100644 index 0000000..fca607d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class MgnBoardListModel { + + @ApiParam("产线产量汇总") + private List centerYieldList; + + @ApiParam("月度产量汇总") + private List monthlyYieldList; + + @ApiParam("当班计划产量") + private Double shiftPlanYield; + + @ApiParam("当班实际产量") + private Double shiftActualYield; + + @ApiParam("计划完成率") + private String planCompleteRate; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java new file mode 100644 index 0000000..795cfce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardYieldModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnBoardYieldModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("日期") + private String date; + + @ApiParam("计划产量") + private Double planYield; + + @ApiParam("实际产量") + private Double actualYield; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.java new file mode 100644 index 0000000..a8f2e8a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.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.MesBoardCustomParamCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesBoardCustomParamCfgRepository extends BaseRepository { +} From cd32eee8ea8112c40797400dc840deb3160a1e18 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 16 Oct 2020 19:24:43 +0800 Subject: [PATCH 230/329] =?UTF-8?q?=E6=8E=92=E7=A8=8B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 58d4473..ca4851d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -88,7 +88,7 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { private Integer stockQty; @Column(name = "MIN_GEN_LOT") - @ApiParam("最小生成批次") + @ApiParam("最小下达批次") private Integer minGenLot; @Transient From bfe4b4f0691e3379e8aa658e9b106eb7a4aa3eaf Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 16 Oct 2020 19:48:08 +0800 Subject: [PATCH 231/329] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1=E5=AE=8C?= =?UTF-8?q?=E5=96=84=EF=BC=8C=E6=A0=B9=E6=8D=AE=E4=B8=8D=E5=90=8C=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E8=B0=83=E7=94=A8=E4=B8=8D=E5=90=8C=E7=9A=84=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) 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 bcf75a5..a4488f7 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 @@ -5704,6 +5704,59 @@ public class MesPcnEnumUtil { } } + /** + * 设备故障等级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TAKET_LEVEL_CODE { + NORMAL(10, "A", "不需要报警和安灯处理"), + ALARM_CALL_ANDON(20, "B", "不需要报警,安灯记录"), + CALL_ANDON(30, "C", "安灯记录"), + FORCE_ANDON(40, "D", "强制ANDON呼叫"), + STOPLINE_FORCE_ANDON(50, "E", "系统进行记录并停线,强制ANDON呼叫"); + + private Integer value; + private String code; + private String description; + + TAKET_LEVEL_CODE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 93626dad0fb91b9c1f2914a1902cc15c63bc9a43 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 17 Oct 2020 11:06:19 +0800 Subject: [PATCH 232/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 45 ++++++++++++++ .../pojo/wms/modelbean/WmsQCStatusModel.java | 71 ++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b28e142..dc2fbac 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -9197,4 +9197,49 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 质检单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS_FLAG { + NORMAL(1, "NORMAL", "合格"), + ABNORMAL(2, "ABNORMAL", "超时"); + + private int value; + private String code; + private String description; + + QC_STATUS_FLAG(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java new file mode 100644 index 0000000..c5a9443 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @质检完成状态模型 + * @author jason.niu + * @date 2020/10/16 + */ +@Data +@Api("质检完成状态模型") +public class WmsQCStatusModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("ASN单号") + private String asnOrderNo; + + @ApiParam("质检单号") + private String qcOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("标准质检时间（分钟）") + private Double stdQcTime; + + @ApiParam("收货时间") + private String receiveTime; + + @ApiParam("计划质检完成时间") + private String planCompleteTime; + + @ApiParam("实际质检完成实际") + private String actualCompleteTime; + + @ApiParam("状态") + private Integer status; + + @ApiParam("开始时间") + private String startDateTime; + + @ApiParam("结束时间") + private String endDateTime; + + @ApiParam("零件数量") + private Double qty; + + @ApiParam("待质检比例") + private Double proportion; + + @ApiParam("标准质检时间") + private Integer stdCheckTime; + + public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Integer stdCheckTime) { + this.asnOrderNo = asnOrderNo; + this.qcOrderNo = qcOrderNo; + this.partNo = partNo; + this.partName = partName; + this.stdQcTime = stdQcTime; + this.qty = qty; + this.proportion = proportion; + this.stdCheckTime = stdCheckTime; + } +} From 8b53722b0fe7e02fb7c899dc0d59e726f6c368a4 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sat, 17 Oct 2020 11:32:04 +0800 Subject: [PATCH 233/329] =?UTF-8?q?=E8=AE=BE=E5=A4=87plan=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index bd89ef1..d68cdec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -47,10 +47,6 @@ public class MesEquTaskPlan extends BaseBean implements Serializable { @ApiParam("计划配置代码") private String planCfgCode; - @Column(name = "TASK_CYCLE") - @ApiParam("周期(天)") - private Integer taskCycle; - @Column(name = "LAST_TIME") @ApiParam("上一执行时间") private String lastTime; From 3e89aa94255fa566b755321f213ee4f32534a6cb Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 17 Oct 2020 18:31:55 +0800 Subject: [PATCH 234/329] =?UTF-8?q?=E4=B9=90=E8=A7=82=E9=94=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 9ff19b8..4caf068 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -121,7 +121,7 @@ public class WmsASNMasterDetails extends BaseBean { public Double recQty; @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; 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 9570d39..4ea43ea 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 @@ -384,7 +384,7 @@ public class WmsDocMovementDetails extends BaseBean { } @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; 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 fda0174..c3f8106 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 @@ -237,7 +237,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", private String createDateTime; @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; 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 530005d..e9b0b82 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 @@ -205,7 +205,7 @@ public class WmsMoveSn extends BaseBean { private String transTypeName; @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index f6cee5e..f65a06b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -160,7 +160,7 @@ public class WmsPOMasterDetails extends BaseBean { //private Double getInputRcQty(){ return this.inputRcQty == null ? new Double(0) : this.inputRcQty; } @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") private transient Integer lockVersion; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 8d77ca7..83a6c13 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -83,7 +83,7 @@ public class WmsQCDetails extends BaseBean { public Double rejectQty; @Version - @Column(name = "LOCK_VERSION") + @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; } From 6930fdfbe72ed32b6d9be6633372b6634a4b4dab Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 17 Oct 2020 23:10:31 +0800 Subject: [PATCH 235/329] =?UTF-8?q?mgn-bj=20=E4=BA=A7=E7=BA=BF=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 4f8f64c..26bda1b 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 @@ -5544,8 +5544,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCE_CATEGORY_NAME { - FL("FL", "前右"), - FR("FR", "前左"), + FL("FL", "前左"), + FR("FR", "前右"), RL("RL", "后左"), RR("RR", "后右"); @@ -5575,11 +5575,11 @@ public class MesPcnEnumUtil { return tmp; } - public static String descriptionOfValue(String description) { + public static String descriptionOfValue(String value) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(description)) { - tmp = values()[i].value; + if (values()[i].value.equals(value)) { + tmp = values()[i].description; } } return tmp; From 63c1cc479bdd0cef78a20b10f4673a643a22d57d Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sat, 17 Oct 2020 23:18:05 +0800 Subject: [PATCH 236/329] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=20?= =?UTF-8?q?model=E6=B7=BB=E5=8A=A0planCfgCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java index f422957..ffd58b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java @@ -56,7 +56,7 @@ public class MesDataWarning extends BaseBean implements Serializable { private Integer informMode; @Lob - @Column(name = "INFORM_USER") + @Column(name = "INFORM_USER",columnDefinition = "TEXT") @ApiParam("通知对象") private String informUser; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 95ae538..4dc2203 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -78,7 +78,7 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("默认工作中心") private String defaultWorkCenter; - @Column(name = "PRODUCE_CTGY_CODE") + @Column(name = "PRODUCE_CTGY_CODE",columnDefinition = "default ''") @ApiParam("产品类型代码") private String produceCategoryCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index e632a49..0538b0f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; @@ -19,8 +22,8 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("作业类型") private Integer taskType; - @ApiParam("周期(天)") - private Integer taskCycle; + @ApiParam("计划配置代码") + private String planCfgCode; @ApiParam("上一执行时间") private String lastTime; @@ -67,17 +70,19 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("设备类别名称") private String equipmentCategoryName; + @ApiParam("设备周期计划配置") + private MesEquTaskPlanCfg planCfg; public MesEquTaskPlanModel() { } - public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) { + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String planCfgCode, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; this.taskType = taskType; - this.taskCycle = taskCycle; + this.planCfgCode = planCfgCode; this.lastTime = lastTime; this.daysInAdvance = daysInAdvance; this.memo = memo; From e24bb4c39bf96318b7e596ce0db6f44a8353287c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 18 Oct 2020 17:14:43 +0800 Subject: [PATCH 237/329] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=BF=BD=E7=95=A5=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/MesPcnSyncCfg.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index cc636ce..e5ac585 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -80,6 +80,10 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable { @ApiParam(value = "同步的时候是否区分工厂") private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + @Column(name = "IGNORE_FIELDS") + @ApiParam(value = "同步的时候部分字段不同步") + private String ignoreFields; + @Transient @ApiParam("同步方式") private String syncPatternName; From df063af038faf320e66d7a934bb31aaf7ed47706 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 18 Oct 2020 18:42:32 +0800 Subject: [PATCH 238/329] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index e4b2f2d..7b8ff0e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7859,4 +7859,46 @@ public class MesEnumUtil { } } + + + /** + * 物料 物料类型1 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_CATEGORY1 { + RAW_PART(10, "原材料"), + SEMI_FINISHED_PRODUCT(20, "半成品"), + FINISHED_PRODUCT(30, "成品"); + + private int value; + private String description; + + PART_CATEGORY1(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + 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; + } + } + } From 9c1a9be165830cb973339f8ba1ee947512cf1a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 18 Oct 2020 23:03:18 +0800 Subject: [PATCH 239/329] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 9b7067b..856f210 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 @@ -3443,6 +3443,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) { DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(paintPolishingReportModel.getWorkOrderNo())) { + DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getWorkOrderNo(), "workOrderNo", packBean); + } if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) { DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(), "modifyDatetime", packBean, true); From fc36e55a38b8650914ba7809c192194aa23733a3 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 19 Oct 2020 03:31:30 +0800 Subject: [PATCH 240/329] =?UTF-8?q?=E6=96=B0=E5=A2=9Emes=20=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=91=A8=E6=9C=9F=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 38 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 3 ++ 2 files changed, 41 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index e4b2f2d..3567ab2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7859,4 +7859,42 @@ public class MesEnumUtil { } } + /** + * 查询周期 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUERY_GAP_TYPE { + MINUTE("MINUTE", "分钟"), + HOUR("HOUR", "小时"), + DAY("DAY", " 日"), + WEEK("WEEK", " 周"), + MONTH("MONTH", " 月"); + + private String value; + private String description; + + QUERY_GAP_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index b737470..9f15432 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -116,6 +116,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("特殊标识") private Integer specialFlag; + @ApiParam("箱条码") + private String packageNo; + public QueueOrderModel() { } From 1aebc6761c6d3a1973c38f3eadf4ac65eadaf21e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 19 Oct 2020 14:25:15 +0800 Subject: [PATCH 241/329] =?UTF-8?q?Fix=20bug#11878=2019081-=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93=E6=8E=A8=E7=AE=97?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8-1016?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index afcb69b..8457f27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -98,4 +98,8 @@ public class WmsDocSoDetails extends BaseBean { @ApiParam("业务类型") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") public Integer busiType; + + @Transient + @ApiParam(value = "客户发往地代码") + private String custDeliveryCode; } From a4bc17b0a60a2ad23ab757d359182f9ad85e2ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 19 Oct 2020 21:28:05 +0800 Subject: [PATCH 242/329] =?UTF-8?q?feat(form):sap=5Fhana=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index d2c673a..f401265 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1816,7 +1816,8 @@ public class CommonEnumUtil { SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), - SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); + SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"), + SOURCE_SAP_HANA(500, "SapHana", "SapHana","com.sap.db.jdbc.Driver",39015,null); private int value; private String code; @@ -1908,6 +1909,13 @@ public class CommonEnumUtil { return tmp; } + public String getSchemaPattern(String schema) { + if(this.equals(SOURCE_SAP_HANA)){ + return schema; + } + return defaultSchemaPattern; + } + public String getJDBCUrl(String database,String host,Integer port){ if(this.getValue() == SOURCE_MARIA_DB.getValue()){ return getJDBCUrlMySQL(database,host,port); @@ -1917,6 +1925,8 @@ public class CommonEnumUtil { return getJDBCUrlPostgreSQL(database,host,port); }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ return getJDBCUrlSQLServer(database,host,port); + }else if(this.getValue() == SOURCE_SAP_HANA.getValue()){ + return getJDBCUrlSapHana(database,host,port); } return null; } @@ -1944,6 +1954,8 @@ public class CommonEnumUtil { return SOURCE_POSTGRE_SQL; }else if(databaseProductName.indexOf(":sqlserver:") != -1){ return SOURCE_SQL_SERVER; + }else if(databaseProductName.indexOf(":sap:") != -1){ + return SOURCE_SAP_HANA; } } return null; @@ -1965,6 +1977,10 @@ public class CommonEnumUtil { return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; } + private String getJDBCUrlSapHana(String database,String host,Integer port){ + return "jdbc:sap://" + host + ":" + port + "?reconnect=true"; + } + private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){ StringBuffer sb = new StringBuffer(); sb.append("jdbc:sqlserver://").append(host); From 5d73afd17faa2452249f8e7de25fee83a5c949a1 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 19 Oct 2020 21:40:10 +0800 Subject: [PATCH 243/329] =?UTF-8?q?jisa=E5=B0=8F=E6=97=B6=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E6=8A=A5=E8=A1=A8=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 5 +++++ .../pojo/mes/model/mgnbj/JisaJphReportModel.java | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index dd46d65..ad5c91b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -14,6 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; /** * @Description : @@ -145,6 +146,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable { private Integer noticeSign = 10; @Transient + @ApiParam("创建时间") + private String cdtTruncated; + + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java new file mode 100644 index 0000000..4c4035b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import lombok.Data; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/19 15:02 + * @desc + */ +@Data +public class JisaJphReportModel { + + private Double jphVal; + + private Map detailsMap; + +} From bf416281140f177eb7bc658a5e023e4d3a91647b Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 20 Oct 2020 10:32:15 +0800 Subject: [PATCH 244/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E5=87=86=E8=B4=A8=E6=A3=80=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=B5=AE=E7=82=B9=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E4=B8=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index acce643..15d26d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -221,10 +221,10 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; - @Column(name = "STD_CHECK_TIME") + @Column(name = "STD_CHECK_TIME", columnDefinition = "decimal(10,2)") @ApiParam(value = "标准质检时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Integer stdCheckTime; + private Double stdCheckTime; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") From e268ed86a999d89a604973f73189fbf7e0465cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 20 Oct 2020 15:30:49 +0800 Subject: [PATCH 245/329] =?UTF-8?q?=E3=80=9011934=2019081-=E5=B7=A5?= =?UTF-8?q?=E4=BD=8DBOM=E4=B8=AD=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E5=92=8C=E5=B7=A5=E4=BD=8D=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6-20201020=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/MesProduceSn.java | 12 ++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 ++ 2 files changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 4cd5e8a..c14092e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -217,6 +217,18 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + @Transient + @ApiParam("缺陷代码") + private String defectCode; + + @Transient + @ApiParam("缺陷名称") + private String defectName; + + @Transient + @ApiParam("维修状态") + private Integer repairStatus; + public MesProduceSn() { } 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 9b7067b..5e60a3c 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 @@ -783,6 +783,8 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(stationBom, organizeCode); DdlPreparedPack.getStringLikerPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(stationBom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); return packBean; } From 627e8ac215c899f1017aeda7fd0432c73a070fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 20 Oct 2020 16:04:39 +0800 Subject: [PATCH 246/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF=E7=9B=B8=E5=85=B3=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesBoardMafactAssessment.java | 118 +++++++++++++++++++++ .../MesBoardMafactAssessmentRepository.java | 14 +++ 2 files changed, 132 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java new file mode 100644 index 0000000..f909fde --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java @@ -0,0 +1,118 @@ +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 : adair + * @CreateDate : 2020-10-19 17:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_BOARD_MAFACT_ASSESSMENT") +@Api("MES_看板麦格纳评定项") +public class MesBoardMafactAssessment extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7260899228359202210L; + + @Column(name="BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name="ENG_ADV_QUALITY") + @ApiParam("ENG_ADV_QUALITY") + private String engAdvQuality; + + @Column(name="MANAGEMENT") + @ApiParam("MANAGEMENT") + private String manageMent; + + @Column(name="MAT_LOG_SUP") + @ApiParam("MAT_LOG_SUP") + private String matLogSup; + + @Column(name="MFG_EXC") + @ApiParam("MFG_EXC") + private String mfgExc; + + @Column(name="QUALITY") + @ApiParam("QUALITY") + private String quality; + + @Column(name = "EHS") + @ApiParam("EHS") + private String ehs; + + @Column(name = "COST") + @ApiParam("COST") + private String cost; + + @Column(name = "HR") + @ApiParam("HR") + private String hr; + + @Column(name = "JAN") + @ApiParam("JAN") + private String jan; + + @Column(name = "FEB") + @ApiParam("FEB") + private String feb; + + @Column(name = "MAR") + @ApiParam("MAR") + private String mar; + + @Column(name = "APR") + @ApiParam("APR") + private String apr; + + @Column(name = "MAY") + @ApiParam("MAY") + private String may; + + @Column(name = "JUN") + @ApiParam("JUN") + private String jun; + + @Column(name = "JUL") + @ApiParam("JUL") + private String jul; + + @Column(name = "AUG") + @ApiParam("AUG") + private String aug; + + @Column(name = "SEP") + @ApiParam("SEP") + private String sep; + + @Column(name = "OCT") + @ApiParam("OCT") + private String oct; + + @Column(name = "NOV") + @ApiParam("NOV") + private String nov; + + @Column(name = "DEC") + @ApiParam("DEC") + private String dec; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java new file mode 100644 index 0000000..511a124 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.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.MesBoardMafactAssessment; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:33 + * @Modify: + **/ +public interface MesBoardMafactAssessmentRepository extends BaseRepository { +} From 66c55386eeffc65b130877011b387b2c48a70cdd Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 20 Oct 2020 18:41:38 +0800 Subject: [PATCH 247/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsweb=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index e18520b..90a1736 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.sweb.bean.*; import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; import org.apache.commons.lang3.StringUtils; +import java.util.ArrayList; import java.util.List; /** @@ -66,6 +67,32 @@ public class SwebHqlPack { return buildHql(purchaseOrder, result); } + public static DdlPackBean getPurchaseOrderForSnPrintWhereHql(SwebPurchaseOrder purchaseOrder, List vendorNos) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); + if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) { + DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); + } else { + DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + } + if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { + DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), + purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); + } + + List poStatus = new ArrayList<>(); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue()); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue()); + poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue()); + //poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue()); + DdlPreparedPack.getInPackList(poStatus, "poStatus", result); + + DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(purchaseOrder, result); + } + public static DdlPackBean getPackageWhereHql(SwebPackage swebPackage) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result); From 4ca43f81cca72f4e273efe7ed7368c0d03984100 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 21 Oct 2020 09:24:50 +0800 Subject: [PATCH 248/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3JIS=E5=8F=91=E8=BF=90=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 5 +++++ .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 26 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 5 +++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 12 +++++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 9 ++++++++ 5 files changed, 56 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index 2ea88ea..bf65f0b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -70,4 +70,9 @@ public class BasCustomer extends BaseBean { @ApiParam(value = "传真") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custFax; + + @Column(name = "SAFETY_STOCK") + @ApiParam(value = "safetyStock") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private Double safetyStock; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 398154c..935bcc4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -197,6 +197,20 @@ public class WmsDocFgDetail extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PRODUCT_STATUS.class, refForeignKey = "value", value = "description") private Integer productStatus; + @Column(name = "CURRENT_SEQ") + @ApiParam(value = "当前序号") + private Integer currentSeq; + + @Column(name = "MAX_SEQ") + @ApiParam(value = "最大序号") + private Integer maxSeq; + + @Column(name = "RC_TIME") + @ApiParam(value = "接收时间") + private String rcTime; + + + public WmsDocFgDetail(String jisNo) { this.jisNo = jisNo; @@ -205,6 +219,18 @@ public class WmsDocFgDetail extends BaseBean { public WmsDocFgDetail() { } + public WmsDocFgDetail(String jisNo, String queueGroupNo, String processTime, Integer temp) { + this.jisNo = jisNo; + this.queueGroupNo = queueGroupNo; + this.processTime = processTime; + } + + public WmsDocFgDetail(String jisNo, String sn) { + this.jisNo = jisNo; + this.sn = sn; + } + + public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) { this.sn = sn; this.mfgLocNo = mfgLocNo; 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 c3f8106..d82174b 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 @@ -177,6 +177,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; + @Column(name = "REF_SN") + @ApiParam("关联条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refSn; + @Column(name = "GROUP_NO") @ApiParam("分组号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 7f47f40..7d51f82 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -10,7 +10,12 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -187,8 +192,13 @@ public class WmsMoveMaster extends BaseBean { @Transient @ApiParam("交易类型集合") + private List filterTransTypeCodeList; + + @Transient + @ApiParam("交易类型集合") private List transTypeCodeList; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") 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 e9b0b82..8772b84 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 @@ -268,6 +268,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("委外收货时间") public String rcDatetime; + @Transient + @ApiParam("条码数量") + public Integer snCount; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } @@ -409,4 +413,9 @@ public class WmsMoveSn extends BaseBean { this.transTypeName = transTypeName; this.itemStatus = itemStatus; } + + public WmsMoveSn(Integer snCount, String createDatetime) { + this.snCount = snCount; + this.createDatetime = createDatetime; + } } From ceb882cef4dfcb26daeaa5844ac16f3b8be6c097 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 21 Oct 2020 12:31:33 +0800 Subject: [PATCH 249/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5MGN=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index bf65f0b..344757d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -72,7 +72,7 @@ public class BasCustomer extends BaseBean { private String custFax; @Column(name = "SAFETY_STOCK") - @ApiParam(value = "safetyStock") + @ApiParam(value = "安全库存") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Double safetyStock; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index f65a06b..bc69da7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -198,6 +198,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("结束时间") private String planEndDate; + @Transient + @ApiParam("erp单号") + private String erpSrcNo; + /** * 状态:1=新建,10=收货中,20=收货完成, @@ -274,9 +278,10 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String partNo, Double qty, + public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; + this.erpSrcNo = erpSrcNo; this.partNo = partNo; this.qty = qty; this.rcQty = rcQty; From 525cda27684f0f59315f3362cbcbb836353243d8 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 21 Oct 2020 14:12:43 +0800 Subject: [PATCH 250/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 34c8f2b..d350c54 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 @@ -170,6 +170,18 @@ public class MesPackage extends BaseBean implements Serializable { public MesPackage() { } + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getQty2Val() { + return this.qty2 == null ? 0.0d : this.qty2; + } + + public double getPackSpecQtyVal() { + return this.packSpecQty == null ? 0.0d : this.packSpecQty; + } + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { this.packageNo = packageNo; this.partNo = partNo; From b00bcf66b265cd2ce22b44ab80365e673095c9b7 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 21 Oct 2020 16:30:47 +0800 Subject: [PATCH 251/329] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) 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 26bda1b..11112c7 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 @@ -5836,4 +5836,39 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 图片展示类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IMG_DISPLAY_TYPE { + STEP(10, "按工步显示"), + WORK_CELL(20, "按工位显示"); + + private Integer value; + private String description; + + IMG_DISPLAY_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 3e629e63c5f515205ed1b40be933ab2f77b9b45e Mon Sep 17 00:00:00 2001 From: songss Date: Wed, 21 Oct 2020 16:32:41 +0800 Subject: [PATCH 252/329] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E9=AA=8C=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) 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 26bda1b..c8795a6 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 @@ -5836,4 +5836,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 控制计划审核状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONTROL_PLAN_AUDIT_TYPE { + WAIT_AUDIT(10, "待审核"), + AUDIT_PASS(20, "审核通过"), + AUDIT_NON_PASS(30, "审核驳回"); + + private int value; + private String description; + + CONTROL_PLAN_AUDIT_TYPE(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; + } + } } From b70a58ba7d9a98d391297d93dfab8ad9362cac27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 22 Oct 2020 11:12:36 +0800 Subject: [PATCH 253/329] =?UTF-8?q?=E3=80=902867=2010=202.3.9=20=E8=BF=94?= =?UTF-8?q?=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=89=B9=E9=87=8F=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 70fab83..6cad2bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -93,6 +93,20 @@ public class MesBom extends BaseBean implements Serializable { @ApiParam(value = "已拆解数量") public Double scrapQty = 0d; + @Transient + @ApiParam("合格数") + private Double okQty = 0d; + + @Transient + @ApiParam("缺失数") + private Double missQty = 0d; + + @Transient + @ApiParam("报废数") + private Double wasteQty = 0d; + + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 2301e03c85a8ac9bb79de5b237b1982de765043d Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Thu, 22 Oct 2020 13:01:01 +0800 Subject: [PATCH 254/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=91=BC=E5=8F=AB?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=BC=B9=E7=AA=97=E7=9A=84=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 9571391..8705fb6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -80,10 +80,11 @@ public class AndonEnumUtil { /** - * 状态点界面编号 + * 状态点界面编号--此部分枚举后续要创建一个表存储。 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ROUTE_STATUS_INTERFACE_NO { + DEFAULT_ALARM_CALL("DEFAULT_ALARM_CALL", "默认呼叫无界面"), EQUMENT_ALARM_CALL("EQUMENT_ALARM_CALL", "设备呼叫弹框界面"), QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"), PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"), From 17d47fdc55b54f8ad4d21a1f14272a0ef5acc409 Mon Sep 17 00:00:00 2001 From: songss Date: Thu, 22 Oct 2020 14:43:40 +0800 Subject: [PATCH 255/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E7=9C=8B=E6=9D=BF=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=88=AA-?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E6=A6=82=E5=86=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesBoardImage.java | 44 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesBoardSwitchCfg.java | 44 ++++++++++++++++++++++ .../mes/model/MesBoardWorkCenterOverviewModel.java | 34 +++++++++++++++++ .../mes/repository/MesBoardImageRepository.java | 14 +++++++ .../repository/MesBoardSwitchCfgRepository.java | 14 +++++++ 5 files changed, 150 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.java new file mode 100644 index 0000000..2d1b94f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.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; + +/** + * @Description: + * @CreateDate: 2020/10/13 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_IMAGE") +@Api("MES_看板图片") +public class MesBoardImage extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3757764185082659130L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "IMAGE_URL") + @ApiParam("图片路径") + private String imageUrl; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java new file mode 100644 index 0000000..be79660 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.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; + +/** + * @Description: + * @CreateDate: 2020/10/13 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SWITCH_CFG") +@Api("MES_看板切换配置") +public class MesBoardSwitchCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -9101785840595985385L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "SWITCH_INTERRVAL") + @ApiParam("屏切换频次") + private Integer switchInterrval; + + @Column(name = "LINE_SWITCH_INTERRVAL") + @ApiParam("产线切换频次") + private Integer lineSwitchInterrval; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java new file mode 100644 index 0000000..7a558d5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 中航-产线概况-产线概况 + * @CreateDate: 2020/10/19 + * @Author: simon.song + */ +@Data +public class MesBoardWorkCenterOverviewModel { + @ApiParam("看板代码") + private String boardCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @ApiParam("图片路径") + private String imageUrl; + + @ApiParam("工单列表") + List workOrderList; + + @ApiParam("班组列表") + List shiftGroupList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.java new file mode 100644 index 0000000..ff339e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.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.MesBoardImage; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @CreateDate: 2020/10/13 + * @Author: simon.song + */ +@Repository +public interface MesBoardImageRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.java new file mode 100644 index 0000000..a682ca2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.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.MesBoardSwitchCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @CreateDate: 2020/10/13 + * @Author: simon.song + */ +@Repository +public interface MesBoardSwitchCfgRepository extends BaseRepository { +} From bb3039d1f2a77db9e18837581184560e7b092175 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 22 Oct 2020 15:15:43 +0800 Subject: [PATCH 256/329] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=9D=E8=B4=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 33 ++++++++++++ .../mes/model/MgnPackageSnTraceReportModel.java | 62 ++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index a3bc65a..a0e0dde 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,39 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_IS_SEALED { + + UNSEALED(1, "未封箱"), + SEALED(2, "已封箱"); + + private int value; + private String description; + + PACKAGE_IS_SEALED(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; + } + } + /** * MES_SPC关键数据 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java new file mode 100644 index 0000000..ad4b799 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MgnPackageSnTraceReportModel { + + @ApiParam("箱条码") + private String packageNo; + + @ApiParam("托条码") + private String packageNo2; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料编号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam("是否封箱") + private Integer isSealed; + + @ApiParam("是否封箱名称") + private String isSealedName; + + @ApiParam(value = "工厂") + public String organizeCode; + + @ApiParam(value="修改日期查询用，查询起始日期") + public String createDateTimeStart; + + @ApiParam(value = "修改日期查询用，查询结束日期") + public String createDateTimeEnd; + + public MgnPackageSnTraceReportModel() { + } + + public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName) { + this.packageNo = packageNo; + this.packageNo2 = packageNo2; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.isSealed = isSealed; + this.createDatetime = createDatetime; + this.workCenterCode = workCenterCode; + this.workCenterName = workCenterName; + } +} From 9002bdc936eafff3ec01b3ea4e2236082361b0b7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 22 Oct 2020 17:20:54 +0800 Subject: [PATCH 257/329] =?UTF-8?q?=E9=A2=84=E8=A3=85=E9=98=9F=E5=88=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 20308b4..831d8c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -200,5 +200,24 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.workType = workType; this.orderNo = orderNo; } + public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, + Integer queueType,Integer status,String createUser, + String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo, + String workCenterCode, String workCellCode) { + this.seq = seq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.boxQty = boxQty; + this.queueType = queueType; + this.status = status; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.workType = workType; + this.orderNo = orderNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + } } From 6826f04b97f6042454d08e6a51bbc6a0efc6014a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 22 Oct 2020 18:00:28 +0800 Subject: [PATCH 258/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 6 ++++++ .../cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index fca607d..8754eae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -23,4 +23,10 @@ public class MgnBoardListModel { @ApiParam("计划完成率") private String planCompleteRate; + @ApiParam("异常数量") + private Integer exceptQty; + + @ApiParam("正常数量") + private Integer normalQty; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java index d608e9c..0f8794f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java @@ -45,4 +45,10 @@ public class OperateObjectParamModel { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam(value = "安灯状态代码") + private String statusCode; + + @ApiParam("设备状态集合") + private List objectParamModelList; + } From ba81af744bdd6d02531fe8c8aa1f89b80d5966e1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 22 Oct 2020 20:50:07 +0800 Subject: [PATCH 259/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 18 ++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java | 6 ++++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index dc2fbac..58ebed3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -9005,7 +9005,8 @@ public class WmsEnumUtil { FINISH(10, "已完成(绿色)"), OVER_TIME(20, "已超时（红色）"), UNRECEIVED(30, "未收货（蓝色）"), - VARIANT(40, "有差异（黄色）"); + VARIANT(40, "有差异（黄色）"), + NORMAL(50, "正常（白色）"); private int value; private String description; 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 4ea43ea..22badef 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 @@ -415,6 +415,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("箱数") private Double boxQty; + @Transient + @ApiParam("窗口领料开始时间") + private String windowPickStartTime; + + @Transient + @ApiParam("窗口领料结束时间") + private String windowPickEndTime; + public WmsDocMovementDetails () { } @@ -542,4 +550,14 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.boxQty = boxQty; this.srcLocateNo = srcLocateNo; } + + public WmsDocMovementDetails(String orderNo, Integer orderStatus, Double qty, Double pickQty, String modifyDatetime, String planTime) { + this.orderNo = orderNo; + this.orderStatus = orderStatus; + this.qty = qty; + this.pickQty = pickQty; + this.modifyDatetime = modifyDatetime; + this.planTime = planTime; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index d6123bd..3a7411e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -354,6 +354,7 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("目标库位代码") public String destLocateNo; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java index 40f637d..0e4d99f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 班次表 @@ -51,4 +52,9 @@ public class WmsShift extends BaseBean{ @ApiParam("结束时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) private String endTime; + + @Transient + @ApiParam("结束时间&结束时间") + private boolean startTimeAndEndTime; + } \ No newline at end of file From c965a342366947448b0a47dd9b61be12e603395a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 22 Oct 2020 21:07:57 +0800 Subject: [PATCH 260/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) 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 e686c57..bce0e9d 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 @@ -48,7 +48,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } - DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); @@ -2817,7 +2816,10 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result); DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result); - + if (wmsShift.isStartTimeAndEndTime() && !StringUtil.isEmpty(wmsShift.getStartTime())) { + result.setWhereAppend(result.getWhereAppend() + " and model.startTime<='" + wmsShift.getStartTime() + "'"); + result.setWhereAppend(result.getWhereAppend() + " and model.endTime>='" + wmsShift.getStartTime() + "'"); + } getStringBuilderPack(wmsShift, result); return result; @@ -3526,4 +3528,21 @@ public class WmsHqlPack { return result; } + + + /** + * 领料时长分区分页查询条件 + * + * @param wmsPickingWindowTime + * @return + */ + public static DdlPackBean packHqlWmsPickingWindowTime(WmsPickingWindowTime wmsPickingWindowTime) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPickingWindowTime.getShiftNo(), "shiftNo", result); + + getStringBuilderPack(wmsPickingWindowTime, result); + + return result; + } } From 56deedeaf3f7c3616e79f6300b948ccc28bd7bf8 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 22 Oct 2020 21:16:20 +0800 Subject: [PATCH 261/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsPickingWindowTime.java | 79 ++++++++++++++++++++++ .../repository/WmsPickingWindowTimeRepository.java | 17 +++++ 2 files changed, 96 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java new file mode 100644 index 0000000..bcbd957 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 领料时长分区 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-10-21 19:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PICKING_WINDOW_TIME") +@Api("领料时长分区") +public class WmsPickingWindowTime extends BaseBean { + + private static final long serialVersionUID = 9214639813072592714L; + + @Column(name = "SHIFT_NO") + @ApiParam("班次编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String shiftNo; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String endTime; + + @Column(name = "LATEST_END_TIME") + @ApiParam("最晚领料时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String latestEndTime; + + @Transient + @ApiParam("班次开始时间") + private String shiftStartTime; + + @Transient + @ApiParam("班次结束时间") + private String shiftEndTime; + + + public WmsPickingWindowTime() { + } + + public WmsPickingWindowTime(Long id, String shiftNo, String startTime, String endTime, String latestEndTime, String shiftStartTime, String shiftEndTime) { + this.id = id; + this.shiftNo = shiftNo; + this.startTime = startTime; + this.endTime = endTime; + this.latestEndTime = latestEndTime; + this.shiftStartTime = shiftStartTime; + this.shiftEndTime = shiftEndTime; + + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java new file mode 100644 index 0000000..936dfdd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPickingWindowTime; +import org.springframework.stereotype.Repository; + +/** + * @Description :领料时长分区 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-10-21 19:21 + * @Modify: + **/ +@Repository +public interface WmsPickingWindowTimeRepository extends BaseRepository { +} From ed22bd6f649d3c1c3597d921117100ed20921ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 22 Oct 2020 21:28:24 +0800 Subject: [PATCH 262/329] =?UTF-8?q?feat(form):=E5=AD=98=E5=82=A8=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E8=B0=83=E7=94=A8=E9=80=82=E9=85=8Dmysql,mssql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 52 +++++++++++++++++- .../estsh/i3plus/pojo/form/bean/BfDataObject.java | 2 + .../pojo/form/bean/BfDataObjectProperty.java | 5 ++ .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 24 ++++++++ .../pojo/model/form/SqlProcedureColumnModel.java | 64 ++++++++++++++++++++++ 5 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 14ef7d8..b240568 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -17,7 +17,8 @@ public class BlockFormEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FORM_TABLE_TYPE { TABLE(1, "TABLE", "表"), - VIEW(2, "VIEW", "视图"); + VIEW(2, "VIEW", "视图"), + PROCEDURE(3, "PROCEDURE", "存储过程"); private int value; private String code; @@ -2347,4 +2348,53 @@ public class BlockFormEnumUtil { } } + /** + * 存储过程列类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROCEDURE_COL_TYPE { + IN_PARAM(1, "入参"), + INOUT_PARAM(2, "出入参"), +// ?(3, "按钮"), + OUT_PARAM(4, "出参"), + RETURN_PARAM(5, "返回值"); + + private int value; + private String description; + + private PROCEDURE_COL_TYPE (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; + } + + public static PROCEDURE_COL_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index 5d5f78a..917912c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -61,6 +62,7 @@ public class BfDataObject extends BaseBean { @ApiParam(value ="表状态(是否同步)") private Integer objectStatus; + @AnnoOutputColumn(refClass = BlockFormEnumUtil.FORM_TABLE_TYPE.class) @Column(name="OBJECT_TYPE") @ApiParam(value ="数据类型") private Integer objectType; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index c12f8d0..bd99d69 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -52,6 +52,11 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="数据对象列名称") private String objectColumnName; + // 暂用来区分存储过程出入参数信息 + @Column(name="OTHER_COLUMN_TYPE") + @ApiParam(value ="其他列类型") + private Integer otherColumnType; + @Column(name="OBJECT_COLUMN_TYPE") @ApiParam(value ="数据对象类型") private Integer objectColumnType; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 29d0044..3dcf892 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -72,18 +72,34 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否新增") private Integer isObjectAdd; + public boolean isObjectAdd(){ + return isObjectAdd != null && isObjectAdd == BlockFormEnumUtil.ELEMENT_ADD_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_EDIT") @ApiParam(value = "是否编辑") private Integer isObjectEdit; + public boolean isObjectEdit(){ + return isObjectEdit != null && isObjectEdit == BlockFormEnumUtil.ELEMENT_EDIT_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_DEL") @ApiParam(value = "是否删除") private Integer isObjectDel; + public boolean isObjectDel(){ + return isObjectDel != null && isObjectDel == BlockFormEnumUtil.ELEMENT_DEL_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_DEL_WEAK") @ApiParam(value = "是否弱删除") private Integer isObjectDelWeak; + public boolean isObjectDelWeak(){ + return isObjectDelWeak != null && isObjectDelWeak == BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.ON.getValue(); + } + public Integer getIsObjectDelWeakVal(){ return isObjectDelWeak == null ? BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.OFF.getValue() : isObjectDelWeak.intValue(); } @@ -100,6 +116,10 @@ public class BfElement extends BaseBean { return isObjectValid == null ? BlockFormEnumUtil.ELEMENT_VALID_STATUS.OFF.getValue() : isObjectValid.intValue(); } + public boolean isObjectValid(){ + return isObjectValid != null && isObjectValid == BlockFormEnumUtil.ELEMENT_VALID_STATUS.ON.getValue(); + } + @Column(name = "ELEMENT_VALID_ATTR_ID") @ApiParam(value = "元素有效属性id") private Long elementValidAttrId; @@ -112,6 +132,10 @@ public class BfElement extends BaseBean { return isOrganizeIsolation == null ? BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.OFF.getValue() : isOrganizeIsolation.intValue(); } + public boolean isOrganizeIsolation(){ + return isOrganizeIsolation != null && isOrganizeIsolation == BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.ON.getValue(); + } + @Column(name = "IS_OBJECT_EXPORT") @ApiParam(value = "是否导出") private Integer isObjectExport; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java new file mode 100644 index 0000000..ece72ff --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.model.form; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 存储过程列模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-10-21 19:00 + * @Modify: + **/ +@Data +public class SqlProcedureColumnModel { + + @ApiParam(value = "过程") + private String procedureCat; + + @ApiParam(value = "过程方案") + private String procedureSchem; + + @ApiParam(value = "过程名称") + private String procedureName; + + @ApiParam(value = "列名") + private String columnName; + + /** + * 1是入参 + * 2是出入参 + * 3是？ + * 4是出参 + * 5是返回值（函数） + */ + @ApiParam(value = "列类型") + private Integer columnType; + + @ApiParam(value = "数据类型") + private Integer dataType; + + @ApiParam(value = "数据类型名称") + private String typeName; + + @ApiParam(value = "长度") + private Integer length; + + @ApiParam(value = "精度") + private Integer scale; + + @ApiParam(value = "是否允许为空") + private Integer nullable; + + @ApiParam(value = "备注") + private String remarks; + + /** + * 0为返回值 + * 1为首位 + */ + @ApiParam(value = "顺序位置") + private Integer ordinalPosition; + + +} From 4c86b836cad481fef16bb12e838ef45471884898 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 22 Oct 2020 22:01:05 +0800 Subject: [PATCH 263/329] =?UTF-8?q?OP20b=E9=80=BB=E8=BE=91=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=20esop=E5=B1=95=E7=A4=BA=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 26 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationResultBean.java | 3 +++ 2 files changed, 29 insertions(+) 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 11112c7..5663ffd 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 @@ -5871,4 +5871,30 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 工位线程类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PCN_THREAD_TYPE { + STEP(10, "跟随工步线程"), + PROCESS(20, "跟随工序线程"), + MODULE(30, "跟随展示组件线程"); + + private Integer value; + private String description; + + PCN_THREAD_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java index 5edd9e4..56c5b39 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -51,6 +51,9 @@ public class StationResultBean implements Serializable { @ApiParam("图片路径") private String imageUrl; + @ApiParam("图片路径") + private List imageUrls; + @ApiParam("多个数据集") private List> stationResultBeans; From 505de36ca5c3e49ec7d133215d0ca3045bf5a765 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 23 Oct 2020 11:23:42 +0800 Subject: [PATCH 264/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9SWeb=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 15d26d2..94e14e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -216,7 +216,7 @@ public class WmsPart extends BaseBean { isRequire = 2, dataSrc = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") private String productLines; - @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") + @Column(name = "PROPORTION", columnDefinition = "decimal(10,8)") @ApiParam(value = "待质检比例", example = "1") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; From 051417c10e50fbb4cef11d00aca5af3455b72c75 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 23 Oct 2020 13:57:11 +0800 Subject: [PATCH 265/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java index bcbd957..1e157b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java @@ -61,6 +61,16 @@ public class WmsPickingWindowTime extends BaseBean { @ApiParam("班次结束时间") private String shiftEndTime; + @Transient + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + + + public WmsPickingWindowTime() { } From 8c4ae6ff342b4fe0e2337ed30229ae1230026dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 23 Oct 2020 17:51:10 +0800 Subject: [PATCH 266/329] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2893,2894?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 6 +++- .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 39 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 4 +++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index bb34224..3010027 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -278,8 +278,8 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("物料编号") public String partNo; - @ApiParam(value = "标题") @Transient + @ApiParam(value = "标题") public String title; @Transient @@ -346,6 +346,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("目标库位代码") public String destLocateNo; + @Transient + @ApiParam("查询状态集合") + public List orderStatusList; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 47d5248..b8df6db 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 库位物料表 @@ -87,6 +88,26 @@ public class WmsLocatePart extends BaseBean { @ApiParam("库位类型") private Integer locateType; + @Transient + @ApiParam("库位类型") + private List locateTypeList; + + @Transient + @ApiParam("物料类型") + private List partTypeList; + + @Transient + @ApiParam(value = "存储区") + private String zoneNo; + + @Transient + @ApiParam(value = "仓库") + private String whNo; + + @Transient + @ApiParam(value = "库存单位") + private String stockUnit; + public Double getMin() { return this.min == null ? 0 : this.min; } @@ -107,5 +128,23 @@ public class WmsLocatePart extends BaseBean { return this.min ==null?0:this.min.doubleValue(); } + public WmsLocatePart() { + } + public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double min, + Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo, + String stockUnit) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.pullQty = pullQty; + this.max = max; + this.min = min; + this.isGeneratePicklist = isGeneratePicklist; + this.safetyStock = safetyStock; + this.moq = moq; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.stockUnit = stockUnit; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index e92e884..abd240f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -86,6 +86,10 @@ public class WmsSerialSnTrans extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isOk; + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + @Transient @ApiParam("操作类型") private List transTypeLst; From 82a769cae10ed6fa05723f9e5dfbe8ab833340cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 23 Oct 2020 18:04:22 +0800 Subject: [PATCH 267/329] =?UTF-8?q?=E3=80=9012040=2019073-=E5=AE=89?= =?UTF-8?q?=E7=81=AFBI=E7=95=8C=E9=9D=A2=E4=B8=AD=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=97=B6=E9=95=BF=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=97=B6=E9=95=BF=E4=B8=BA-3290=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=9C=A8=E6=A8=AA=E5=9D=90=E6=A0=87=E7=9A=84=E4=B8=8B=E6=96=B9?= =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98-20201026=E3=80=91=202887=2010=202.3?= =?UTF-8?q?.7=E5=AE=89=E7=81=AF=E9=80=9A=E7=9F=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java index e35260e..75ffc78 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java @@ -180,4 +180,8 @@ public class BaseManageQueue extends BaseBean implements Serializable { @Column(name = "ALARM_DETAIL_CODE") @ApiParam(value = "安灯子类型代码") public String alarmDetailCode; + + @Column(name = "MEMO") + @ApiParam(value = "备注") + public String memo; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 9571391..e427ce2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -457,7 +457,8 @@ public class AndonEnumUtil { ALARM_DETAIL("{H}","alarmDetailCode","安灯子类型"), ALARM_DETAIL_NAME("{L}","alarmDetailNameRdd","安灯子类型名称"), AC_CODE("{J}","acCode","事件描述代码"), - AC_NAME("{K}","acNameRdd","事件描述名称"); + AC_NAME("{K}","acNameRdd","事件描述名称"), + MEMO("{M}","MEMO","备注"); private String value; private String code; From 63a06fcc274a856784765523a34eb5f5efa2b933 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 23 Oct 2020 19:21:03 +0800 Subject: [PATCH 268/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AB=AF=E7=99=BB=E5=BD=95=E5=8F=8A=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AB=AF=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/sweb/bean/SwebMovementToWms.java | 99 ----------------- .../estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java | 118 --------------------- .../estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java | 97 ----------------- .../estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java | 46 -------- .../repository/SwebMovementToWmsRepository.java | 9 -- .../sweb/repository/SwebPoToWmsRepository.java | 9 -- .../sweb/repository/WmsPoToSwebRepository.java | 9 -- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 18 ++-- 8 files changed, 9 insertions(+), 396 deletions(-) delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java deleted file mode 100644 index 7acd947..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebMovementToWms.java +++ /dev/null @@ -1,99 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.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; -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.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "SWEB_MOVEMENT_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class SwebMovementToWms extends BaseBean { - private static final long serialVersionUID = -8089219927352225317L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name = "ITEM") - @ApiParam("行号") - public String item; - - @Column(name = "VENDOR_NO") - @ApiParam(value = "供应商编号") - private String vendorNo; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - - @Column(name = "SRC_WH_NO") - @ApiParam("源仓库代码") - public String srcWhNo; - - @Column(name = "DEST_ZONE_NO") - @ApiParam("目标存储区代码") - public String destZoneNo; - - /** - * 移动类型:IN=入库,OUT=出库,MOVE=移库 - */ - @Column(name = "MOVE_TYPE") - @ApiParam("移动类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description") - public Integer moveType; - /** - * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, - * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 - */ - @Column(name = "BUSI_TYPE") - @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - public Integer busiType; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java deleted file mode 100644 index 493338b..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoSnToWms.java +++ /dev/null @@ -1,118 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.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.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-06-10 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "SWEB_PO_SN_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class SwebPoSnToWms extends BaseBean { - - private static final long serialVersionUID = 746409789382994374L; - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; - - @ApiParam("供应商名称") - @Column(name = "VENDOR_NAME") - private String vendorName; - - @Column(name = "PART_NO") - @ApiParam(value = "零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam(value = "零件名称") - private String partName; - - @ApiParam("零件类型") - @Column(name = "PART_TYPE") - private Integer partType; - - @ApiParam(value = "单位") - @Column(name = "UNIT") - private String unit; - - @Column(name = "BOX_QTY") - @ColumnDefault("0") - @ApiParam(value = "箱数", example = "0") - private Integer boxQty; - - @Column(name = "SERIAL_NO") - @ApiParam(value = "序列号") - private String serialNo; - - @Column(name = "SN") - @ApiParam(value = "箱条码") - private String sn; - - @Column(name = "ERP_WAREHOUSE") - @ApiParam("库存地") - private String erpWarehouse; - - @Column(name = "PRODUCTION_TIME") - @ApiParam(value = "产生时间") - private String productionTime; - - @Column(name = "PRINT_TIME") - @ApiParam(value = "打印时间") - private String printTime; - - @Column(name = "PRINTS") - @ApiParam("打印次数") - private Integer prints; - - @Column(name = "CHECK_CODE") - @ApiParam(value = "检验编号") - private String checkCode; - - @Column(name = "STOVE_NO") - @ApiParam(value = "特殊批号") - private String stoveNo; - - @Column(name = "BATCH_NO") - @ApiParam(value = "批次号") - private String batchNo; - - @ApiParam("是否同步") - @Column(name = "IS_SYN") - private String isSyn; - - @Column(name = "REC_TIME") - @ApiParam(value = "收货时间") - private String recTime; - - @Column(name = "PACKAGE_NO") - @ApiParam(value = "包装编号") - private String packageNo; - - @ColumnDefault("0") - @Column(name = "WEIGHT") - @ApiParam(value = "重量") - private Double weight; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java deleted file mode 100644 index 65babf1..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPoToWms.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.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.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "SWEB_PO_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class SwebPoToWms extends BaseBean { - - private static final long serialVersionUID = -3999194389200855165L; - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name = "VERSION") - @ApiParam("版本") - public String version; - - @Column(name = "ITEM") - @ApiParam("行号") - private Integer item; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) - @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") - private Double qty; - - @Column(name = "VENDOR_NO") - @ApiParam("供应商") - private String vendorNo; - - @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false) - @ColumnDefault("0") - @ApiParam(value = "条码打印数量", example = "0") - private Double printQty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "PLAN_DATE") - @ApiParam("计划交货日期") - private String planDate; - - @Column(name = "PLAN_TIME") - @ApiParam("计划交货时间") - private String planTime; - - @Column(name = "ERP_AREA_NO") - @ApiParam("默认收货库存地") - private String erpAreaNo; - - @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam("标准包装") - private Double snp; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java deleted file mode 100644 index 4ec038f..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsPoToSweb.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.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 : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_PO_TO_SWEB") -@Api("库存移动单处理成功后的记录") -public class WmsPoToSweb extends BaseBean { - private static final long serialVersionUID = 4710841067412420270L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java deleted file mode 100644 index 6059cb8..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebMovementToWmsRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.SwebMovementToWms; -import org.springframework.stereotype.Repository; - -@Repository -public interface SwebMovementToWmsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java deleted file mode 100644 index 4fea058..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPoToWmsRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.SwebPoToWms; -import org.springframework.stereotype.Repository; - -@Repository -public interface SwebPoToWmsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java deleted file mode 100644 index 419d43c..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsPoToSwebRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.WmsPoToSweb; -import org.springframework.stereotype.Repository; - -@Repository -public interface WmsPoToSwebRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 90a1736..1b9d541 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -30,7 +30,7 @@ public class SwebHqlPack { * @param hqlStr * @return */ - private static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) { + public static DdlPackBean buildHql(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); @@ -212,14 +212,14 @@ public class SwebHqlPack { return buildHql(details, result); } - public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) { - DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result); - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); - return buildHql(master, result); - } +// public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) { +// DdlPackBean result = new DdlPackBean(); +// DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result); +// DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result); +// DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result); +// DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); +// return buildHql(master, result); +// } public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) { DdlPackBean result = new DdlPackBean(); From 97be3f186a69da062b67d8b1ece3111f7320a9e6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 24 Oct 2020 00:21:54 +0800 Subject: [PATCH 269/329] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=98=E6=9B=B4=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java index 83c05f9..bfeb9d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java @@ -43,6 +43,10 @@ public class MesWorkStartCache extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; + @Column(name = "PAUSE_TIME") + @ApiParam("暂停时间") + private String pauseTime; + @Column(name = "ACTUAL_START_TIME") @ApiParam("实际启动时间") private String actualStartTime; From 6907ab6dc0e7c559d747fd769133ebd049c2e4cd Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 24 Oct 2020 14:02:24 +0800 Subject: [PATCH 270/329] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=9C=8B=E6=9D=BF=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java | 7 +++++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index ca619c2..5a6f7f2 100755 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -26,6 +26,8 @@ public class WmsJobParamModel implements Serializable { private Integer pageSize;//数据条数 private Integer isCheckSn;//是否检查条码存在 private Integer erpSyncFlag;//查询SHIPPING表的条件 + private String filterZoneNos;//过滤存储区 + private String zoneNos;//存储区 public int getMinuteDiffVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java index 1e157b4..1cad321 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingWindowTime.java @@ -75,7 +75,7 @@ public class WmsPickingWindowTime extends BaseBean { public WmsPickingWindowTime() { } - public WmsPickingWindowTime(Long id, String shiftNo, String startTime, String endTime, String latestEndTime, String shiftStartTime, String shiftEndTime) { + public WmsPickingWindowTime(Long id, String shiftNo, String startTime, String endTime, String latestEndTime, String shiftStartTime, String shiftEndTime, String createDatetime, String modifyDatetime, Integer isDeleted, Integer isValid) { this.id = id; this.shiftNo = shiftNo; this.startTime = startTime; @@ -83,7 +83,10 @@ public class WmsPickingWindowTime extends BaseBean { this.latestEndTime = latestEndTime; this.shiftStartTime = shiftStartTime; this.shiftEndTime = shiftEndTime; - + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.isDeleted = isDeleted; + this.isValid = isValid; } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java index ed602bf..0783140 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullRule.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description 拉动规则实体 @@ -48,4 +49,8 @@ public class WmsPullRule extends BaseBean { @ApiParam(value = "尾数计算方式", example = "0") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TAIL_QTY_MODE") private Integer tailQtyMode; + + @Transient + @ApiParam(value = "通过存储区物料获取物流路线") + private boolean routingbyZonePartDisAble; } From f6ad2824b2590d0baac91b6b3209177582ebcda1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 24 Oct 2020 18:51:30 +0800 Subject: [PATCH 271/329] =?UTF-8?q?=2011984=2019048-=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E6=8A=A5=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5-20201020?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 7582002..fce6b31 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -375,6 +375,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("行颜色") private String rowColor; + @Transient + @ApiParam("一检数量") + private Integer endCheckQty; + + @Transient + @ApiParam("终检数量") + private Integer finalInspectionQty; + + @Transient + @ApiParam("已报工数量") + private Integer productOffLineQty; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 3de97d5b98d7acf42803e674cc7fc5bd278c2d1c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 26 Oct 2020 11:38:31 +0800 Subject: [PATCH 272/329] =?UTF-8?q?=E5=8C=97=E4=BA=ACMGN=E7=B3=BB=E5=88=97?= =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java index c5a9443..694ebfc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java @@ -37,7 +37,7 @@ public class WmsQCStatusModel { @ApiParam("计划质检完成时间") private String planCompleteTime; - @ApiParam("实际质检完成实际") + @ApiParam("实际质检完成时间") private String actualCompleteTime; @ApiParam("状态") From 1037ad6e6896e062e40055706aaa0942ce0fc063 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 26 Oct 2020 12:47:50 +0800 Subject: [PATCH 273/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 - 1 file changed, 1 deletion(-) 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 01ba990..726dc1b 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 @@ -748,7 +748,6 @@ public class WmsHqlPack { //单据来源 DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result); getStringBuilderPack(wmsShipping, result); - getStringBuilderPack(wmsShipping, result); return result; } From a8cdba48c39c81da859c17562989501472b475dc Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 26 Oct 2020 13:38:30 +0800 Subject: [PATCH 274/329] =?UTF-8?q?=E5=90=88=E5=B9=B6Master=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 8ef99a3..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 3751cf9..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a6c1bea..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0a2f9d4..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 2bf0e5c..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 557548a..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index f10cf39..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 34a7337..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 670eb15..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ce2dc01..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index b8c9643..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1d29933..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 284225c..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 7ff16c9..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 353a02b..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b125cee..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index c9d54a9..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 39f1e2f..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index df01041..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 0cfb344..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index ae014e9..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From a9535232459a9a9889fbd4f1109137d608928608 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Mon, 26 Oct 2020 19:38:14 +0800 Subject: [PATCH 275/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20ERP=20=E5=BF=AB?= =?UTF-8?q?=E7=85=A7=E7=9B=B8=E5=85=B3=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/bean/snapshot/erp/WmsErpCOGISnapshot.java | 64 +++++++++++++++ .../wms/bean/snapshot/erp/WmsErpCheckPoint.java | 34 ++++++++ .../bean/snapshot/erp/WmsErpInterfaceSnapshot.java | 68 ++++++++++++++++ .../bean/snapshot/erp/WmsErpStockQuanSnapshot.java | 55 +++++++++++++ .../wms/bean/snapshot/erp/WmsErpTransSnapshot.java | 94 ++++++++++++++++++++++ .../pojo/wms/repository/WmsErpCOGIRepository.java | 9 +++ .../wms/repository/WmsErpStockQuanRepository.java | 9 +++ 7 files changed, 333 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java new file mode 100644 index 0000000..c77e082 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCOGISnapshot.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +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.Index; +import javax.persistence.Table; + +/** + * @Description : ERP COGI快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_COGI_SNAPSHOT", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME"), + @Index(columnList = "MOVE_TYPE") +}) +public class WmsErpCOGISnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095222692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + private String snapshotTime; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private String moveType; + + @Column(name = "KEYIN_TIME") + @ApiParam("录入时间") + private String keyInTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java new file mode 100644 index 0000000..9171ffb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpCheckPoint.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : ERP 数据快照时间 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_CHECK_POINT") +public class WmsErpCheckPoint extends BaseBean { + + private static final long serialVersionUID = 5589607687871639189L; + + @Column(name="SNAPSHOT_TIME", columnDefinition="varchar(225) default ''", nullable=false) + @ApiParam("快照时间") + public String snapshotTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java new file mode 100644 index 0000000..bb1812d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpInterfaceSnapshot.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +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.Index; +import javax.persistence.Table; + +/** + * @Description : ERP 报文接口快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_INTERFACE_SNAPSHOT", indexes = { + @Index(columnList = "SID"), + @Index(columnList = "SENDER"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "RECEIVER"), + @Index(columnList = "SNAPSHOT_TIME") +}) +public class WmsErpInterfaceSnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095333692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "SID") + @ApiParam("业务唯一编号") + public String sid; + + @Column(name = "SENDER") + @ApiParam("发送方") + public String sender; + + @Column(name = "SEND_TIME") + @ApiParam("发出时间") + public String sendTime; + + @Column(name = "RECEIVER") + @ApiParam("接收方") + public String receiver; + + @Column(name = "RECEIVED_TIME") + @ApiParam("接收时间") + public String receivedTime; + + @Column(name = "TRANS_TIME") + @ApiParam("处理时间") + public String transTime; + + @Column(name = "TRANS_STATUS") + @ApiParam("处理状态") + public String transStatus; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java new file mode 100644 index 0000000..ac326b4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpStockQuanSnapshot.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +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.Index; +import javax.persistence.Table; + +/** + * @Description : ERP 库存结余快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_STOCK_QUAN_SNAPSHOT", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME") +}) +public class WmsErpStockQuanSnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095444692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java new file mode 100644 index 0000000..e0a51d0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpTransSnapshot.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean; +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.Index; +import javax.persistence.Table; + +/** + * @Description : ERP 交易快照 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-24 18:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_TRANS_SNAPSHOT", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "AREA_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME"), + @Index(columnList = "MOVE_TYPE") +}) +public class WmsErpTransSnapshot extends SnapshotBean { + private static final long serialVersionUID = -4095555692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "ORDER_NO") + @ApiParam("单据编号") + private String orderNo; + + @Column(name = "YEAR") + @ApiParam("凭证年度") + private String year; + + @Column(name = "ITEM") + @ApiParam("行项目") + private String item; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "AREA_NO") + @ApiParam("库存地点") + private String areaNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private String moveType; + + @Column(name = "KEYIN_TIME") + @ApiParam("录入时间") + private String keyInTime; + + @Column(name = "VENDOR_NO") + @ApiParam("供应商编号") + private String vendorNo; + + @Column(name = "CUSTOMER_NO") + @ApiParam("客户编号") + private String customerNo; + + @Column(name = "AMOUNT") + @ApiParam("金额") + private Double amount; + + @Column(name = "DR_AND_CR") + @ApiParam("借贷标识：H=贷方- S=借方+") + private String drandcr; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java new file mode 100644 index 0000000..114da9d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCOGIRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCOGISnapshot; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpCOGIRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java new file mode 100644 index 0000000..2a767bb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpStockQuanRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpStockQuanSnapshot; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpStockQuanRepository extends BaseRepository { +} From 783022646cbcae5475ffe4d357dbdc5ddef0e280 Mon Sep 17 00:00:00 2001 From: songss Date: Mon, 26 Oct 2020 19:43:45 +0800 Subject: [PATCH 276/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=8A=B6=E6=80=81=E5=9B=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesRealTimeTakt.java | 44 ++++++++++++++++++++++ .../mes/repository/MesRealTimeTaktRepository.java | 14 +++++++ 2 files changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.java new file mode 100644 index 0000000..22508ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRealTimeTakt.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; + +/** + * @Description: + * @CreateDate: 2020/10/26 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_REAL_TIME_TAKT") +@Api("MES_实时节拍") +public class MesRealTimeTakt extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2910474711746286558L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "REAL_TIME_TAKT") + @ApiParam("实时节拍") + private String realTimeTakt; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.java new file mode 100644 index 0000000..765082d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRealTimeTaktRepository.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.MesRealTimeTakt; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @CreateDate: 2020/10/26 + * @Author: simon.song + */ +@Repository +public interface MesRealTimeTaktRepository extends BaseRepository { +} From 62d5d62cef5d58e87c9188bfd6d24eed27f7f75c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 26 Oct 2020 20:32:29 +0800 Subject: [PATCH 277/329] =?UTF-8?q?=E5=8C=97=E4=BA=ACMGN=E7=B3=BB=E5=88=97?= =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 10 +++++++--- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 58ebed3..cdd8873 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4035,7 +4035,7 @@ public class WmsEnumUtil { public enum INVENTORY_DIFFERENCE_TYPE { INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"), INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"), - INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"), + INVENTORY_WIN(30, "INVENTORY_WIN", "盘盈"), INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"), INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘"); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 68abad8..85b257d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -11,7 +11,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -148,7 +152,7 @@ public class WmsCSOrderDetails extends BaseBean { public String[] zoneNos; /** - * 差异类型：10：盘平，20：盘亏，30盘赢 + * 差异类型：10：盘平，20：盘亏，30盘盈 */ @Transient @ApiParam("差异类型") @@ -156,7 +160,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer differenceType; /** - * 差异类型：10：盘平，20：盘亏，30盘赢 + * 差异类型：10：盘平，20：盘亏，30盘盈 */ @Transient @ApiParam("差异集合") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java index 694ebfc..d565516 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java @@ -56,9 +56,9 @@ public class WmsQCStatusModel { private Double proportion; @ApiParam("标准质检时间") - private Integer stdCheckTime; + private Double stdCheckTime; - public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Integer stdCheckTime) { + public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Double stdCheckTime) { this.asnOrderNo = asnOrderNo; this.qcOrderNo = qcOrderNo; this.partNo = partNo; From 4d4ad7ff8470b475c42f88ec518d20b4c7ced3ea Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 27 Oct 2020 09:16:51 +0800 Subject: [PATCH 278/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E6=B3=A8=E5=A1=91?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesBoardLine.java | 78 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java | 49 ++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 11 ++- .../mes/repository/MesBoardLineRepository.java | 15 +++++ .../pojo/mes/repository/MesPlanTaktRepository.java | 14 ++++ 5 files changed, 165 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java new file mode 100644 index 0000000..1bbd48f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE") +@Api("看板产线配置") +public class MesBoardLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 5212593630787939081L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "PLAN_OEE") + @ApiParam("目标OEE") + private Double planOee; + + @Column(name = "PLAN_TAKT") + @ApiParam("计划节拍") + private Integer planTakt; + + @Column(name = "PASS_PERCENT_MAX") + @ApiParam("良品率上限") + private Double passPercentMax; + + @Column(name = "PASS_PERCENT_MIN") + @ApiParam("良品率下限") + private Double passPercentMin; + + @Column(name = "CAR_RUN_TIME") + @ApiParam("小车运行时间（分）") + private Integer carRunTime; + + @Column(name = "TEST_CAR_SUM") + @ApiParam("调试车数") + private Integer testCarSum; + + @Column(name = "PLAN_FIRST_PASS_YIELD") + @ApiParam("一次良品率目标值") + private Double planFirstPassYield; + + @Column(name = "PLAN_PASS_YIELD") + @ApiParam("最终良品率目标值") + private Double planPassYield; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java new file mode 100644 index 0000000..db59acd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanTakt.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 15:03 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLAN_TAKT") +@Api("产线节拍表") +public class MesPlanTakt extends BaseBean implements Serializable { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "PLAN_TAKT") + @ApiParam("节拍") + private Integer planTakt; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 81c5005..5d27429 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; @@ -57,14 +58,20 @@ public class MesShift extends BaseBean implements Serializable { @ApiParam("作业时长") private Double workTimes; - @Column(name="SHIFT_SEQ") + @Column(name = "SHIFT_SEQ") @ApiParam("班次顺序") private Integer shiftSeq; - @Column(name="AREA_CODE") + @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; + @Transient + private String queryBeginTime; + + @Transient + private String queryEndTime; + public int getShiftSeqVal() { return this.shiftSeq == null ? 0 : this.shiftSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java new file mode 100644 index 0000000..bf48a0b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardLine; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.java new file mode 100644 index 0000000..bed3882 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanTaktRepository.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.MesPlanTakt; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesPlanTaktRepository extends BaseRepository { +} From 582ef23ca3c9f53dbdf26106fed7083556bb97f8 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 27 Oct 2020 13:10:16 +0800 Subject: [PATCH 279/329] =?UTF-8?q?=E4=BF=AE=E5=A4=8DSWEB=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 1b9d541..50964f2 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -52,11 +52,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); - if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) { - DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); - } else { - DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); - } + DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); From 24acb86dff63ae3c476ddfc7fb33049770fe8a63 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 27 Oct 2020 13:19:42 +0800 Subject: [PATCH 280/329] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2&=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index c6e6c68..183ab40 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -332,4 +332,28 @@ public class WmsStockQuan extends BaseBean { this.scrapQty = scrapQty; this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty; } + + public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty, String areaNo) { + this.organizeCode = organizeCode; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partName; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.totalQty = totalQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.scrapQty = scrapQty; + this.areaNo = areaNo; + } } From d9040143f92d1e4cfc0300615fe3aba6fe0a415a Mon Sep 17 00:00:00 2001 From: songss Date: Tue, 27 Oct 2020 14:45:00 +0800 Subject: [PATCH 281/329] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=9C=8B=E6=9D=BF-=E6=AF=8F=E5=B0=8F?= =?UTF-8?q?=E6=97=B6=E4=BA=A7=E9=87=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/MesBoardHourProductCountModel.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java new file mode 100644 index 0000000..5e12c33 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardHourProductCountModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :中航-每小时产量 + * @Reference : + * @author: dominic + * @date: 2020/10/23 13:46 + * @Modify: + */ + +@Data +public class MesBoardHourProductCountModel { + @ApiParam("时间段") + private String hour; + + @ApiParam("计数") + private Integer count; +} From 6fcf32aa805f5786196364f8801f80ec93bc36bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 27 Oct 2020 17:51:22 +0800 Subject: [PATCH 282/329] =?UTF-8?q?=E3=80=902890=2010=202.3.8=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E4=BD=9C=E4=B8=9A=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 2 +- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 8 ++++++-- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index aad4948..d6fe7d9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -294,6 +294,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { @ApiParam(value ="故障时长-分钟") private Integer brokenTime; + @Transient + @ApiParam(value ="故障字符串") + private String faultStr; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index 3e41a51..66377b6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -36,7 +36,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("安灯记录") +@Api("去去去去去去去去去安灯记录") public class AndonManageRecord extends BaseManageQueue implements Serializable { private static final long serialVersionUID = 4667499369694353351L; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index cf92a50..df23bab 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -103,4 +103,8 @@ public class AndonQueueAttach extends BaseBean implements Serializable { @ApiParam(value ="生产累计件数") private Integer totalProdNum; + @Column(name="FAULT_STR") + @ApiParam(value ="故障字符串") + private String faultStr; + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index cdd5365..969ad3f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -904,6 +904,7 @@ public class AndonEnumUtil { /** * 按灯业务状态 * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60, 产品信息=70， 产品产量=80 + * 20201027 增加安灯状态 90 =优先级, 10 =故障字符串 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ @@ -914,7 +915,9 @@ public class AndonEnumUtil { DETAIL_TYPE("50", "安灯子类型"), AC_CODE("60", "原因代码"), PROD_INFO("70", "产品信息"), - LINE_INFO("80", "产量信息"); + LINE_INFO("80", "产量信息"), + PRIORITY_LEVEL("90", "优先级"), + FAULT_STR("100", "故障字符串"); private String value; private String description; @@ -1063,7 +1066,8 @@ public class AndonEnumUtil { public enum ALARM_PRIORITY{ FIRST(10,"一级"), SECOND(20,"二级"), - THIRD(30,"三级"); + THIRD(30,"三级"), + FOUR(40,"四级"); private int value; private String description; 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 427a4a9..27b6637 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 @@ -1454,7 +1454,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { MATERIAL(10, "MATERIAL", "物料"), - ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"); + ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"), + WORK_ORDER(30, "WORK_ORDER", "工单信息"); private int value; private String code; From 586365dc6956089011c22c4bc8a77f4ed022149e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 27 Oct 2020 18:31:37 +0800 Subject: [PATCH 283/329] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2893,#2894,#2901?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b28e142..13650d8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -7479,7 +7479,8 @@ public class WmsEnumUtil { PICK(40, "REPAIR", "挑选"), REPAIR(50, "REPAIR", "返修"), BIND(60, "BIND", "绑定"), - OUTSTOCK(70, "OUTSTOCK", "出库"); + OUTSTOCK(70, "OUTSTOCK", "出库"), + RE_PACKING(80, "RE_PACKING", "重绑"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index abd240f..b59daf8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -36,7 +36,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name = "BATCH_NO") @ApiParam(value = "BATCH号") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String batchNo; @Column(name="SERIAL_SN") @@ -47,7 +47,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="BH_TYPE") @ApiParam("BH类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) private Integer bhType; @Column(name = "PART_NO") @@ -77,19 +77,26 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="TRANS_TYPE") @ApiParam("操作类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class) private Integer transType; @Column(name = "IS_OK") @ApiParam(value = "是否合格") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE", isRequire = 2) private Integer isOk; @Column(name = "LOT_NO") @ApiParam("生产批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lotNo; + @Column(name = "STATUS") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_DETAILS_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_DETAILS_STATUS.class) + @ApiParam("状态") + private Integer status; + @Transient @ApiParam("操作类型") private List transTypeLst; From 5227540ecce5c3acf1a35fd504081f56b51d319c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 27 Oct 2020 20:08:01 +0800 Subject: [PATCH 284/329] =?UTF-8?q?=E9=98=9F=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group1/default/20201021/15/50/3/123123123123.jpeg | Bin 0 -> 15453 bytes .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java | 11 ++++++----- .../estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 5 ++++- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java | 13 ++++++++----- .../i3plus/pojo/mes/bean/MesWorkCellPointGroup.java | 13 ++++++++----- 6 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg diff --git a/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg b/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..76e3cc08327fad7535079cc68b173c9616218511 GIT binary patch literal 15453 zcmb7r2Ut_h)^316=mhB{5Cj2HdXr8R1f(}nilCsVG*HAB{)PxM5H97^kii8LTt=zLjT{#MKyqu5Jv)M7Y~OLfJ=#k zM~QP$4`9YZ1>j-f;sE|SaB%T}_yizAY^^#NfP;sJEn^+PCm_JV2jBp(CCV%KYy^TZ zD(%Nk)K`T9qfU2hWFU%Vgx{nt-+wA*`SO^z_^R(IW)hw0{_a z3BsIUKg7-8Ga*kxofNG0n}k2yUn0B=`AgkcF(0fL zOh8fK7nn<$V80mqn=fqRP5Hky{=33IlmO{23D(l8hoqKMaM1nkx?hg|Wf-dx>)~IW z@ON)e{ffZLic5z6M~lD6{zU z3k>*;_uqWNg_{M!2?*(5K;xmm@35Bum;lW2kLTFO;131A=)ZLBPe1%SGnXw!7?vZ- zpd~M$kEa6RM3-v+*7?WGWtk`#PQY?$(R?Zpd&|vD|Ag=5PXc8JmGTiUylpZKfWI~UGOdRG|H;@tVa1w z#^w$O-KWnsrz8$LzzhSC1bi2YY|QL=aM&qX93s+C1tpfiz<&M-iMWsRcdY-8OWa=( z_nR}E5Xm}U?OFKD@3+X`A^2DL{1Z2SUVe{V%=o;KuCUB@=`=Bccgbp&%}rx+)GTe% zQutDLR^~}B0B?JkF8~;yF4xczNwx?YVfyLjSÏ&13s$=T$xPaaohe8zMll`0lS z-c4P}xl^Yp{^O)4f-jP)?bcBVT3Y>nelloZ8^An1u^Kr+JhhOX@vSewm6DS3Y&AK@ zcU-en&wKZSlqQu+c62|`9=7*DX7c@g@?ke(URllpiEyiZ!|o7Sd6E=Io+zQ55F2lC zFET3Q^`sw3@v_q{JH*DUlwWMdyj)z^ECl^e#DXa|#+%obYONV7zer*Fcx+UUUtjYW z(;a%P{{lY1`HF zI_4{I?Uu@jDQ3d$*3??Wh;Q<1=HF3G??oM(3}k&Co(g() z0k|<%x5*I|Q^>wtF!?EzZum_>Z=IhX>cwF})cN(gZ=cd;Caw&uGRVkTdf_3?nOLKh zzbRYpzL8Jhsn#6!y8yWVocc61gYL;*3Ury_Gdo`03vP`;#QquI{%!32HDmzlA-tE* zk@2sA;G>3NvCq-KZ0e^ye#ZWP+_hwc0c^WFX2qS>*C;AZU|ub>=>pnI>4m%Uyj7^?>G6$gxoTmV82 zU!^=gdSyywqc0kxs(JlmMANeZ_>A29#<>RQ{-J|uAJ@0Yx0QEQnKNlC2V6{go!VS= z9er~{cFIC`3WvFuLfl&TziSgl4^H*E zSNy*lt{2Ar9Q%2AU7w=6&~eUGeZxE^g5p@ZKk>UY_k^@+@YEajuPJIjWe9|MubDr> z)Oc8Mw%LshQk0rLkvYR#^3cwB@vQLP(vzZ|+mjC~&61ibtkZXS`Cs399{SMBb6S|P z#HtoHKiS3s5nhZbEbW!n=$QUq3Gr=F^lTLBfdMJoSbmR^zXpT9-viuF$iA?kw_&!I z^ZCoS&E*{N_gq11bQS*;X=}%^vHuu(0dOPe{?yMpZq!~4ZL^|LiZ?qyCat=ochGds zzbk)6p*u-;h}2G3A9xV_1LYU&Zx~W(DUf(CI`>C|2!9-f{?}`$6sn3!Lg^z0bWiU) z2#;jxx{PuTBg4-%fYyuc6|bpyv7Dflmw3y%(dHWf)Wo^uQzlZfZkyf3Fqlgc&R9x; zZ%!2T^dSF=jOf!gQC{SM$XJwzD9wuQilM8cn4DTTi#=aS>A_3H^Cd|Y-%vDU4yt91 z{u)H^oa2j)mxK2abc^ROhSN0v=>_2Zd<{XFXJLg#V**PD`^jK9!#bDCdReZwNCFd6 zSk8j4YrrIf*z3%iB%k*FkOMaJk8koCn`CBf2O<&ctk)FZevQE!E?rH~Nd2@G+&CHqLZ-Rc^v;rZ`!f zXMW+EH?Frb{(Pp~8w;6L8gJKro5&(s(2(5q=I!B2R`hh~1B2QvyF1x#4oaYX*EKS{ zqsZB_y0OCeC_samKGOmsuji3nC94+&wY>KmrmWPf?nX&n-jupBYkP_QA}mR?IVPV1 z27WYyNAu%mWt!r3C_bVFEp0vzmUqv|-M^E!?ZIFA+|g?y%Bfk=%<2^E1EO&}NYy(w zk>Uk5A&;Zxm7?cqziV$dGD+l%Jgi=w&I48N>iKGfH6_d=4F@%>Qyu!_jwfeM*T1ml zSo**ysA@0 zpZ8W05nRhl{;Eu7^I&uTooMwKWgB$WFJ1SBV2tsparHe4u}sah&k}k%IxXu5y#*-| zUy)9&b%tu`Ui87cbmHsRK};p$iXM_mDaReBeF%eP`>1%_mqC#hE!&#GGH(!-5DJY9 zw!S`*trA~bK0nSmf(3<>v5gH_tBfA?*Rvmy5k=)6uDWcor~_liBvCurFM98atbYpq zvg^p|Q2c7ur;`8LkE%FZu%`w;IvXsk$rT1#^VV-}upQVtSv}WO4*l9I_RRM9> z?H@nc4$|k<>$}=_j9{G1eZ)K&sDkK?3dzLnv=hm!cu!HbB8*#9WTz8qXxc3-t$Y*0 z^vFquA|L6q>O=KKUz06L<4xW>TZ`|0d#TG^z6|>Jrfhi3Lz~=1uG~iKCXpz8>{?_{ z)r{Su&I4d`dP_Sxi511qm5Lov3;!$$ zu#wltXtWvyg`=R@1LxP2$6YbAuh!bwG8daf*C$oM5T+b-oybv%`Js>EP~=N!W^+)w)p8at+#v_QTKR zfgTD8*r^U#Tff!ZzRhC~#8ZbUeMD+Z-e@r1tUbcU0+y?4L09bX0;cd~1LmzU73l1R zYH4b~uSdNKZXmcN)qn@`NC_oXW%2HEX`%}M9_w#Qfl!)9aNRb(xsu|A(6xL3L0W-o zC=+*&RU&nJblau}9vJTI5QmD4OAbgrg_M^Q_$iACy?x7OiO!0bN~BU6qYiET{`^#0 zZtj)5V0xUO|68!J(Ey?5hsSvN*q>SF#JA;FANV^_9Pyqatz z^xy?_bTMvnlR9Nq6rVb-YLnXk#Qj{EKefmI*p2RdyefwDm8g_&0?*we`N?L2>c&Vd zdFeEVS$MF_j|5PxJPhd*Id3`(wje2w`Y}#mc5C+t)yh@a&RiGqqew1>Y^uBz7VjPG z-$3v%hEO_6K(Pi^Bbz*E()}=Vb@u|GfC$`@6o0b+HhBisL`{cXq+zoR*wrAj`o2;O zaX_Fekclm-5GgdBo+SfzFSF!+_zdUW$g(~&|JQ`ndXeF5QW@CVt&$^DHN7Tbg<2K1R;2M)HMLW=9Vc9EROS-KERd$-R3|m*x-Rx+)v<4Zd)mQo*KMCD zNpy#eG(GMZJjh89U;F`ih{kXvtw(}AIL_q)j;<@82`lw-?^-&33b#;9KCoZ#&x9j} zEIPaq55_y4(~Ec{GV-EN&(ZVnem%=$T?h1FPwxvo4SGM|-|AlPt8UrCY-y@0yQ z60*HKfWldU3_@2_D$PvI7>UVhKe%3D6~e_q?B^A1gz(8Zp0to9#S_xM#BE0kz-G2+ z(d~ROf?=jNI~!18Lv9|^^Lpd1o16PKRuneIlTWL`=}gg1mvb0w6pSN1BV^IrdVGPd zw2O4GpIiDS7R)j?8Ex+x9%s61lXvG$=UuBV35)K+C0k9II=sgxFk?s7o;l;olh+mT zvZvY{Nq!O?cCOUG=NG*{;t%e&)+0lwCgnG}?|CBnD7y|>8%5&3M< zaL%X#s?~H;ZMDkKl^6yw^e4Kv#Kh+F z4GJfu7x8Y)`8kiDSkcNM`bLFw!*#SGDn>YaMp*!xo%|njf%K9lO1=0 zEyvhy4;M1zc{j{tMh(1mVC#C3i0?Q zOk0)xMCFm{c&ST7^TCdmYq4g?kfi#le;=xKmxIcfh_T5P^T5Xwy4EW?!97iMXLsbN z9v)TeK%D^j$)0_7@TlzcM#@ z-5|=odo4O#1qezGuEaz&A9_6OcT=&k%I5qMng4oTGOUexEU>Vechq~$@7@H(w_a4v zhx4AYjKEGuIehNj;bmz8mFtu5{YCHUy@~Y_kjaVEaQSMhvCc#GDc@nn2TrsUa{&OK z;(|W5p5ECc#LYG>@>6Dc!!>$>)YiEG6lj?$`;YL1zg$02=C|J{fbTc0L2J`Ih^;h~ zhUA{rhRhbW&q8#DgL z<4;AG&iSRcFs+)Acda(X?n^|G<&guaowkpc^22}SkS%a2Xfpd*lT8A)=D?P;509qrDi%Nt9WF)A+|8XKuc%N`KnEV$jJ5F&r+c|HBkw|-beF-(n8 z*?~jNv+(OYBA+a;fl1s#%>g@f|B$lDX7eIXxCPM{FdHHp^M(^OjG3y`jF>Z!Fz}@d zYo=Fwiue{En$GwxnVsJDTyd+oZMb&Zqf`5O^9FV~v0qn$59+dH7B~7_I`OhmNu8mf z(8Z34!tFQ(XWIZYxO5C6*ZsiA`nj)g=vKvHBjk)s`bYD9vQzzUmSgM&N(v&9SDt>l zQj-7X?fwVel1*JiXX;>yW(Z08JLSws`O$X@9SzkU<3;z)CLh+&$i7@YBkH}cgX5vA zHu->JP735{>-`mVsIGL6N~FIlSV`KuOll~M#e8xD^aORLy4V|K`W1G}r5k$z5PVgc z5xF3&+s9@LM7TuUCmc3VPqm7(kA>g_G(F?)E-c$(5t0)$-(BadLHQBaY)hu}M3Gv>(2t`lKducG#Rx-LwjS@mn(yp3)D}92q!{R{`XaKS zY?a$Y`HsGYoT-`ycwBJH`ByV*FA#*4O*K@S|okGn~g+GN=>TClu zGUdo&bjsl%O_~9n^q%080ZwkKZzZ>!-n7?}C>b$b%goZ%v)D1eJcu8yp4Tk2y1;{j z-b@;)3f8g!lf;4T-C-+wgSw6bf!b*O^`XSr1c{2KXSpw8i|ca`n|61!at7V3_J{`; zq&rI2Ef>4T07KleDKBrCt?Yfwr)$X61zTG@FId?&_m4k))#+R!S&4L0H;mGKPTtj% zAR`lwn;_}vZ(D~cnmF03Sda6nQt~3tN^8;=^|6iQd0R}_y1qH>i(w)O+pBCwv>xlF zqS1Zml{@j~b^=kjz7AH6=SH7i*BG*3=>~n9q6A5lZ}G}PFs^KmIv`~&`BH0dy0Ir2 zqzmAbCP%7mL1uBW>khIX+K*UXeKpwR{M4MaOm;s)syark(M*7L1t&^j!hn7XA#b~!Fw9P{o-~T+U1D z%;M`g6>rChGjr!`+>;lfRf+LkfcAl=cd*u!3xF-+yHfUmC~;7$psj0or4r>za)kZl z6~s8VlxvBUVXpGt!xh#V=%MMy2;0sqUCU^>eZ6)nHJk3qVYQEazJx-?#6i zkpl%TT;(%}J>n$iu)u7QuMC2v>*iATny=Eyd|&e|JMaV)$mX`HWmg@%vUbFU*Kh+YKMozy-Op|!` zgbCPj3};3Bya!Z*mMvfO*A-suPw-CiS3)Y+j6pi*ai7Sk#`^X%Qi$9S{j!uS+n=}v z_2U+&DuwaEuY|mlFS`usk6lJ66Wqm!r-NDHzHdv;>UI?Enkk(xE5W6}X8d-Vz}Q0n zXEH%2eq5+i%~HxEaaNlJlYt9>VjXY6F&!0q;P5ut2OqoDD5it7Le)nT)K5tish;&) z(>Fg3y8q$&4A*m`6`29C^?8rNINxtQd}+sg_#&UZN0xG~PMqgmT^Euc3J3O>*2tqLSxk&dhZNh1?(E9y~(iKaG{6^&>cf;+MfEpG7pI> z4L-prYO7G?x_Q=9k?#tuH&owKXPDIPi-8g-u8+7;akLk>uKG(SQW^TeDAf~lX$eJ3 zKl>LnmbYOan9P73I6HQ0#_wJ@84a6MPtCcmKS$sqwHabD?tpbW@rZ*dOz|^*fS&pA z7+NNRle3BH!%s7fg=!wT6gLytNKusuS~_;L;~)yhH@LQyec3NcWPZ>oIhH!2`Ezu? zCJSXjiBGiw0l0~;bT<}#Uk?<>9CMFZaqV?OW^1%&w`e8Xx1PcW=H%nWF2OoPbN*6s z=^F*1ChTEoE4P+qcZdd&k;=*s!8aTL^UfaucJ@Vpann^_wKB2X!2ts~9hap-a{2tj>I>j7X6-dK)(c?$bL8tQDZHLb;sBKIM!{*CBE9^^W|jY@T!=p#g#>f zmMRKbEMG<}jePnf@CkfI`+=A^`a z0eRrse2;W(x@!FG(7A-$t)i8qrKXvlvN)8pTP$CWK|$6l^eguU9+MrtXSSuNk6niy z(UBF!4GP)8>a}aUvNH{5^D-X1n4Q6m|JHq2N$l%#FKxhb7+)_=!?vBvy%h&q{!U)r zqqJpNrd>g2MX0MpC!r)!+`g8{y>Jb8P&#NKJJ(0{yME4=otmV^8>Wu;%G+ukeC#%M^#_Z-b}Qz&aUr>5f{7Pf@f&B7D6|dw~W}f#}(3YD$Vee2${`{ ztUB+mK^EpfVv08Mj}6j7=N$%mVw`6xqa#Y|T<=O=S<8&ySR#(e zY7f&6?tbLH_CPiLV2@RV_0eGdUC~t+<3WL=IuJ) zp2^;eiW?|Qrq7HcQw>sh@0B{9^YcZq6L55bdg|mH*MZ1pgv7iz%i1h7GQGzl$g}ms zpiw_^bkvfUmUbury~iVZ_^?iRdAEb=PT0^y(Au@HC3I4hJ&RGVqI5H|yG>;aRixt# zUnO9eyNtWWTgz<8zWj7Gh>;Cj6g`a42+V$+URbB}*=WAEM29AuHT}#Zh{ya}cCGaT z%rjep)%6l-_;U~iL*Lxz8kZj;wpH)>J;rX6%7)OJ)W30dwG;lf!3J70*t?DHnZ5sB zeLlcnII1RdN8!0EkXj^;!TlLV_^C+L{)3;hV0-%{!L#un7(%gPb$rdx zQsXlYZF_n?!8BXs6={0aYqGao7r9>L6IC#AJ+CyEqJ>ig=;SDYR?31h4Rp@#XeH#G zJnU&Pb-1y8a6`K}t-=3egnX_yjc`iz>AlY7sz;wP&0=qmcL|t)44%Qw;I!BeXzB}4 z1c}him&xeKw9txgp&*-?z)|vDa34-T0l}B_Y*GkX@J9=|VZyP*1BLFqDeRub?4CMP zkag>aV`$SE`b>9QhunmP*pBm2?K`b^-5>mOQyeL_%QN3yMIVDt)PS~l*)HNQSKl-EHrd?#DQL`>*;=jl)`oI|fjMbRf+x`| zFoL(L{*|L&1zPTQMj9ipkL{XJ3|y#H?iE%$SrQ?zFxe8BeowviCy-?2VW`=p0^49YBv6O$>v|Us~RP zWc2j*V~(B#(YL-NHMjE!GL3e^9W1O(*C))JDWlgYeF2eQ=((R@#$NAY9(*^_EYaio zM?Za&?3&aqwT)@U>=MhzFKmTmjX#{YxUGtD?n4H2Mf_@Nt5h5YMFy>Y+)=B2{;Exs zQfw6L;o|vX%!jrzs^KtLho;}n&2IR+WH+L_h|J*(#Vy;q=oMa=@a8cS7*lf)<2PG# z{9cMjG$v#|dh!rmp68FvfYW>zq9h+4UxbvOoGY`TeJj4jkT$p}4{35W;O{P{{A}HV z$%thh_Fy*}Q9)nLJ08l_Ydx`kwSCDX!+cW<(a2d4 z=LO(fC}}tfb?Uz)nNvJdG7Yl49zW^*+GB>g-(yoFODrjMIi^?iYiv=-aeV;aVA$FW zO}%-#lPRr%&9#WEcxh>ZI`E$H%IYX2M9%qH^aCSaysWc8#B%O(>U#X^Y8Reg0a>-LHf>mN^9y+2wT z^EbFsYO1QxCT88eGlqxfV!0pSh{tBLGj@aca56nX#Vwh;-wjzeta9_EbVP;6WXkT@ z3eVZI(3d(ww~tIjcH|^D91A<4fW^NqeeU|pX@QPJpt1GO`U7GH!b=IHfa z0G>+?PYv24%2;lGjT%{ zc_Ul(QQcOQ@rieMVCI4a#PE&2s79a(m9?3>YY&c<(Y|J=<>_sC(&3Ss(G*ddN+CnV z*PvA9TK0WUMY$f?h>yz~(cOAI-*fvR^rdY$uQ$n=;O_I1JklN91Kc8Hya^hSjdvH; zH^s#^oR&319Y8Hj^$u^7(-OPWh4e(einOHiJ2dd!^QAO)AFaEuN>}I3RJ9adelhvt4e1PKc2{kqT_;<1F84qR>XG{ zoZIUqg})?!RB=y)b6G-<;E4C9Drw@$-$3UpXWE9EREs8}mK1Mba-pP<21&w&>^s;; z>^&yJex@Bjadwye>>!S@lWz0y0^k>Z0SM315B$l(asddlI$yZ}aG;y^dV`xzs^xZ* z{qgS$N;}m3JSe^Zpf;KbKvB1RD<1h|Ma`n>&!Cnjz{+JeD~f$YI)#PixndO!p??7{ zf4a4QD{Df5+z1)Y97MC)&)S%QTsp&pd*NVoNA;z4W8eB5bMp3;==hmMlRajcX~K~X z&esd&6LFCxh3Jg46{C4#9ceq$$eHdvJXKzf{O~)8H|+tpSXNG&O0|zZqm^k)}> z!qqx4Vh8okcw+!9Upinr_1?GMYhre;&p7QtYcPta6i@uB2?Nk%@1lCoE^+%^>t#dE z#x9=B==yy-$Mfd5z|!@iDc8{~Rm#od2CLwg?>T_EeS>#5DTZxWrv1I)miz48=0C}) z?RIXX794>KHk(Ivb10zZ ze1N;K)@yPr$>Qfq0ts@CzvW6BdzvQ@~M zF<^Nrvm1q%v&&G=m@J{H$cB4Ah5xIx;#qU)y`v;{g!T1XWub4&t}`~47rc{tP*|S$ z0uo#y@bv=lQAQ~J(clu<4RT7|;q^roxATn(aZm)x(LP;WXC&0Uq!aRCP~5DCY+aMB zS-@8gvb6{NF3+vz_NJ@J_Ei!ozf{R&EJg|-HtOtoBYivjHIFsRQHINGf&pFWhBzPB zd#(x#XD^YY2AY)gj&)B~p%5>QDhnSh3n$m`cO}l7wX_wr_wS`0Q(piqP+s`3r`KS?|=oNlAOyZo?C2X~MbX-_DH=*mItrY}~h#EBH_Sl1#yoqlLtHgeDDuHVW{y*=*fvhd$w}|xMp_TrFFfnzapgzK zxPqwe?&DrH3PGFW^tae=B_f$cKj_x`fAOlfi=+>trf%P-2iApr?$G^wx$4eS zZ%zHX)AxJ(pluq&BqNc#`fDJstL}j`QVQf2)AfFE-9IS z3=QMBGKB)8NoK*WmZe|ZpsyC4%?AiY}ErL2y>8FEe1v=5{gYNtZo5w}IW1IWqEYVqv@c zwag#X=;LMnjAYJ_lyi?-y6M@H-;+G!WpZ}fD?dEo>tHkJG^^DySv4DrjVJ6o$}+57TG8bWt_X8iZrN&B zVHv3ciTEtimRW{w=!k=X91?cu&%qGM{MTjG2N(O*oWYag{l`$huMMXnfyd?aXCp+% z<*b|M_o|tt80Nr-*ancO&ySUbnPmtU=y}4c=GvZ=%SA6@^eZ1D%snU)n&UD)0#|8j&VF86I3$}mb_?8&ZgfwM#eK&&0N8Yh=f z(j4tRh!5*)2|GYdG{w}}Ge zYZuvG0|g?d5L9^Ha8mUfgyX4{U-~Ge5P3Vgpzt$1#Apn`Mx~@ka9aQY?PGX^5hCAG)Y?^Sr>59~ z&5InTH{+M#cku;iU|4o(7YVTk#1jhjM&jbbNz6jtLNN5$Z>_bALCyq(e1v@LrTDq) z^7YUs@E}wR2K#>lh#TZ+T9`Xb3w(Ltcj*By4@#iCd_IvGnwvNj1-$~d2rWH?mO|g7 z-bYc>@n1o7Slx=^V8GSluM)xTn#z}6X48NqsLP}Vb~~L04++yULGr;TElASvO7Ry1 z0^o2s3Iznxo}h|h_JO`#*zHyllnH(r(VvSyHSo$J-Ijba?jjKNo`(*bA~69rQ#a#r zkRsKPLWG>kY+e8_ady!-N?iNF{VS88gkWvqZa##O$eOBD-9hz*Z}1oaME!os?; z$i{7UkI0`|4};A@SRk+)j|Aowc>GML`cfbt?6v0xOn4La@p6kz=ojzI@Y%o^0%f{i z*+$+!p5e~nm&#*2P{mtVO5kv?)+|XH?}0qFff1^BUA_tqa3&@u@tdXMz>+u-h?JiX zHNMLCi2K@lX!0%z>M0fmT|QRn7EDOK8CXVmj{pX2CXfJ<9HQRABD!w>oX`^HX7hjp z9JgS-89IulhC^I$m4}DlnFLVfLC&9oeElNG$e6PEwe}^GzDE3X8hKjcmYCb*9TS4I zjMmEs33<#P-_?`&&@ney`05-DaN$6UwttduDGRClWX|5J_<-E8#E(~ubF6qBR+gy{ z`A+le`<_@{30`|4Tq1Hax5ldzlm3cI;X`vS&bAJ`d&Rgv`x&IB#1$jqGO;FO#8hD>K>HYLiF9+{Oo?)`wWtyNA*sa`fKKD=}@w^^sKn=-)$g?&Q@2%njCq(PYj?& z$%~>*z+TCuyaI`Sy47mOiN?mWiCu87=CF_&j?Fm2cG`Ok`*{VC&1WBC(pL~AD-PHf zAtf%0c_JpH1i^OY%q+?FIDt^FI%S-+@V>fD(sRW35I~sAJow4=Onw(Uys#&0ugQS~ z=5ID;5$sA@gN?O~!OA_@ZK*{e=*IWYuwt27(kB_{BxFSdecOVVxI{HxNa+H`D4X=j z#{?7}Eya(B$lALT>tal%(Nd-{q`r`SWHDXH#DEkCQC@0P^-hE#;rgBVXO7Ro*VfiX zeP6Y|Iw*#d+a&KY6|CL16GQ3U#!RdV76e3>f>I$hge%zt5xzH({kot>cQ_uj7_#r- z$ro1G7@i)*yfj-=kAmN77hWF`RG#62g2}c4WT7D~>SmJJR*7nYF)y`)BvnVMNnaP8 zmfE6Q)V=c4g0hpd*5f(=Ez>Bkc8(#k=BBE3Ez68PbrDW3-3DR%Z6TKgqeKA@_R2|o z{Sq5;eor?Jew%M$E-$L-Un&?w*1IJ3?tCH|YIZ^Q9)e3*43w$<~8v zM;N%6d#;xRPKVetUdx5P$DQ@4#VCC~?=wz&!^iRE4^XBSfO{kfL@^{W*w+f!7>ONZCt zP3`GdvMvw5x1Pe7`RE(zwE{x!TvuKATwa%y2P|}cL|R2ww1wBRhvZg#<8@bZ&&_r4 z-gY}B`(nWW(aGo(8Hkd2{`5{nWXIDryCZuo8~0SU3}0wOL||tp>w}rK;!=*?6+gfG zB!B}t_OFDH&SxTq45h?)}GiZCAvPw6gmKGac? z&O!r&>#7Y&ShA`U6ydzqUOhfIi(t#fG<|?(+Nj;W+S9g7VI75`w4`8NQ_YOMQB854=MI6P@A@P~O zGLcf;iPzF?m55{AbK=CV8AR3$d${^icNtYdN$m{7CH8^>sdr(LaSX|iX349l!LIVm zT_6q`d~WV}FomfIRRzEWrX<1u^?;`0r4hqfpW-jVJy0GfYPxTw_|iyRoLR8OE)8BO zkPrfvgobd>2KEE3vHAN73^(lcGTfCLlua1ePr$brprwK4(wz Date: Tue, 27 Oct 2020 20:09:11 +0800 Subject: [PATCH 285/329] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group1/default/20201021/15/50/3/123123123123.jpeg | Bin 15453 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg diff --git a/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg b/c:/usr/local/i3plus/files/group1/group1/default/20201021/15/50/3/123123123123.jpeg deleted file mode 100644 index 76e3cc08327fad7535079cc68b173c9616218511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15453 zcmb7r2Ut_h)^316=mhB{5Cj2HdXr8R1f(}nilCsVG*HAB{)PxM5H97^kii8LTt=zLjT{#MKyqu5Jv)M7Y~OLfJ=#k zM~QP$4`9YZ1>j-f;sE|SaB%T}_yizAY^^#NfP;sJEn^+PCm_JV2jBp(CCV%KYy^TZ zD(%Nk)K`T9qfU2hWFU%Vgx{nt-+wA*`SO^z_^R(IW)hw0{_a z3BsIUKg7-8Ga*kxofNG0n}k2yUn0B=`AgkcF(0fL zOh8fK7nn<$V80mqn=fqRP5Hky{=33IlmO{23D(l8hoqKMaM1nkx?hg|Wf-dx>)~IW z@ON)e{ffZLic5z6M~lD6{zU z3k>*;_uqWNg_{M!2?*(5K;xmm@35Bum;lW2kLTFO;131A=)ZLBPe1%SGnXw!7?vZ- zpd~M$kEa6RM3-v+*7?WGWtk`#PQY?$(R?Zpd&|vD|Ag=5PXc8JmGTiUylpZKfWI~UGOdRG|H;@tVa1w z#^w$O-KWnsrz8$LzzhSC1bi2YY|QL=aM&qX93s+C1tpfiz<&M-iMWsRcdY-8OWa=( z_nR}E5Xm}U?OFKD@3+X`A^2DL{1Z2SUVe{V%=o;KuCUB@=`=Bccgbp&%}rx+)GTe% zQutDLR^~}B0B?JkF8~;yF4xczNwx?YVfyLjSÏ&13s$=T$xPaaohe8zMll`0lS z-c4P}xl^Yp{^O)4f-jP)?bcBVT3Y>nelloZ8^An1u^Kr+JhhOX@vSewm6DS3Y&AK@ zcU-en&wKZSlqQu+c62|`9=7*DX7c@g@?ke(URllpiEyiZ!|o7Sd6E=Io+zQ55F2lC zFET3Q^`sw3@v_q{JH*DUlwWMdyj)z^ECl^e#DXa|#+%obYONV7zer*Fcx+UUUtjYW z(;a%P{{lY1`HF zI_4{I?Uu@jDQ3d$*3??Wh;Q<1=HF3G??oM(3}k&Co(g() z0k|<%x5*I|Q^>wtF!?EzZum_>Z=IhX>cwF})cN(gZ=cd;Caw&uGRVkTdf_3?nOLKh zzbRYpzL8Jhsn#6!y8yWVocc61gYL;*3Ury_Gdo`03vP`;#QquI{%!32HDmzlA-tE* zk@2sA;G>3NvCq-KZ0e^ye#ZWP+_hwc0c^WFX2qS>*C;AZU|ub>=>pnI>4m%Uyj7^?>G6$gxoTmV82 zU!^=gdSyywqc0kxs(JlmMANeZ_>A29#<>RQ{-J|uAJ@0Yx0QEQnKNlC2V6{go!VS= z9er~{cFIC`3WvFuLfl&TziSgl4^H*E zSNy*lt{2Ar9Q%2AU7w=6&~eUGeZxE^g5p@ZKk>UY_k^@+@YEajuPJIjWe9|MubDr> z)Oc8Mw%LshQk0rLkvYR#^3cwB@vQLP(vzZ|+mjC~&61ibtkZXS`Cs399{SMBb6S|P z#HtoHKiS3s5nhZbEbW!n=$QUq3Gr=F^lTLBfdMJoSbmR^zXpT9-viuF$iA?kw_&!I z^ZCoS&E*{N_gq11bQS*;X=}%^vHuu(0dOPe{?yMpZq!~4ZL^|LiZ?qyCat=ochGds zzbk)6p*u-;h}2G3A9xV_1LYU&Zx~W(DUf(CI`>C|2!9-f{?}`$6sn3!Lg^z0bWiU) z2#;jxx{PuTBg4-%fYyuc6|bpyv7Dflmw3y%(dHWf)Wo^uQzlZfZkyf3Fqlgc&R9x; zZ%!2T^dSF=jOf!gQC{SM$XJwzD9wuQilM8cn4DTTi#=aS>A_3H^Cd|Y-%vDU4yt91 z{u)H^oa2j)mxK2abc^ROhSN0v=>_2Zd<{XFXJLg#V**PD`^jK9!#bDCdReZwNCFd6 zSk8j4YrrIf*z3%iB%k*FkOMaJk8koCn`CBf2O<&ctk)FZevQE!E?rH~Nd2@G+&CHqLZ-Rc^v;rZ`!f zXMW+EH?Frb{(Pp~8w;6L8gJKro5&(s(2(5q=I!B2R`hh~1B2QvyF1x#4oaYX*EKS{ zqsZB_y0OCeC_samKGOmsuji3nC94+&wY>KmrmWPf?nX&n-jupBYkP_QA}mR?IVPV1 z27WYyNAu%mWt!r3C_bVFEp0vzmUqv|-M^E!?ZIFA+|g?y%Bfk=%<2^E1EO&}NYy(w zk>Uk5A&;Zxm7?cqziV$dGD+l%Jgi=w&I48N>iKGfH6_d=4F@%>Qyu!_jwfeM*T1ml zSo**ysA@0 zpZ8W05nRhl{;Eu7^I&uTooMwKWgB$WFJ1SBV2tsparHe4u}sah&k}k%IxXu5y#*-| zUy)9&b%tu`Ui87cbmHsRK};p$iXM_mDaReBeF%eP`>1%_mqC#hE!&#GGH(!-5DJY9 zw!S`*trA~bK0nSmf(3<>v5gH_tBfA?*Rvmy5k=)6uDWcor~_liBvCurFM98atbYpq zvg^p|Q2c7ur;`8LkE%FZu%`w;IvXsk$rT1#^VV-}upQVtSv}WO4*l9I_RRM9> z?H@nc4$|k<>$}=_j9{G1eZ)K&sDkK?3dzLnv=hm!cu!HbB8*#9WTz8qXxc3-t$Y*0 z^vFquA|L6q>O=KKUz06L<4xW>TZ`|0d#TG^z6|>Jrfhi3Lz~=1uG~iKCXpz8>{?_{ z)r{Su&I4d`dP_Sxi511qm5Lov3;!$$ zu#wltXtWvyg`=R@1LxP2$6YbAuh!bwG8daf*C$oM5T+b-oybv%`Js>EP~=N!W^+)w)p8at+#v_QTKR zfgTD8*r^U#Tff!ZzRhC~#8ZbUeMD+Z-e@r1tUbcU0+y?4L09bX0;cd~1LmzU73l1R zYH4b~uSdNKZXmcN)qn@`NC_oXW%2HEX`%}M9_w#Qfl!)9aNRb(xsu|A(6xL3L0W-o zC=+*&RU&nJblau}9vJTI5QmD4OAbgrg_M^Q_$iACy?x7OiO!0bN~BU6qYiET{`^#0 zZtj)5V0xUO|68!J(Ey?5hsSvN*q>SF#JA;FANV^_9Pyqatz z^xy?_bTMvnlR9Nq6rVb-YLnXk#Qj{EKefmI*p2RdyefwDm8g_&0?*we`N?L2>c&Vd zdFeEVS$MF_j|5PxJPhd*Id3`(wje2w`Y}#mc5C+t)yh@a&RiGqqew1>Y^uBz7VjPG z-$3v%hEO_6K(Pi^Bbz*E()}=Vb@u|GfC$`@6o0b+HhBisL`{cXq+zoR*wrAj`o2;O zaX_Fekclm-5GgdBo+SfzFSF!+_zdUW$g(~&|JQ`ndXeF5QW@CVt&$^DHN7Tbg<2K1R;2M)HMLW=9Vc9EROS-KERd$-R3|m*x-Rx+)v<4Zd)mQo*KMCD zNpy#eG(GMZJjh89U;F`ih{kXvtw(}AIL_q)j;<@82`lw-?^-&33b#;9KCoZ#&x9j} zEIPaq55_y4(~Ec{GV-EN&(ZVnem%=$T?h1FPwxvo4SGM|-|AlPt8UrCY-y@0yQ z60*HKfWldU3_@2_D$PvI7>UVhKe%3D6~e_q?B^A1gz(8Zp0to9#S_xM#BE0kz-G2+ z(d~ROf?=jNI~!18Lv9|^^Lpd1o16PKRuneIlTWL`=}gg1mvb0w6pSN1BV^IrdVGPd zw2O4GpIiDS7R)j?8Ex+x9%s61lXvG$=UuBV35)K+C0k9II=sgxFk?s7o;l;olh+mT zvZvY{Nq!O?cCOUG=NG*{;t%e&)+0lwCgnG}?|CBnD7y|>8%5&3M< zaL%X#s?~H;ZMDkKl^6yw^e4Kv#Kh+F z4GJfu7x8Y)`8kiDSkcNM`bLFw!*#SGDn>YaMp*!xo%|njf%K9lO1=0 zEyvhy4;M1zc{j{tMh(1mVC#C3i0?Q zOk0)xMCFm{c&ST7^TCdmYq4g?kfi#le;=xKmxIcfh_T5P^T5Xwy4EW?!97iMXLsbN z9v)TeK%D^j$)0_7@TlzcM#@ z-5|=odo4O#1qezGuEaz&A9_6OcT=&k%I5qMng4oTGOUexEU>Vechq~$@7@H(w_a4v zhx4AYjKEGuIehNj;bmz8mFtu5{YCHUy@~Y_kjaVEaQSMhvCc#GDc@nn2TrsUa{&OK z;(|W5p5ECc#LYG>@>6Dc!!>$>)YiEG6lj?$`;YL1zg$02=C|J{fbTc0L2J`Ih^;h~ zhUA{rhRhbW&q8#DgL z<4;AG&iSRcFs+)Acda(X?n^|G<&guaowkpc^22}SkS%a2Xfpd*lT8A)=D?P;509qrDi%Nt9WF)A+|8XKuc%N`KnEV$jJ5F&r+c|HBkw|-beF-(n8 z*?~jNv+(OYBA+a;fl1s#%>g@f|B$lDX7eIXxCPM{FdHHp^M(^OjG3y`jF>Z!Fz}@d zYo=Fwiue{En$GwxnVsJDTyd+oZMb&Zqf`5O^9FV~v0qn$59+dH7B~7_I`OhmNu8mf z(8Z34!tFQ(XWIZYxO5C6*ZsiA`nj)g=vKvHBjk)s`bYD9vQzzUmSgM&N(v&9SDt>l zQj-7X?fwVel1*JiXX;>yW(Z08JLSws`O$X@9SzkU<3;z)CLh+&$i7@YBkH}cgX5vA zHu->JP735{>-`mVsIGL6N~FIlSV`KuOll~M#e8xD^aORLy4V|K`W1G}r5k$z5PVgc z5xF3&+s9@LM7TuUCmc3VPqm7(kA>g_G(F?)E-c$(5t0)$-(BadLHQBaY)hu}M3Gv>(2t`lKducG#Rx-LwjS@mn(yp3)D}92q!{R{`XaKS zY?a$Y`HsGYoT-`ycwBJH`ByV*FA#*4O*K@S|okGn~g+GN=>TClu zGUdo&bjsl%O_~9n^q%080ZwkKZzZ>!-n7?}C>b$b%goZ%v)D1eJcu8yp4Tk2y1;{j z-b@;)3f8g!lf;4T-C-+wgSw6bf!b*O^`XSr1c{2KXSpw8i|ca`n|61!at7V3_J{`; zq&rI2Ef>4T07KleDKBrCt?Yfwr)$X61zTG@FId?&_m4k))#+R!S&4L0H;mGKPTtj% zAR`lwn;_}vZ(D~cnmF03Sda6nQt~3tN^8;=^|6iQd0R}_y1qH>i(w)O+pBCwv>xlF zqS1Zml{@j~b^=kjz7AH6=SH7i*BG*3=>~n9q6A5lZ}G}PFs^KmIv`~&`BH0dy0Ir2 zqzmAbCP%7mL1uBW>khIX+K*UXeKpwR{M4MaOm;s)syark(M*7L1t&^j!hn7XA#b~!Fw9P{o-~T+U1D z%;M`g6>rChGjr!`+>;lfRf+LkfcAl=cd*u!3xF-+yHfUmC~;7$psj0or4r>za)kZl z6~s8VlxvBUVXpGt!xh#V=%MMy2;0sqUCU^>eZ6)nHJk3qVYQEazJx-?#6i zkpl%TT;(%}J>n$iu)u7QuMC2v>*iATny=Eyd|&e|JMaV)$mX`HWmg@%vUbFU*Kh+YKMozy-Op|!` zgbCPj3};3Bya!Z*mMvfO*A-suPw-CiS3)Y+j6pi*ai7Sk#`^X%Qi$9S{j!uS+n=}v z_2U+&DuwaEuY|mlFS`usk6lJ66Wqm!r-NDHzHdv;>UI?Enkk(xE5W6}X8d-Vz}Q0n zXEH%2eq5+i%~HxEaaNlJlYt9>VjXY6F&!0q;P5ut2OqoDD5it7Le)nT)K5tish;&) z(>Fg3y8q$&4A*m`6`29C^?8rNINxtQd}+sg_#&UZN0xG~PMqgmT^Euc3J3O>*2tqLSxk&dhZNh1?(E9y~(iKaG{6^&>cf;+MfEpG7pI> z4L-prYO7G?x_Q=9k?#tuH&owKXPDIPi-8g-u8+7;akLk>uKG(SQW^TeDAf~lX$eJ3 zKl>LnmbYOan9P73I6HQ0#_wJ@84a6MPtCcmKS$sqwHabD?tpbW@rZ*dOz|^*fS&pA z7+NNRle3BH!%s7fg=!wT6gLytNKusuS~_;L;~)yhH@LQyec3NcWPZ>oIhH!2`Ezu? zCJSXjiBGiw0l0~;bT<}#Uk?<>9CMFZaqV?OW^1%&w`e8Xx1PcW=H%nWF2OoPbN*6s z=^F*1ChTEoE4P+qcZdd&k;=*s!8aTL^UfaucJ@Vpann^_wKB2X!2ts~9hap-a{2tj>I>j7X6-dK)(c?$bL8tQDZHLb;sBKIM!{*CBE9^^W|jY@T!=p#g#>f zmMRKbEMG<}jePnf@CkfI`+=A^`a z0eRrse2;W(x@!FG(7A-$t)i8qrKXvlvN)8pTP$CWK|$6l^eguU9+MrtXSSuNk6niy z(UBF!4GP)8>a}aUvNH{5^D-X1n4Q6m|JHq2N$l%#FKxhb7+)_=!?vBvy%h&q{!U)r zqqJpNrd>g2MX0MpC!r)!+`g8{y>Jb8P&#NKJJ(0{yME4=otmV^8>Wu;%G+ukeC#%M^#_Z-b}Qz&aUr>5f{7Pf@f&B7D6|dw~W}f#}(3YD$Vee2${`{ ztUB+mK^EpfVv08Mj}6j7=N$%mVw`6xqa#Y|T<=O=S<8&ySR#(e zY7f&6?tbLH_CPiLV2@RV_0eGdUC~t+<3WL=IuJ) zp2^;eiW?|Qrq7HcQw>sh@0B{9^YcZq6L55bdg|mH*MZ1pgv7iz%i1h7GQGzl$g}ms zpiw_^bkvfUmUbury~iVZ_^?iRdAEb=PT0^y(Au@HC3I4hJ&RGVqI5H|yG>;aRixt# zUnO9eyNtWWTgz<8zWj7Gh>;Cj6g`a42+V$+URbB}*=WAEM29AuHT}#Zh{ya}cCGaT z%rjep)%6l-_;U~iL*Lxz8kZj;wpH)>J;rX6%7)OJ)W30dwG;lf!3J70*t?DHnZ5sB zeLlcnII1RdN8!0EkXj^;!TlLV_^C+L{)3;hV0-%{!L#un7(%gPb$rdx zQsXlYZF_n?!8BXs6={0aYqGao7r9>L6IC#AJ+CyEqJ>ig=;SDYR?31h4Rp@#XeH#G zJnU&Pb-1y8a6`K}t-=3egnX_yjc`iz>AlY7sz;wP&0=qmcL|t)44%Qw;I!BeXzB}4 z1c}him&xeKw9txgp&*-?z)|vDa34-T0l}B_Y*GkX@J9=|VZyP*1BLFqDeRub?4CMP zkag>aV`$SE`b>9QhunmP*pBm2?K`b^-5>mOQyeL_%QN3yMIVDt)PS~l*)HNQSKl-EHrd?#DQL`>*;=jl)`oI|fjMbRf+x`| zFoL(L{*|L&1zPTQMj9ipkL{XJ3|y#H?iE%$SrQ?zFxe8BeowviCy-?2VW`=p0^49YBv6O$>v|Us~RP zWc2j*V~(B#(YL-NHMjE!GL3e^9W1O(*C))JDWlgYeF2eQ=((R@#$NAY9(*^_EYaio zM?Za&?3&aqwT)@U>=MhzFKmTmjX#{YxUGtD?n4H2Mf_@Nt5h5YMFy>Y+)=B2{;Exs zQfw6L;o|vX%!jrzs^KtLho;}n&2IR+WH+L_h|J*(#Vy;q=oMa=@a8cS7*lf)<2PG# z{9cMjG$v#|dh!rmp68FvfYW>zq9h+4UxbvOoGY`TeJj4jkT$p}4{35W;O{P{{A}HV z$%thh_Fy*}Q9)nLJ08l_Ydx`kwSCDX!+cW<(a2d4 z=LO(fC}}tfb?Uz)nNvJdG7Yl49zW^*+GB>g-(yoFODrjMIi^?iYiv=-aeV;aVA$FW zO}%-#lPRr%&9#WEcxh>ZI`E$H%IYX2M9%qH^aCSaysWc8#B%O(>U#X^Y8Reg0a>-LHf>mN^9y+2wT z^EbFsYO1QxCT88eGlqxfV!0pSh{tBLGj@aca56nX#Vwh;-wjzeta9_EbVP;6WXkT@ z3eVZI(3d(ww~tIjcH|^D91A<4fW^NqeeU|pX@QPJpt1GO`U7GH!b=IHfa z0G>+?PYv24%2;lGjT%{ zc_Ul(QQcOQ@rieMVCI4a#PE&2s79a(m9?3>YY&c<(Y|J=<>_sC(&3Ss(G*ddN+CnV z*PvA9TK0WUMY$f?h>yz~(cOAI-*fvR^rdY$uQ$n=;O_I1JklN91Kc8Hya^hSjdvH; zH^s#^oR&319Y8Hj^$u^7(-OPWh4e(einOHiJ2dd!^QAO)AFaEuN>}I3RJ9adelhvt4e1PKc2{kqT_;<1F84qR>XG{ zoZIUqg})?!RB=y)b6G-<;E4C9Drw@$-$3UpXWE9EREs8}mK1Mba-pP<21&w&>^s;; z>^&yJex@Bjadwye>>!S@lWz0y0^k>Z0SM315B$l(asddlI$yZ}aG;y^dV`xzs^xZ* z{qgS$N;}m3JSe^Zpf;KbKvB1RD<1h|Ma`n>&!Cnjz{+JeD~f$YI)#PixndO!p??7{ zf4a4QD{Df5+z1)Y97MC)&)S%QTsp&pd*NVoNA;z4W8eB5bMp3;==hmMlRajcX~K~X z&esd&6LFCxh3Jg46{C4#9ceq$$eHdvJXKzf{O~)8H|+tpSXNG&O0|zZqm^k)}> z!qqx4Vh8okcw+!9Upinr_1?GMYhre;&p7QtYcPta6i@uB2?Nk%@1lCoE^+%^>t#dE z#x9=B==yy-$Mfd5z|!@iDc8{~Rm#od2CLwg?>T_EeS>#5DTZxWrv1I)miz48=0C}) z?RIXX794>KHk(Ivb10zZ ze1N;K)@yPr$>Qfq0ts@CzvW6BdzvQ@~M zF<^Nrvm1q%v&&G=m@J{H$cB4Ah5xIx;#qU)y`v;{g!T1XWub4&t}`~47rc{tP*|S$ z0uo#y@bv=lQAQ~J(clu<4RT7|;q^roxATn(aZm)x(LP;WXC&0Uq!aRCP~5DCY+aMB zS-@8gvb6{NF3+vz_NJ@J_Ei!ozf{R&EJg|-HtOtoBYivjHIFsRQHINGf&pFWhBzPB zd#(x#XD^YY2AY)gj&)B~p%5>QDhnSh3n$m`cO}l7wX_wr_wS`0Q(piqP+s`3r`KS?|=oNlAOyZo?C2X~MbX-_DH=*mItrY}~h#EBH_Sl1#yoqlLtHgeDDuHVW{y*=*fvhd$w}|xMp_TrFFfnzapgzK zxPqwe?&DrH3PGFW^tae=B_f$cKj_x`fAOlfi=+>trf%P-2iApr?$G^wx$4eS zZ%zHX)AxJ(pluq&BqNc#`fDJstL}j`QVQf2)AfFE-9IS z3=QMBGKB)8NoK*WmZe|ZpsyC4%?AiY}ErL2y>8FEe1v=5{gYNtZo5w}IW1IWqEYVqv@c zwag#X=;LMnjAYJ_lyi?-y6M@H-;+G!WpZ}fD?dEo>tHkJG^^DySv4DrjVJ6o$}+57TG8bWt_X8iZrN&B zVHv3ciTEtimRW{w=!k=X91?cu&%qGM{MTjG2N(O*oWYag{l`$huMMXnfyd?aXCp+% z<*b|M_o|tt80Nr-*ancO&ySUbnPmtU=y}4c=GvZ=%SA6@^eZ1D%snU)n&UD)0#|8j&VF86I3$}mb_?8&ZgfwM#eK&&0N8Yh=f z(j4tRh!5*)2|GYdG{w}}Ge zYZuvG0|g?d5L9^Ha8mUfgyX4{U-~Ge5P3Vgpzt$1#Apn`Mx~@ka9aQY?PGX^5hCAG)Y?^Sr>59~ z&5InTH{+M#cku;iU|4o(7YVTk#1jhjM&jbbNz6jtLNN5$Z>_bALCyq(e1v@LrTDq) z^7YUs@E}wR2K#>lh#TZ+T9`Xb3w(Ltcj*By4@#iCd_IvGnwvNj1-$~d2rWH?mO|g7 z-bYc>@n1o7Slx=^V8GSluM)xTn#z}6X48NqsLP}Vb~~L04++yULGr;TElASvO7Ry1 z0^o2s3Iznxo}h|h_JO`#*zHyllnH(r(VvSyHSo$J-Ijba?jjKNo`(*bA~69rQ#a#r zkRsKPLWG>kY+e8_ady!-N?iNF{VS88gkWvqZa##O$eOBD-9hz*Z}1oaME!os?; z$i{7UkI0`|4};A@SRk+)j|Aowc>GML`cfbt?6v0xOn4La@p6kz=ojzI@Y%o^0%f{i z*+$+!p5e~nm&#*2P{mtVO5kv?)+|XH?}0qFff1^BUA_tqa3&@u@tdXMz>+u-h?JiX zHNMLCi2K@lX!0%z>M0fmT|QRn7EDOK8CXVmj{pX2CXfJ<9HQRABD!w>oX`^HX7hjp z9JgS-89IulhC^I$m4}DlnFLVfLC&9oeElNG$e6PEwe}^GzDE3X8hKjcmYCb*9TS4I zjMmEs33<#P-_?`&&@ney`05-DaN$6UwttduDGRClWX|5J_<-E8#E(~ubF6qBR+gy{ z`A+le`<_@{30`|4Tq1Hax5ldzlm3cI;X`vS&bAJ`d&Rgv`x&IB#1$jqGO;FO#8hD>K>HYLiF9+{Oo?)`wWtyNA*sa`fKKD=}@w^^sKn=-)$g?&Q@2%njCq(PYj?& z$%~>*z+TCuyaI`Sy47mOiN?mWiCu87=CF_&j?Fm2cG`Ok`*{VC&1WBC(pL~AD-PHf zAtf%0c_JpH1i^OY%q+?FIDt^FI%S-+@V>fD(sRW35I~sAJow4=Onw(Uys#&0ugQS~ z=5ID;5$sA@gN?O~!OA_@ZK*{e=*IWYuwt27(kB_{BxFSdecOVVxI{HxNa+H`D4X=j z#{?7}Eya(B$lALT>tal%(Nd-{q`r`SWHDXH#DEkCQC@0P^-hE#;rgBVXO7Ro*VfiX zeP6Y|Iw*#d+a&KY6|CL16GQ3U#!RdV76e3>f>I$hge%zt5xzH({kot>cQ_uj7_#r- z$ro1G7@i)*yfj-=kAmN77hWF`RG#62g2}c4WT7D~>SmJJR*7nYF)y`)BvnVMNnaP8 zmfE6Q)V=c4g0hpd*5f(=Ez>Bkc8(#k=BBE3Ez68PbrDW3-3DR%Z6TKgqeKA@_R2|o z{Sq5;eor?Jew%M$E-$L-Un&?w*1IJ3?tCH|YIZ^Q9)e3*43w$<~8v zM;N%6d#;xRPKVetUdx5P$DQ@4#VCC~?=wz&!^iRE4^XBSfO{kfL@^{W*w+f!7>ONZCt zP3`GdvMvw5x1Pe7`RE(zwE{x!TvuKATwa%y2P|}cL|R2ww1wBRhvZg#<8@bZ&&_r4 z-gY}B`(nWW(aGo(8Hkd2{`5{nWXIDryCZuo8~0SU3}0wOL||tp>w}rK;!=*?6+gfG zB!B}t_OFDH&SxTq45h?)}GiZCAvPw6gmKGac? z&O!r&>#7Y&ShA`U6ydzqUOhfIi(t#fG<|?(+Nj;W+S9g7VI75`w4`8NQ_YOMQB854=MI6P@A@P~O zGLcf;iPzF?m55{AbK=CV8AR3$d${^icNtYdN$m{7CH8^>sdr(LaSX|iX349l!LIVm zT_6q`d~WV}FomfIRRzEWrX<1u^?;`0r4hqfpW-jVJy0GfYPxTw_|iyRoLR8OE)8BO zkPrfvgobd>2KEE3vHAN73^(lcGTfCLlua1ePr$brprwK4(wz Date: Tue, 27 Oct 2020 20:33:18 +0800 Subject: [PATCH 286/329] =?UTF-8?q?Fix=20bug#12019=2012019-KT=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=EF=BC=88=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=91=E8=BF=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index bc69da7..1e25ec8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -278,6 +278,18 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } + public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime, + Double snp, Long totalBoxes, Double qty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.planDate = planDate;//批次号（yyyyMMdd） + this.planTime = planTime;//批次号（yyyyMMdd） + this.snp = snp; + this.totalBoxes = totalBoxes.intValue(); + this.qty = qty; + } + public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; From b6a309bacfbba8eb0bfa30f02f06a09e16599b7a Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 27 Oct 2020 20:36:37 +0800 Subject: [PATCH 287/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20ERP=20=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E6=95=B0=E6=8D=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/bean/snapshot/erp/WmsErpQuanAreas.java | 33 ++++++++++++++++++++++ .../wms/repository/WmsErpCheckPointRepository.java | 9 ++++++ .../wms/repository/WmsErpQuanAreasRepository.java | 9 ++++++ 3 files changed, 51 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java new file mode 100644 index 0000000..7e712f7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : ERP 库存比对包含的库存地点 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-10-27 14:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ERP_QUAN_AREAS") +public class WmsErpQuanAreas extends BaseBean { + private static final long serialVersionUID = 5560607687871639209L; + + @Column(name="AREA_NO") + @ApiParam("库存地点") + public String area_no; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java new file mode 100644 index 0000000..e21870a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpCheckPointRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCheckPoint; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpCheckPointRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java new file mode 100644 index 0000000..02b6561 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsErpQuanAreasRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpQuanAreas; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsErpQuanAreasRepository extends BaseRepository { +} From 36928196c1bb7f38e42f047a6468bfc5d743e094 Mon Sep 17 00:00:00 2001 From: songss Date: Tue, 27 Oct 2020 21:01:18 +0800 Subject: [PATCH 288/329] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E7=9C=8B=E6=9D=BF-?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=94=E5=9B=9E=E6=8E=A5=E5=8F=A3=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java index ae43578..bbbb380 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPicture.java @@ -37,4 +37,8 @@ public class MesBoardPicture extends BaseBean implements Serializable { @Column(name = "PICTURE_URL") @ApiParam("图片路径") private String pictureUrl; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java index be79660..b2638a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.java @@ -33,12 +33,12 @@ public class MesBoardSwitchCfg extends BaseBean implements Serializable { @ApiParam("看板代码") private String boardCode; - @Column(name = "SWITCH_INTERRVAL") + @Column(name = "SWITCH_INTERVAL") @ApiParam("屏切换频次") - private Integer switchInterrval; + private Integer switchInterval; - @Column(name = "LINE_SWITCH_INTERRVAL") + @Column(name = "LINE_SWITCH_INTERVAL") @ApiParam("产线切换频次") - private Integer lineSwitchInterrval; + private Integer lineSwitchInterval; } From 3ad59884a85fe9e60a539caad13661732687d79a Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 27 Oct 2020 21:43:56 +0800 Subject: [PATCH 289/329] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84=E6=8F=90=E5=89=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index e221563..79b7084 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -72,6 +72,11 @@ public class WmsWorkCenter extends BaseBean { searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; + @Column(name = "PRE_WO_MINUTE", columnDefinition = "int default 600") + @ApiParam(value = "计算未完成工单的提前时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer preWoMinute; + @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180") @ApiParam(value = "提前拉动时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) From 1b6264e80da44af77758e0725ed0b12add32421a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 28 Oct 2020 09:36:33 +0800 Subject: [PATCH 290/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 8754eae..f308538 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -20,6 +20,21 @@ public class MgnBoardListModel { @ApiParam("当班实际产量") private Double shiftActualYield; + @ApiParam("当前时间分钟") + private String currentMinTime; + + /** + * 开班时间到当前时间按分钟累计计划数量 + */ + @ApiParam("每分钟计划产量") + private Double minPlanYield; + + /** + * 开班时间到当前时间按分钟累计实际数量 + */ + @ApiParam("每分钟实际产量") + private Double minActualYield; + @ApiParam("计划完成率") private String planCompleteRate; From 760307910a3abd9a1984a2ca2bf858a2f8427c03 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 28 Oct 2020 10:52:30 +0800 Subject: [PATCH 291/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5MGN=E7=B3=BB=E5=88=97?= =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/modelbean/WmsVendorDelayMasterModel.java | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index a3fd7c8..b327dc3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -17,6 +17,12 @@ import lombok.Data; public class WmsVendorDelayMasterModel extends BaseBean { private static final long serialVersionUID = 1589775350017343999L; + @ApiParam(value = "订单号") + private String orderNo; + + @ApiParam(value = "原因") + public String reason; + @ApiParam(value = "供应商代码") private String vendorNo; @@ -26,12 +32,28 @@ public class WmsVendorDelayMasterModel extends BaseBean { @ApiParam(value = "延迟次数") private Long delayCount; + @ApiParam(value = "延迟次数") + private Long sumDelayCount; + @ApiParam(value = "查询开始时间") private String startDateTime; @ApiParam(value = "查询结束时间") private String endDateTime; + @ApiParam("计划交货日期") + private String planDate; + + @ApiParam("计划交货时间") + private String planTime; + + @ApiParam("实际交货时间") + private String actualPlanTime; + + @ApiParam("计划交货时间") + private String planPlanDateTime; + + public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) { this.vendorNo = vendorNo; this.vendorName = vendorName; @@ -40,6 +62,22 @@ public class WmsVendorDelayMasterModel extends BaseBean { this.createDatetime = createDateTime; } + public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, String actualPlanTime, String vendorNo, String vendorName, String organizeCode) { + this.orderNo = orderNo; + this.reason = reason; + this.planDate = planDate; + this.planTime = planTime; + this.actualPlanTime = actualPlanTime; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.organizeCode = organizeCode; + } + + public WmsVendorDelayMasterModel(String vendorNo, Long delayCount) { + this.vendorNo = vendorNo; + this.delayCount = delayCount; + } + public WmsVendorDelayMasterModel() { } From f57be38c2bd8bee3271e099dcdb17cc05e5a9246 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 28 Oct 2020 11:28:33 +0800 Subject: [PATCH 292/329] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG:=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=8D=95-=E6=96=B0=E5=BB=BA=E5=AE=8C?= =?UTF-8?q?=E6=AF=95=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=88=B0->=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=9A=84SQL?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c55e93f..7f56701 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 @@ -580,7 +580,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int listCount() { try{ - Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class) + Long count = entityManager.createQuery("select count(0) from " + persistentClass.getName() + " as model", Long.class) .getSingleResult(); return count == null ? 0 : count.intValue(); }catch(NoResultException e){ From 4684466e7e174a6fa1621db9230477bff5075f7b Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 28 Oct 2020 14:53:37 +0800 Subject: [PATCH 293/329] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG:19048-=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?:=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=9A=84SQL=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7f56701..770d14b 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 @@ -886,7 +886,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByHqlWhereCount(DdlPackBean packBean) { StringBuffer queryString = new StringBuffer(); - queryString.append("select count(model) from " + persistentClass.getSimpleName() + queryString.append("select count(0) from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getWhereAppend()); Query query = entityManager.createQuery(queryString.toString(), Long.class); From 5e1d0a75c965044961bb8009c9c948c3ceb09b92 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 28 Oct 2020 15:07:43 +0800 Subject: [PATCH 294/329] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG:19048-=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?->=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=80=BB=E6=95=B0?= =?UTF-8?q?=E7=9A=84SQL=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 770d14b..7f56701 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 @@ -886,7 +886,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByHqlWhereCount(DdlPackBean packBean) { StringBuffer queryString = new StringBuffer(); - queryString.append("select count(0) from " + persistentClass.getSimpleName() + queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getWhereAppend()); Query query = entityManager.createQuery(queryString.toString(), Long.class); From df35a22aac9b7f025223e2a4f8fbabe005c042a0 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 28 Oct 2020 15:10:02 +0800 Subject: [PATCH 295/329] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG#12121=20=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=8D=95-=20=E6=96=B0=E5=BB=BA=E5=AE=8C?= =?UTF-8?q?=E6=AF=95=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=88=B0:=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E7=9A=84SQL=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7f56701..2ad2a01 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 @@ -580,7 +580,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int listCount() { try{ - Long count = entityManager.createQuery("select count(0) from " + persistentClass.getName() + " as model", Long.class) + Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model", Long.class) .getSingleResult(); return count == null ? 0 : count.intValue(); }catch(NoResultException e){ From d7bad41b2940930bd1d375ee2da7819eb0e42a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 28 Oct 2020 17:01:29 +0800 Subject: [PATCH 296/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3BUG#12111=EF=BC=8C12110=EF=BC=8C12108=EF=BC=8C12105?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 183ab40..542301e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -356,4 +356,10 @@ public class WmsStockQuan extends BaseBean { this.scrapQty = scrapQty; this.areaNo = areaNo; } + + public WmsStockQuan(String partNo, String partNameRdd, Double qty) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + } } From c9378a7d8cb7ca6abc8ae913f7d229f04daeeaf4 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 28 Oct 2020 19:37:52 +0800 Subject: [PATCH 297/329] =?UTF-8?q?=E3=80=9011959=2019125+PDA=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=8B=86=E5=88=86=E6=95=B0=E9=87=8F=E8=B6=85=E8=BF=87?= =?UTF-8?q?100=E9=83=A8=E5=88=86=EF=BC=8C=E6=9D=A1=E7=A0=81=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E4=B8=8D=E5=A2=9E=E5=8A=A0=E3=80=82+1020=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index e336469..c136a32 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -237,7 +237,7 @@ public class DdlPreparedPack { */ public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%"); + packBean.addColumnQuery("rl_"+columnName, " and model." + columnName + " like :m_rl_" + columnName, val + "%"); } } @@ -250,7 +250,7 @@ public class DdlPreparedPack { */ public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val); + packBean.addColumnQuery("ll_"+columnName, " and model." + columnName + " like :m_ll_" + columnName, "%" + val); } } 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 293f70d..f036e0d 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 @@ -1749,11 +1749,14 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); - DdlPreparedPack.getOrderByPack( + /*DdlPreparedPack.getOrderByPack( new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE}, - new String[]{"sn", "createDatetime"}, result); + new String[]{"sn", "createDatetime"}, result);*/ +// result.setWhereAppend(result.getWhereAppend() + " and sn <> '"+wmsStockSn.getSn()+"'"); + return result; } From 31cdda5b33e0918b9fd042c6b188df6439271596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 28 Oct 2020 20:24:07 +0800 Subject: [PATCH 298/329] =?UTF-8?q?feat(softswitch):=E9=80=82=E9=85=8D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95,FTP=E6=96=87=E4=BB=B6=E6=94=AF=E6=8C=81SID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 8 ++-- .../pojo/model/softswitch/SuitClientModel.java | 30 +++++++++++++++ .../i3plus/pojo/model/softswitch/SuitModel.java | 45 ++++++++++++++++++++++ .../pojo/model/softswitch/SuitRecordModel.java | 4 ++ .../pojo/model/softswitch/SuitServerModel.java | 17 ++++++++ .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 9 +++++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 8 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 23191f8..753cfb3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -231,7 +231,8 @@ public class BlockSoftSwitchEnumUtil { CLOUD(5,"Cloud调用"), REST(6,"REST调用"), WEB_SERVICE(7,"WebService"), - SOCKET(8,"socket"); + SOCKET(8,"socket"), + RETRY(9,"重试"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index f401265..337c41d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -245,12 +245,12 @@ public class CommonEnumUtil { return tmp; } - public static int descOf(boolean desc) { - return desc ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); + public static int boolOfOfVal(boolean boolVal) { + return boolVal ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } - public static int descOf(int desc) { - return desc == 0 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); + public static int intOfVal(int boolIntVal) { + return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } public static TRUE_OR_FALSE valueOfEnum(int value){ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 4c82b54..7a1eea4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -39,6 +39,17 @@ public class SuitClientModel implements Serializable { private Integer actionId; /** + * 调用方自定义标识 + */ + @XStreamAsAttribute + private String suitSid; + + /** + * 重试记录id + */ + private Long retryRecordId; + + /** * 适配器信息 */ private BsSuitCaseModel suitCaseModel; @@ -142,4 +153,23 @@ public class SuitClientModel implements Serializable { // 设置默认 this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } + + public SuitClientModel(SuitModel suitModel, BsSuitCaseModel suitCaseModel) { + this.requestSource = suitModel.getRequestSource(); + this.suitSid = suitModel.getSuitSid(); + this.retryRecordId = suitModel.getRetryRecordId(); + + this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); + this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId(); + this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode(); + this.suitCaseModel = suitCaseModel; + + // 设置默认 + this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + // 设置默认 + this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + // 设置默认 + this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java new file mode 100644 index 0000000..984bf02 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * 软适配执行适配器(客户端服务端适配总入口) + * 所需的参数模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-10-28 15:51 + * @Modify: + **/ +@Data +public class SuitModel implements Serializable { + + private static final long serialVersionUID = 8981933192688480221L; + + @ApiParam(value = "适配器代码") + private String suitCaseCode; + + @ApiParam(value = "适配SID") + private String suitSid; + + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.REQUEST_SOURCE.class) + @ApiParam(value = "适配来源") + private Integer requestSource; + + @ApiParam(value = "重试记录id") + private Long retryRecordId; + + @ApiParam(value = "适配器参数XML") + private String paramXml; + + @ApiParam(value = "适配器参数") + private List bsSuitCaseParamList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java index 5367486..2b5db90 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import io.swagger.annotations.ApiModel; @@ -23,6 +24,9 @@ public class SuitRecordModel { @ApiModelProperty("适配文件") private BsSuitFile bsSuitFile; + @ApiModelProperty("分页信息") + private Pager pager; + public SuitRecordModel() { } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index 0f5fcf7..4dd5f5f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -39,6 +39,13 @@ public class SuitServerModel implements Serializable { // 请求ID private String requestId; + + // 调用方自定义标识 + private String suitSid; + + // 重试记录id + private Long retryRecordId; + // 传输单对象 @XmlElement(name = "data") @XStreamAlias("data") @@ -110,4 +117,14 @@ public class SuitServerModel implements Serializable { // @XStreamImplicit private String analyzeMessage; + + public SuitServerModel(){ + } + public SuitServerModel(SuitModel suitModel){ + this.suitCaseCode = suitModel.getSuitCaseCode(); + this.requestSource = suitModel.getRequestSource(); + this.suitSid= suitModel.getSuitSid(); + this.retryRecordId = suitModel.getRetryRecordId(); + this.obj = suitModel.getParamXml(); + } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 76b54fe..3f03e22 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -61,6 +61,15 @@ public class BsSuitRecord extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseDetailId; + @Column(name = "SUIT_SID") + @ApiParam(value = "适配记录SID") + private String suitSid; + + @Column(name = "RETRY_RECORD_ID") + @ApiParam(value = "重试记录id") + @JsonSerialize(using = ToStringSerializer.class) + private Long retryRecordId; + @Column(name = "SUIT_METHOD_ID") @ApiParam(value = "适配方式id枚举（定时适配，主动适配）") private Integer suitMethodId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 2d9e16d..afb8677 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -320,6 +320,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); + DdlPreparedPack.getStringLikePack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); From f57f4e25be275d94de508184790e667313534826 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 28 Oct 2020 22:00:29 +0800 Subject: [PATCH 299/329] =?UTF-8?q?mgn-bj=20=E6=80=BB=E5=B1=8F=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 40 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 4 +++ .../i3plus/pojo/mes/model/QueueJitActualModel.java | 8 +++++ .../i3plus/pojo/mes/model/mgnbj/BjBoardModel.java | 41 ++++++++++++++++++++++ .../pojo/mes/model/mgnbj/BjBoardSeriesModel.java | 18 ++++++++++ 5 files changed, 111 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index a0e0dde..fa8307a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7972,4 +7972,44 @@ public class MesEnumUtil { } } + /** + * 看板-安灯监控状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_QUEUE_STATUS { + CALL(10, "呼叫"), + RESPONSE(20, "响应"), + SOLVE(30, "解决"); + + private int value; + private String description; + + ANDON_QUEUE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 0739b8d..4e32b80 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -98,4 +98,8 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工位类型名称") private String workCellTypeName; + @Transient + @ApiParam("安灯呼叫状态") + private Integer andonQueueStatus; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java index 31edd81..5e40bdc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -111,4 +111,12 @@ public class QueueJitActualModel { this.createDatetime = createDatetime; } + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String produceCtgyCode, String custPlantCode, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.produceCtgyCode = produceCtgyCode; + this.custPlantCode = custPlantCode; + this.createDatetime = createDatetime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java new file mode 100644 index 0000000..421d7e5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/10/28 11:27 AM + * @Modify: + */ +@Data +public class BjBoardModel implements Serializable { + + @ApiParam("jsa数量") + private Integer jsaQty; + @ApiParam("完成数量") + private Integer completeQty; + @ApiParam("总数量") + private Integer totalQty; + @ApiParam("预警数量") + private Integer warnQty; + @ApiParam("预警率") + private Integer warnRate; + @ApiParam("目标合格率") + private Integer targetRate = 0; + @ApiParam("一次合格率") + private Integer onceQualityRate = 0; + + @ApiParam("x坐标内容") + private String xAxis; + + @ApiParam("x坐标内容") + private List xAxisList; + + @ApiParam("显示数据") + private List seriesModels; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java new file mode 100644 index 0000000..fa764fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/BjBoardSeriesModel.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/10/28 2:56 PM + * @Modify: + */ +@Data +public class BjBoardSeriesModel { + @ApiParam("名称") + private String name; + @ApiParam("显示数量") + private Integer qty; +} From 104fa0efa5444fcd71185b4927b020d549751ba4 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Wed, 28 Oct 2020 22:09:05 +0800 Subject: [PATCH 300/329] =?UTF-8?q?=E5=AE=8C=E6=88=90ERP=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java index 7e712f7..26af6b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java @@ -24,10 +24,15 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_ERP_QUAN_AREAS") -public class WmsErpQuanAreas extends BaseBean { +public class WmsErpQuanAreas extends BaseBean implements Comparable { private static final long serialVersionUID = 5560607687871639209L; @Column(name="AREA_NO") @ApiParam("库存地点") - public String area_no; + public String areaNo; + + @Override + public int compareTo(WmsErpQuanAreas o) { + return this.getAreaNo().compareTo(o.getAreaNo()); + } } From 6d4e8608c47d88513a8a32dc4dd8d0a4c96c205c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 29 Oct 2020 03:54:12 +0800 Subject: [PATCH 301/329] =?UTF-8?q?=E6=B3=A8=E5=A1=91=20=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=BC=80=E5=8F=91=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfProductOffLine.java | 13 +++- .../pojo/mes/bean/MesBoardLineCoordsMatrix.java | 53 ++++++++++++++++ .../i3plus/pojo/mes/bean/MesBoardLineMatrix.java | 73 ++++++++++++++++++++++ .../pojo/mes/bean/MesBoardLineStaffMatrix.java | 61 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesLineFaultRecord.java | 43 +++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesStaff.java | 58 +++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 13 ++-- .../pojo/mes/model/{mgnbj => mgn/bj}/CodeRule.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Document.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Head.java | 2 +- .../{mgnbj => mgn/bj}/JisaJphReportModel.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Message.java | 2 +- .../model/{mgnbj => mgn/bj}/MgnBjJitPlanModel.java | 2 +- .../{mgnbj => mgn/bj}/MgnBjRecipePartsModel.java | 2 +- .../mes/model/{mgnbj => mgn/bj}/OptionCode.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Part.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Parts.java | 2 +- .../pojo/mes/model/{mgnbj => mgn/bj}/Pn.java | 3 +- .../i3plus/pojo/mes/model/mgn/tj/AndonModel.java | 20 ++++++ .../i3plus/pojo/mes/model/mgn/tj/DefectModel.java | 22 +++++++ .../pojo/mes/model/mgn/tj/GoodRateModel.java | 26 ++++++++ .../i3plus/pojo/mes/model/mgn/tj/OeeModel.java | 30 +++++++++ .../pojo/mes/model/mgn/tj/ProductivityModel.java | 20 ++++++ .../pojo/mes/model/mgn/tj/StaffMatrixModel.java | 24 +++++++ .../MesBoardLineCoordsMatrixRepository.java | 16 +++++ .../repository/MesBoardLineMatrixRepository.java | 16 +++++ .../MesBoardLineStaffMatrixRepository.java | 16 +++++ .../repository/MesLineFaultRecordRepository.java | 16 +++++ .../pojo/mes/repository/MesStaffRepository.java | 16 +++++ 29 files changed, 542 insertions(+), 17 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/CodeRule.java (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Document.java (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Head.java (94%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/JisaJphReportModel.java (82%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Message.java (95%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/MgnBjJitPlanModel.java (97%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/MgnBjRecipePartsModel.java (83%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/OptionCode.java (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Part.java (96%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Parts.java (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{mgnbj => mgn/bj}/Pn.java (92%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java 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 index ba85092..b9aeefa 100644 --- 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 @@ -1,11 +1,12 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -28,6 +29,8 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PRODUCT_OFF_LINE") +@NoArgsConstructor +@AllArgsConstructor @Api("生产报工表") public class IfProductOffLine extends BaseBean implements Serializable { @@ -153,4 +156,12 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "BASE_MODULE") @ApiParam("BaseModule零件号") private String baseModule; + + public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) { + this.partNo = partNo; + this.packageNo = packageNo; + this.qty = qty; + this.workCenterCode = workCenterCode; + this.qcStatus = qcStatus; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java new file mode 100644 index 0000000..aa0bce6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineCoordsMatrix.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE_COORDS_MATRIX") +@Api("MES_看板产线坐标") +public class MesBoardLineCoordsMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = -7823702941907604215L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "X_AXIS") + @ApiParam("X坐标") + private String xAxis; + + @Column(name = "Y_AXIS") + @ApiParam("Y坐标") + private String yAxis; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java new file mode 100644 index 0000000..d8e07a0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineMatrix.java @@ -0,0 +1,73 @@ +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 : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE_MATRIX") +@Api("MES_看板产线矩阵") +public class MesBoardLineMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = 4414374274261870347L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "PICTURE_URL") + @ApiParam("产线图片路径") + private String pictureUrl; + + @Column(name = "USER_FIRST") + @ApiParam("用户编号1") + private String userFirst; + + @Column(name = "USER_SECOND") + @ApiParam("用户编号2") + private String userSecond; + + @Column(name = "USER_THIRD") + @ApiParam("用户编号3") + private String userThird; + + @Column(name = "USER_FORTH") + @ApiParam("用户编号4") + private String userForth; + + @Column(name = "USER_FIFTH") + @ApiParam("用户编号5") + private String userFifth; + + @Column(name = "USER_SIXTH") + @ApiParam("用户编号6") + private String userSixth; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java new file mode 100644 index 0000000..ee461b9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLineStaffMatrix.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_LINE_STAFF_MATRIX") +@Api("MES_看板产线员工能力矩阵") +public class MesBoardLineStaffMatrix extends BaseBean implements Serializable { + private static final long serialVersionUID = 1889056360071546259L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位代码") + private String workCellCode; + + @Column(name = "USER_CODE") + @ApiParam("员工编号") + private String userCode; + + @Column(name = "X_AXIS") + @ApiParam("X坐标") + private Double xAxis; + + @Column(name = "Y_AXIS") + @ApiParam("Y坐标") + private Double yAxis; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java new file mode 100644 index 0000000..5380410 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java @@ -0,0 +1,43 @@ +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 + * @date 2020/10/27 13:29 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_LINE_FAULT_RECORD") +@Api("产线故障记录表") +public class MesLineFaultRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6108659377329720059L; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "FAULT_TIME") + @ApiParam("故障时长（分）") + private Double faultTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java new file mode 100644 index 0000000..29ffebf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStaff.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : 员工信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STAFF") +@Api("员工信息") +public class MesStaff extends BaseBean implements Serializable { + private static final long serialVersionUID = -8330599945613548761L; + + @Column(name = "USER_CODE") + @ApiParam("员工编号") + private String userCode; + + @Column(name = "USER_NAME") + @ApiParam("姓名") + private String userName; + + @Column(name = "PICTURE_URL") + @ApiParam("照片路径") + private String pictureUrl; + + @Column(name = "SKILL_LEVEL") + @ApiParam("技能等级") + private Integer skillLevel; + + @Transient + private Double xAxis; + + @Transient + private Double yAxis; + + @Transient + private String workCellCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index fce6b31..fa677a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description: @@ -387,6 +386,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("已报工数量") private Integer productOffLineQty; + @Transient + @ApiParam("生产节拍") + private Integer takt; + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } @@ -419,10 +423,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { return this.approvalStatus == null ? 0 : this.approvalStatus; } - public MesWorkOrder(){} + public MesWorkOrder() { + } - public MesWorkOrder(String orderNo,String startTime,String workCenterCode,Double qty, - String partNo,String partNameRdd,String itemPartNo,Double itemQty){ + public MesWorkOrder(String orderNo, String startTime, String workCenterCode, Double qty, + String partNo, String partNameRdd, String itemPartNo, Double itemQty) { this.orderNo = orderNo; this.startTime = startTime; this.workCenterCode = workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java index 50601e8..67ed3eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java index cfe4ed4..6ea1cca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java similarity index 94% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java index 7d1c6f2..be1576f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java similarity index 82% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java index 4c4035b..411faac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java similarity index 95% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java index ef61c84..7b7fdc9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java similarity index 97% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java index d9dd5d5..b1219aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java similarity index 83% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java index e61fa14..e85a236 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java index 8a7070f..45c78ff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java similarity index 96% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java index 55efd0e..63d2725 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java index 740b5a0..6916568 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java similarity index 92% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java index fbf4020..9822683 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java @@ -1,11 +1,10 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java new file mode 100644 index 0000000..2c4c39f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 17:30 + * @desc + */ +@Data +public class AndonModel { + + private String workCenterCode; + + private Double xAxis; + + private Double yAxis; + + private String expInfo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java new file mode 100644 index 0000000..5513e58 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/28 13:47 + * @desc + */ +@Data +public class DefectModel { + + private String workCenterCode; + + private Map percents; + + private Integer total; + + private String queryBeginTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java new file mode 100644 index 0000000..3b95ac3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 20:50 + * @desc + */ +@Data +public class GoodRateModel { + + private String workCenterCode; + + private Double goodRate; + + private Integer total; + + private Integer goodTotal; + + private String color; + + private Double passPercentMax; + + private Double passPercentMin; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java new file mode 100644 index 0000000..fcf204f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 13:47 + * @desc + */ +@Data +public class OeeModel { + + private String workCenterCode; + + private Integer takt; + + private Integer standardTakt; + + private String color; + + private Double threshold = 0.03; + + private Double realProductivity; + + private Double oeePercent; + + private Double realWorkTime; + + private String shiftBeginTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java new file mode 100644 index 0000000..a3ea101 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/10/28 14:10 + * @desc + */ +@Data +public class ProductivityModel { + + private String time; + + private Integer planProductivity; + + private Integer realProductivity; + + private boolean isCurrentInfo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java new file mode 100644 index 0000000..cb9a30e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import cn.estsh.i3plus.pojo.mes.bean.MesStaff; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/10/28 21:44 + * @desc + */ +@Data +public class StaffMatrixModel { + + private List workCenterCodes; + + private String currentWorkCenterCode; + + private String workCenterPictureUrl; + + private List staffs; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java new file mode 100644 index 0000000..c259074 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.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.MesBoardLineCoordsMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineCoordsMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java new file mode 100644 index 0000000..b381acf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.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.MesBoardLineMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java new file mode 100644 index 0000000..95ecb83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.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.MesBoardLineStaffMatrix; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesBoardLineStaffMatrixRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java new file mode 100644 index 0000000..a367516 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.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.MesLineFaultRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesLineFaultRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java new file mode 100644 index 0000000..ddd50d4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.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.MesStaff; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStaffRepository extends BaseRepository { +} From 20ee1215d2b3ef31798650ee4e2b046dd42085c1 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 29 Oct 2020 03:59:46 +0800 Subject: [PATCH 302/329] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E5=8C=85=E5=90=8D?= =?UTF-8?q?=E7=BB=86=E5=8C=96=20=E5=AF=BC=E8=87=B4=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java index 421d7e5..fee720e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java index fa764fa..3b113ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgnbj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; import io.swagger.annotations.ApiParam; import lombok.Data; From 37c95dc6b32b8401b5a405833b4947b8e8ff67c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 29 Oct 2020 10:36:44 +0800 Subject: [PATCH 303/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/MgnBoardAssembleCompRateModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java index e4e28cb..d4fc145 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -18,4 +18,31 @@ public class MgnBoardAssembleCompRateModel { @ApiParam("合格率偏差值") private String fpyDeviationValue; + @ApiParam("日期") + private String date; + + @ApiParam("目标OEE") + private String planOee; + + @ApiParam("实际OEE") + private String finaOee; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷占比") + private String defectProportion; + + @ApiParam("一次目标良品值") + private Double planFirstPassYield; + + @ApiParam("最终目标良品值") + private Double planPassYield; + + @ApiParam("一次良品率") + private String firstQualifiedRate; + + @ApiParam("最终良品率") + private String finalQualifiedRate; + } From 87611856dd3a3344a827bad3d5de6bae95be8c48 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 29 Oct 2020 13:11:34 +0800 Subject: [PATCH 304/329] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E5=A4=9A=E7=BA=A7BOM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index 8bddf7e..d382a00 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -173,6 +173,10 @@ public class WmsPartExtend extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String lastQcTime; + @Column(name = "CYCLE_IQC") + @ApiParam(value = "周期内免检", example = "1") + private Integer cycleIqc; + public Integer getQcPassCount() { return this.qcPassCount == null ? 0 :this.qcPassCount.intValue(); } From 5487c165ff9ec0abebba8e04d31e8a8682ae4349 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 29 Oct 2020 13:22:50 +0800 Subject: [PATCH 305/329] =?UTF-8?q?=E3=80=9011883=2020021--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E9=A2=86=E6=96=99=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?--1023=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 49 ++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java | 100 +++++++++++++++++++++ .../pojo/wms/repository/WmsPlcRepository.java | 16 ++++ 3 files changed, 165 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index cdd8873..c6deb39 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -9243,4 +9243,53 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * PLC业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_BUSI_TYPE { + DR(10, "DR", "DR"), + DF(20, "DF", "DF"), + IP(30, "IP", "IP"); + + private int value; + private String code; + private String description; + + PLC_BUSI_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } + + + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java new file mode 100644 index 0000000..b2d9ee2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPlc.java @@ -0,0 +1,100 @@ +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; +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 : jimmy.zeng + * @CreateDate : 2020-10-28 9:54 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PLC") +@Api("WMSPLC配置表") +public class WmsPlc extends BaseBean { + + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + + @Column(name = "PLC_NAME") + @ApiParam("PLC名称") + private String plcName; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.PLC_BUSI_TYPE.class) + private Integer busiType; + + @Column(name = "OPC_URL") + @ApiParam("OPC路径") + private String opcUrl; + + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + + @Column(name = "TAG_NAME") + @ApiParam("标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam("标签地址") + private String tagAddress; + + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + + /*@Column(name = "DATA_TYPE") + @ApiParam("标签类别") + private Integer dataType;*/ + + @Column(name = "USER_NAME") + @ApiParam("用户名") + private String userName; + + @Column(name = "PASSWORD") + @ApiParam("密码") + private String password; + + @Column(name = "START_VALUE") + @ApiParam("开始节点") + private Integer startValue; + + @Column(name = "end_VALUE") + @ApiParam("结束节点") + private Integer endValue; + + @Column(name = "NAME_SPACE_INDEX") + @ApiParam("空间索引") + private Integer nameSpaceIndex = 2; + + @Column(name = "REQUEST_INTERVAL") + @ApiParam("请求间隔") + private Double requestInterval = 500.0; + + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java new file mode 100644 index 0000000..da8fa53 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPlcRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPlc; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-10-28 10:47 + * @Modify: + **/ +@Repository +public interface WmsPlcRepository extends BaseRepository { +} From 3dc951c34f804b70e50484d303264e74e501ec5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 29 Oct 2020 14:38:23 +0800 Subject: [PATCH 306/329] =?UTF-8?q?=E3=80=9011964=2019048-=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E6=8A=9B=E5=85=89=E6=8A=A5=E8=A1=A8=E5=8F=98=E6=9B=B4?= =?UTF-8?q?-20201021=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ++++++++++++++++++++++ .../mes/model/MgnPaintPolishingReportModel.java | 3 + 2 files changed, 80 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index a0e0dde..8ca0b5a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -7972,4 +7972,81 @@ public class MesEnumUtil { } } + /** + * 不良品处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BAD_HANDLE_TYPE { + BACK_SPRAY(10, "BACK_SPRAY", "返喷"), + SCRAPPED(20, "SCRAPPED", "报废"), + POLISHING(30, "POLISHING", "抛光"), + DETERMIND(40, "DETERMIND", "待定"); + + private int value; + private String code; + private String description; + + BAD_HANDLE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOf(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java index 5f7725a..99ff6fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPaintPolishingReportModel.java @@ -39,4 +39,7 @@ public class MgnPaintPolishingReportModel { @ApiParam("组织代码") private String organizeCode; + @ApiParam("不良处理类型") + private String defectActionType; + } From 92fec185b8b67cf5286deab6fd06309baaacd334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 29 Oct 2020 14:45:02 +0800 Subject: [PATCH 307/329] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#28142909?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 83a6c13..0e24a09 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -9,10 +9,7 @@ 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.Table; -import javax.persistence.Version; +import javax.persistence.*; /** * @Description : 质检单明细信息 @@ -86,4 +83,8 @@ public class WmsQCDetails extends BaseBean { @Column(name = "LOCK_VERSION", columnDefinition = "int default 0") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; + + @Transient + @ApiParam(value = "供应商编号") + public String vendorNo; } From d8e5aa44bc359ed11450709b3c172f3168bbfb7f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 29 Oct 2020 14:47:06 +0800 Subject: [PATCH 308/329] pom.xml --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..dc13374 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..f06d17f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 692cd283f714480bf5a0bac6467992f02b46f25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 29 Oct 2020 16:27:05 +0800 Subject: [PATCH 309/329] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF-=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/TjMgnBoardEquipmentMonitorModel.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java new file mode 100644 index 0000000..d19a7bc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/3/9 15:35 + * @desc + */ +@Data +public class TjMgnBoardEquipmentMonitorModel { + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("横坐标") + private Double xAxes = 0d; + + @ApiParam("纵坐标") + private Double yAxes = 0d; + + @ApiParam("工位状态") + private String workCellStatus; + + @ApiParam("颜色") + private String color; +} From 2db034a7f83a0505affd43e742e4e70f09e3c36e Mon Sep 17 00:00:00 2001 From: Aisiyu <773788208@qq.com> Date: Thu, 29 Oct 2020 16:32:54 +0800 Subject: [PATCH 310/329] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3WMS-ASN=E5=88=B0=E8=B4=A7=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 2 ++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 33 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 16 ++++++++++ .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 36 +++++++++++++++++++++- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 ++- 5 files changed, 90 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index e2e0255..62ecbd3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -371,6 +371,8 @@ public interface BaseRepository extends JpaReposito boolean isExitByProperty(String[] propertyNames, Object[] values); + boolean isExitByPropertyDemo(String[] propertyNames, Object[] values); + boolean isExitByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values); boolean isExitByHqlWhere(String hqlWhere); 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 c55e93f..e7865c2 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 @@ -651,6 +651,34 @@ public class BaseRepositoryImpl extends SimpleJpaRep } } + + public int findByPropertyCountDemo(String[] propertyNames, Object[] values) { + if(propertyNames.length != values.length){ + throw new IllegalArgumentException("参数错误数量和值个数不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append("select count(*) from " + persistentClass.getName() + " as model where 1=1 "); + for (int i = 0; i < propertyNames.length; i++) { + if(values[i] != null) { + queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString(),Long.class); + for (int i = 0; i < propertyNames.length; i++) { + if(values[i] != null) { + queryObject.setParameter(propertyNames[i], values[i]); + } + } + + try{ + Long count = (Long) queryObject.getSingleResult(); + return count == null ? 0 : count.intValue(); + }catch(NoResultException e){ + return 0; + } + } + @Override public List findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) { if(pager != null){ @@ -1439,6 +1467,11 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public boolean isExitByPropertyDemo(String[] propertyNames, Object[] values) { + return findByPropertyCountDemo(propertyNames, values) > 0; + } + + @Override public boolean isExitByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values) { return findByHqlWhereCount(hqlWhere,propertyNames,values) > 0; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 64ae284..d8f8ada 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -112,6 +112,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "发货日期") private String sendDate; + @Transient + @ApiParam(value = "实际到货时间") + private String arrDate; + @Column(name = "IS_SN") @ApiParam(value = "是否生成条码", example = "1") public Integer isSn; @@ -177,6 +181,14 @@ public class WmsPOMaster extends BaseBean { private String partNo; @Transient + @ApiParam("需求数量") + private Double qty; + + @Transient + @ApiParam("实收数量") + private Double rcqty; + + @Transient private List orderNoList; @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @@ -211,6 +223,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam("容差") private Integer delayHour; + @Transient + @ApiParam("当前状态") + private String nowStatus; + public WmsPOMaster() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index bc69da7..061704e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -110,6 +110,18 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("计划交货时间") private String planTime; + @Transient + @ApiParam("当前状态") + private String nowStatus; + + @Transient + @ApiParam(value = "实际到货日期") + private String arrDate; + + @Transient + @ApiParam(value = "实际到货时间") + private String arrTime; + @Column(name = "ERP_AREA_NO") @ApiParam("默认收货库存地") private String erpAreaNo; @@ -154,6 +166,16 @@ public class WmsPOMasterDetails extends BaseBean { private Boolean isSet = false; @Transient + @ApiParam("道口，临时使用") + private String dock; + + @Transient + @ApiParam("收货状态，临时使用") + private String receiveStatus; + + + + @Transient @ApiParam("供应商批次字段是否可编辑") private Boolean isDateCodeEdit = true; @@ -279,7 +301,7 @@ public class WmsPOMasterDetails extends BaseBean { } public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty, - Double rcQty, Integer itemStatus) { + Double rcQty, Integer itemStatus) { this.orderNo = orderNo; this.erpSrcNo = erpSrcNo; this.partNo = partNo; @@ -287,4 +309,16 @@ public class WmsPOMasterDetails extends BaseBean { this.rcQty = rcQty; this.itemStatus = itemStatus; } + + public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double qty,Double rcQty) { + this.orderNo = orderNo; + this.planDate=planDate; + this.planTime=planTime; + this.qty = qty; + this.rcQty = rcQty; + this.vendorNo=vendorNo; + this.dock=dock; + this.poStatus=poStatus; + } + } 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 bce0e9d..ec0a805 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 @@ -300,7 +300,10 @@ public class WmsHqlPack { DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(), wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true); } - + if (StringUtils.isNotBlank(wmsPOMaster.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(), + wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true); + } getStringBuilderPack(wmsPOMaster, result); return result; From 762f9d4a9bc9366cfc26e9b15310fda4a8252125 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 29 Oct 2020 18:24:20 +0800 Subject: [PATCH 311/329] =?UTF-8?q?Fix=20bug#12020=2019058-KT=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=EF=BC=88=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=91=E8=BF=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 22badef..ad715f0 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 @@ -53,10 +53,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "REF_ITEM") - @ApiParam("关联行号") - public Integer refItem; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") @@ -204,6 +200,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("源单行号") public String srcItem; + @Column(name = "CUST_ORDER_NO") @ApiParam("客户订单号") public String custOrderNo; From 5e8b023fd596572fef3c277d7c36bcb009933c7a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 29 Oct 2020 18:30:29 +0800 Subject: [PATCH 312/329] =?UTF-8?q?=E3=80=9011883=2020021--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E9=A2=86=E6=96=99=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?--1023=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsSuspenStockSync.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java index 0470492..63b30a6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java @@ -9,6 +9,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -114,4 +115,31 @@ public class WmsSuspenStockSync extends BaseBean { @ApiParam(value = "物料数据Map") private Map partNameMap; + public String getLocateNoVal() { + return this.locateNo == null ? StringUtils.EMPTY : this.locateNo; + } + + public String getPartNoAVal() { + return this.partNoA == null ? StringUtils.EMPTY : this.partNoA; + } + + public String getPartNoBVal() { + return this.partNoB == null ? StringUtils.EMPTY : this.partNoB; + } + + public Double getQtyAVal() { + return this.qtyA == null ? 0 : this.qtyA; + } + + public Double getQtyBVal() { + return this.qtyB == null ? 0 : this.qtyB; + } + + public String getLotNoAVal() { + return this.lotNoA == null ? StringUtils.EMPTY : this.lotNoA; + } + + public String getLotNoBVal() { + return this.lotNoB == null ? StringUtils.EMPTY : this.lotNoB; + } } From b979a9471c155731289d9ad806b44697d570aeb0 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 29 Oct 2020 20:17:50 +0800 Subject: [PATCH 313/329] =?UTF-8?q?=E3=80=9011883=2020021--=E5=8C=97?= =?UTF-8?q?=E7=BE=8E=E9=A2=86=E6=96=99=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?--1023=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/WmsSuspenStockSync.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java index 63b30a6..05a6e33 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java @@ -69,7 +69,7 @@ public class WmsSuspenStockSync extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private Double qtyA; - @Column(name = "qty_b") + @Column(name = "QTY_B") @ApiParam(value = "数量B") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private Double qtyB; From f1ab018d8540ae330b596b30f017800a39ed8cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 29 Oct 2020 20:48:30 +0800 Subject: [PATCH 314/329] =?UTF-8?q?feat(softswitch):=E9=87=8D=E8=AF=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 47 +++++++++++++++++++++- .../i3plus/pojo/softswitch/bean/BsSuitFile.java | 5 ++- .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 25 +++++++++++- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 5 ++- 4 files changed, 75 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 753cfb3..6ff8a9c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -228,7 +228,7 @@ public class BlockSoftSwitchEnumUtil { SCHEDULE(2,"定时调度"), RABBITMQ(3,"MQ 调用"), HTTP(4,"接口调用"), - CLOUD(5,"Cloud调用"), + CLOUD(5,"微服务调用"), REST(6,"REST调用"), WEB_SERVICE(7,"WebService"), SOCKET(8,"socket"), @@ -1161,4 +1161,49 @@ public class BlockSoftSwitchEnumUtil { } + /** + * 适配重试方法 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SUIT_RETRY_STATUS { + NOT_RETRY(10, "未重试"), + RETRY(20, "已重试"); + + private int value; + private String description; + + private BS_SUIT_RETRY_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; + } + + public static BS_SUIT_RETRY_STATUS valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index 7d4b198..2713ed7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -3,12 +3,13 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; 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; @@ -26,7 +27,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SUIT_FILE") -@Api(value = "适配文件信息", description = "适配文件信息") +@ApiModel(value = "适配文件信息", description = "适配文件信息") public class BsSuitFile extends BaseBean { private static final long serialVersionUID = -5476684791619434327L; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 3f03e22..e03eae7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -5,10 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; 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; @@ -34,7 +35,7 @@ import java.util.Map; @Index(name="bs_suit_record_create_date_time_idx",columnList = "CREATE_DATE_TIME"), @Index(name="bs_suit_record_process_time_idx",columnList = "PROCESS_TIME"), }) -@Api(value = "适配记录", description = "适配记录") +@ApiModel(value = "适配记录", description = "适配记录") public class BsSuitRecord extends BaseBean { private static final long serialVersionUID = 174969165955420968L; @@ -157,6 +158,26 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "处理结果") private String processResult; + @ColumnDefault(value = "10") + @Column(name = "RETRY_STATUS") + @ApiParam(value = "重试状态") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.class) + private Integer retryStatus; + + public String getRetryStatusTxt() { + return retryStatus == null ? BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.NOT_RETRY.getDescription() : + BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.valueOfDescription(retryStatus); + } + + @ColumnDefault(value = "0") + @Column(name = "RETRY_NUM") + @ApiParam(value = "重试状态") + private Integer retryNum; + + public int getRetryNumVal() { + return retryNum == null ? 0 : retryNum; + } + /************************************** 临时属性 ***************************************/ @Transient diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index afb8677..2506bb2 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -320,7 +320,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); - DdlPreparedPack.getStringLikePack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); @@ -330,9 +330,10 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitResult(),"suitResult",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(), "processState", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getRequestSource(), "requestSource", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getRetryRecordId(), "retryRecordId", ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); - ddlPackBean.setOrderByStr(bsSuitRecord.orderBy()); return ddlPackBean; From eb03280b2d8ac4bd231dfaf012d2fbb002e56140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 29 Oct 2020 20:49:24 +0800 Subject: [PATCH 315/329] =?UTF-8?q?doc(sql):getStringLikePack=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=A0=87=E8=AE=B0=E4=B8=8D=E6=8E=A8=E8=8D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index e336469..fc38e8e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -278,11 +278,15 @@ public class DdlPreparedPack { } /** - * 封装String对象成equal语句 - * + * 不建议使用该方法，其他方法已满足需要 + * @see #getStringLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean) + * @see #getStringLikerPackOr(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean) + * @see #getStringLeftLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean) + * @see #getStringRightLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean) * @param columnName 列名 * @param packBean */ + @Deprecated public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val); From dceb9b17a58c52a52c8c62cf9c0c10179d48846e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 29 Oct 2020 21:13:44 +0800 Subject: [PATCH 316/329] =?UTF-8?q?revert(pojo):=E8=BF=98=E5=8E=9Fpom?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 1e17935..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37b8a51..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index dc13374..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index fdcf6e3..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 60d9861..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 54c8306..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 190efa7..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 5896851..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index aa3dd42..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1351ed3..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 67b0bff..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 15d36cd..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f06d17f..cc6131f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 63b7162932117d25b6ec1a99e0a9551c35fe0589 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 29 Oct 2020 22:34:56 +0800 Subject: [PATCH 317/329] =?UTF-8?q?mgn-bj=20=E5=8D=8A=E6=88=90=E5=93=81?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java | 6 ++++++ .../mes/model/mgn/bj/{BjBoardModel.java => MgnBjBoardModel.java} | 9 +++++++-- .../bj/{BjBoardSeriesModel.java => MgnBjBoardSeriesModel.java} | 2 +- .../estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/CodeRule.java | 2 +- .../estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Document.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Head.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Message.java | 3 ++- .../pojo/mes/model/mgn/bj/{ => edi}/MgnBjJitPlanModel.java | 3 ++- .../pojo/mes/model/mgn/bj/{ => edi}/MgnBjRecipePartsModel.java | 3 ++- .../estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/OptionCode.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Part.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Parts.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Pn.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++-- 16 files changed, 36 insertions(+), 16 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{BjBoardModel.java => MgnBjBoardModel.java} (78%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{BjBoardSeriesModel.java => MgnBjBoardSeriesModel.java} (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/CodeRule.java (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Document.java (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Head.java (94%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Message.java (91%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/MgnBjJitPlanModel.java (95%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/MgnBjRecipePartsModel.java (69%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/OptionCode.java (89%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Part.java (96%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Parts.java (88%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/{ => edi}/Pn.java (94%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 10cc3b3..d328625 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3656,7 +3656,9 @@ public class MesEnumUtil { public enum QUEUE_ORDER_DETAIL_STATUS { NORMAL(10, "正常"), - CLOSE(20, "关闭"); + CLOSE(20, "关闭"), + FINISH(30, "完成"), + OFF_LINE_REWORK(40, "线下返修"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index ca4851d..90569c7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -96,6 +96,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { private Integer alreadyLandedNum; @Transient + @ApiParam("当前库存") + private Integer currentStock; + + @Transient @ApiParam("物料名称") private String partName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java index c6aa422..8048ccc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java @@ -28,6 +28,12 @@ public class SkillsUserModel { @ApiParam(value ="工号") private String userEmpNo; + @ApiParam(value ="工位") + private String workCellCode; + + @ApiParam(value ="产线") + private String workCenterCode; + @ApiParam("技能矩阵信息") private List mesUserSkillList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java similarity index 78% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index fee720e..9827255 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -5,6 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * @Description: @@ -13,10 +14,12 @@ import java.util.List; * @Modify: */ @Data -public class BjBoardModel implements Serializable { +public class MgnBjBoardModel implements Serializable { @ApiParam("jsa数量") private Integer jsaQty; + @ApiParam("jsa数量") + private Integer jsaRate; @ApiParam("完成数量") private Integer completeQty; @ApiParam("总数量") @@ -36,6 +39,8 @@ public class BjBoardModel implements Serializable { @ApiParam("x坐标内容") private List xAxisList; + private Map resultMap; + @ApiParam("显示数据") - private List seriesModels; + private List seriesModels; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java index 3b113ee..63c7999 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java @@ -10,7 +10,7 @@ import lombok.Data; * @Modify: */ @Data -public class BjBoardSeriesModel { +public class MgnBjBoardSeriesModel { @ApiParam("名称") private String name; @ApiParam("显示数量") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java index 67ed3eb..31a7723 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java index 6ea1cca..24c85fc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java similarity index 94% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java index be1576f..3df8072 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java similarity index 91% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java index 7b7fdc9..6eddfc7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; +import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Pn; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java similarity index 95% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java index b1219aa..d56f13a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; +import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java similarity index 69% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java index e85a236..1975611 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; +import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part; import lombok.Data; import java.util.List; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java similarity index 89% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java index 45c78ff..a3fb79c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java similarity index 96% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java index 63d2725..a1b7261 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java similarity index 88% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java index 6916568..833a28c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java similarity index 94% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java index 9822683..b102a5d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model.mgn.bj; +package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi; import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.ApiParam; 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 6a6e8bc..e8acac3 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 @@ -241,10 +241,10 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean); } if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) { - DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); + DdlPreparedPack.getStringLikerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); } if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) { - DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean); + DdlPreparedPack.getStringLikerPack(mesQueueOrder.getPgCode(), "pgCode", packBean); } if (mesQueueOrder.getQueueType() != null) { DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean); From e6e5982d73d006d739541b1b435cd54dd894138c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 30 Oct 2020 09:00:50 +0800 Subject: [PATCH 318/329] =?UTF-8?q?Fix=20bug#12020=2019058-KT=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=EF=BC=88=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=91=E8=BF=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 764d333..1ed5159 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 @@ -14,7 +14,11 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.List; @@ -529,6 +533,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("数量总和") private Double sumQty; + @Transient + @ApiParam("原数量") + private Double srcQty; + public WmsStockSn() { } From 8d91675109b0e6d6d8bf3373d25c2743f0cc1bd7 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 30 Oct 2020 09:35:17 +0800 Subject: [PATCH 319/329] =?UTF-8?q?=E3=80=9012155=2020145+=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=8F=82=E6=95=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=BC=96=E7=A0=81=E4=B9=9F=E6=94=AF=E6=8C=81=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=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/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 057846a..0cd559a 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 @@ -2009,7 +2009,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsConfig(WmsConfig wmsConfig) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result); + DdlPreparedPack.getStringLikerPack(wmsConfig.getConfigCode(), "configCode", result); DdlPreparedPack.getStringLikerPack(wmsConfig.getName(), "name", result); DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result); DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result); From f47b6991465bcdd9a5b77f060ddc996e0c565c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 30 Oct 2020 10:07:55 +0800 Subject: [PATCH 320/329] =?UTF-8?q?feat(form):=E6=94=AF=E6=8C=81=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E8=BF=87=E7=A8=8B=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 74 +++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index b240568..602ffd8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Objects; + /** * @Description : 模块表单枚举类 * @Reference : @@ -2301,7 +2303,6 @@ public class BlockFormEnumUtil { } } - /** * 操作触发来源 */ @@ -2397,4 +2398,75 @@ public class BlockFormEnumUtil { } } + /** + * 对象原始属性类型 + * TABLE_COL（10）：表格列-表，视图与存储过程查询结果的显示列 + * PROCEDURE_IN_PARAM（20）：入参-存储过程的入参 + * PROCEDURE_INOUT_PARAM（30）：入参-存储过程的出入参（sqlserver没有出参，都算出入参） + * PROCEDURE_OUT_PARAM（40）：入参-存储过程，函数的出参 + * PROCEDURE_RETURN（50）：入参-存储过程，函数的返回值（mysql存储过程没有返回值，sqlserver有） + * + */ + public enum ORIGIN_PROPERTY_TYPE { + NORMAL_PROPERTY(10, "正常属性"), + PROCEDURE_IN_PARAM(20, "入参"), + PROCEDURE_INOUT_PARAM(30, "出入参"), + PROCEDURE_OUT_PARAM(40, "出参"), + PROCEDURE_RETURN(50, "返回值"); + + private final int value; + private final String description; + + private ORIGIN_PROPERTY_TYPE (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; + } + + public static ORIGIN_PROPERTY_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static ORIGIN_PROPERTY_TYPE procColTypeValOf(int procColTypeVal) { + ORIGIN_PROPERTY_TYPE result = NORMAL_PROPERTY; + switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))){ + case IN_PARAM: + result = PROCEDURE_IN_PARAM; + break; + case INOUT_PARAM: + result = PROCEDURE_INOUT_PARAM; + break; + case OUT_PARAM: + result = PROCEDURE_OUT_PARAM; + break; + case RETURN_PARAM: + result = PROCEDURE_RETURN; + break; + } + return result; + } + } } From 687de9d828494dff27ecaa6539f9e8e699f1e4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 30 Oct 2020 10:24:59 +0800 Subject: [PATCH 321/329] =?UTF-8?q?feat(form):=E6=94=AF=E6=8C=81=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E8=BF=87=E7=A8=8B=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/bean/BfDataObjectProperty.java | 18 ++++++++++++++---- .../i3plus/pojo/form/bean/BfElementPickUpProperty.java | 2 ++ .../estsh/i3plus/pojo/form/bean/BfElementProperty.java | 14 ++++++++++++++ .../estsh/i3plus/pojo/model/form/SqlColumnModel.java | 14 ++++++++++++++ .../pojo/model/form/SqlProcedureColumnModel.java | 7 +++++++ 5 files changed, 51 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index bd99d69..7d5ab65 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -8,6 +10,7 @@ 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; @@ -53,9 +56,16 @@ public class BfDataObjectProperty extends BaseBean { private String objectColumnName; // 暂用来区分存储过程出入参数信息 - @Column(name="OTHER_COLUMN_TYPE") - @ApiParam(value ="其他列类型") - private Integer otherColumnType; + @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class) + @ColumnDefault("10") + @Column(name="ORIGIN_PROPERTY_TYPE") + @ApiParam(value ="原始列类型") + private Integer originPropertyType; + + public String getOriginPropertyTypeTxt() { + return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription() + : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType); + } @Column(name="OBJECT_COLUMN_TYPE") @ApiParam(value ="数据对象类型") @@ -74,7 +84,7 @@ public class BfDataObjectProperty extends BaseBean { private Integer isNullable; public Integer getIsNullableVal(){ - return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable.intValue(); + return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable; } // 字段长度 diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java index 8bf2d5c..2a6f1c9 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java @@ -30,6 +30,8 @@ import javax.persistence.Table; @Api(value = "表单拾取属性", description = "表单拾取属性") public class BfElementPickUpProperty extends BaseBean { + private static final long serialVersionUID = -1071243642582327905L; + @Column(name = "PICK_UP_PROPERTY_ID") @ApiParam(value = "拾取属性id", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index a89a117..33d1bef 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -2,12 +2,14 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; 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; @@ -49,6 +51,18 @@ public class BfElementProperty extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long dataObjectPropertyId; + // 暂用来区分存储过程出入参数信息 + @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class) + @ColumnDefault("10") + @Column(name="ORIGIN_PROPERTY_TYPE") + @ApiParam(value ="原始列类型") + private Integer originPropertyType; + + public String getOriginPropertyTypeTxt() { + return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription() + : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType); + } + @Column(name="PROPERTY_TYPE") @ApiParam(value ="属性类型") private Integer propertyType; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java index bc5daaf..2dd1284 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.model.form; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -43,6 +45,18 @@ public class SqlColumnModel implements Serializable { // 字段精确长度 @ApiParam(value = "字段精确长度") private Integer scale; + + // 暂用来区分存储过程出入参数信息 + // 暂用来区分存储过程出入参数信息 + @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class) + @ApiParam(value ="原始列类型") + private Integer originPropertyType; + + public String getOriginPropertyTypeTxt() { + return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription() + : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType); + } + // 字段类型编号 @ApiParam(value = "字段类型编号") private Integer columnType; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java index ece72ff..2905c7d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.model.form; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,6 +34,7 @@ public class SqlProcedureColumnModel { * 4是出参 * 5是返回值（函数） */ + @AnnoOutputColumn(refClass = BlockFormEnumUtil.PROCEDURE_COL_TYPE.class) @ApiParam(value = "列类型") private Integer columnType; @@ -41,6 +44,10 @@ public class SqlProcedureColumnModel { @ApiParam(value = "数据类型名称") private String typeName; + // 字段Java 类型 + @ApiParam(value = "字段Java 类型") + private String className; + @ApiParam(value = "长度") private Integer length; From 2ff6eded6eefee990a6ac768f061162a0c3fd291 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 30 Oct 2020 13:43:57 +0800 Subject: [PATCH 322/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9Oee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/mgn/tj/OeeModel.java | 2 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java index fcf204f..143452c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java @@ -16,6 +16,8 @@ public class OeeModel { private Integer standardTakt; + private Double planOee; + private String color; private Double threshold = 0.03; 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 6a6e8bc..50ba239 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 @@ -708,6 +708,27 @@ public class MesHqlPack { } /** + * MES工步信息查询条件封装 + * + * @param staff + * @return + */ + public static DdlPackBean getStaff(MesStaff staff, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(staff, organizeCode); + if (!StringUtils.isEmpty(staff.getUserCode())) { + DdlPreparedPack.getStringLikerPack(staff.getUserCode(), "userCode", packBean); + } + if (!StringUtils.isEmpty(staff.getUserName())) { + DdlPreparedPack.getStringLikerPack(staff.getUserName(), "userName", packBean); + } + if (!StringUtils.isEmpty(staff.getSkillLevel())) { + DdlPreparedPack.getNumEqualPack(staff.getSkillLevel(), "skillLevel", packBean); + } + + return packBean; + } + + /** * MES工步参数信息查询条件封装 * * @param stepParam From 0d12d01ebfb0db7e9ab341adea804119d26fbbfb Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 30 Oct 2020 17:24:00 +0800 Subject: [PATCH 323/329] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=8A=9F?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 6 ++++++ 2 files changed, 10 insertions(+) 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 index b9aeefa..cfcc146 100644 --- 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 @@ -157,6 +157,10 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("BaseModule零件号") private String baseModule; + @Column(name = "QUEUE_GROUP_FLAG") + @ApiParam("分组标识") + private String queueGroupFlag; + public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) { this.partNo = partNo; this.packageNo = packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index 9827255..6640422 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -16,12 +16,15 @@ import java.util.Map; @Data public class MgnBjBoardModel implements Serializable { + private Integer qty; @ApiParam("jsa数量") private Integer jsaQty; @ApiParam("jsa数量") private Integer jsaRate; @ApiParam("完成数量") private Integer completeQty; + @ApiParam("完成率") + private Integer completeRate; @ApiParam("总数量") private Integer totalQty; @ApiParam("预警数量") @@ -33,6 +36,9 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("一次合格率") private Integer onceQualityRate = 0; + @ApiParam(value = "显示颜色") + private String color; + @ApiParam("x坐标内容") private String xAxis; From 76a0703bac8b2d99612719ab264714c00b7b39ca Mon Sep 17 00:00:00 2001 From: songss Date: Fri, 30 Oct 2020 17:57:19 +0800 Subject: [PATCH 324/329] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java index b016661..77c1384 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java @@ -14,7 +14,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description: MES控制计划-主表 + * @Description: MES控制计划-主表（子表：质量标准MES_QUALITY_STANDARD） * @CreateDate: 2020/9/27 * @Author: simon.song */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java index 7a558d5..7d51b88 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java @@ -29,6 +29,6 @@ public class MesBoardWorkCenterOverviewModel { @ApiParam("工单列表") List workOrderList; - @ApiParam("班组列表") + @ApiParam("班组信息") List shiftGroupList; } From 5d41023df6f382d6ce4b960e6c53ca2983eb2414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 30 Oct 2020 18:15:18 +0800 Subject: [PATCH 325/329] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java index d4fc145..04ac902 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardAssembleCompRateModel.java @@ -27,6 +27,9 @@ public class MgnBoardAssembleCompRateModel { @ApiParam("实际OEE") private String finaOee; + @ApiParam("OEE红线值") + private String oeeRedLineValue; + @ApiParam("缺陷名称") private String defectName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index f308538..8ad36ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -20,19 +20,19 @@ public class MgnBoardListModel { @ApiParam("当班实际产量") private Double shiftActualYield; - @ApiParam("当前时间分钟") + @ApiParam("时间小时") private String currentMinTime; /** - * 开班时间到当前时间按分钟累计计划数量 + * 开班时间到当前时间按小时累计计划数量 */ - @ApiParam("每分钟计划产量") + @ApiParam("每小时计划产量") private Double minPlanYield; /** - * 开班时间到当前时间按分钟累计实际数量 + * 开班时间到当前时间按小时累计实际数量 */ - @ApiParam("每分钟实际产量") + @ApiParam("每小时实际产量") private Double minActualYield; @ApiParam("计划完成率") From d7092a7f5244bbc70ec8c581a159b0faff4aaef4 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 1 Nov 2020 10:25:56 +0800 Subject: [PATCH 326/329] =?UTF-8?q?=E6=80=BB=E8=A3=85=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E4=B8=8D=E8=89=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java | 4 +++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 2 +- .../i3plus/pojo/mes/model/AssembleDefectModel.java | 39 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/FutrueTaskModel.java | 25 ++++---------- 4 files changed, 50 insertions(+), 20 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index 566aa9c..cb53973 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -53,4 +53,8 @@ public class MesTypeCfg extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("顺序") private Integer seq; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index fa677a8..9a7debb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -379,7 +379,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { private Integer endCheckQty; @Transient - @ApiParam("终检数量") + @ApiParam("打包数量") private Integer finalInspectionQty; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java new file mode 100644 index 0000000..837b718 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class AssembleDefectModel { + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("抛光层级model") + private AssembleDefectModel polishingModel; + + @ApiParam("拆解层级model") + private AssembleDefectModel disassembleModel; + + @ApiParam("不良类型集合") + private List defectModelList; + + @ApiParam("类型代码") + private String typeCode; + + @ApiParam("类型名称") + private String typeName; + + @ApiParam("不良集合") + private List defectList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index f1114df..4e8de2f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -1,16 +1,14 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord; -import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; /** - * @Description: 条码解绑实体 + * @Description: 异步任务model * @Reference: - * @Author: siliter.yuan + * @Author: wangjie * @CreateDate: 2020-06-28-11:44 * @Modify: **/ @@ -20,15 +18,6 @@ public class FutrueTaskModel { @ApiParam("实现类") private Object futrueTaskService; - @ApiParam("工位请求bean") - private StationRequestBean stationRequestBean; - - @ApiParam("产品条码表") - private MesProduceSn produceSn; - - @ApiParam("产品绑定记录表") - private MesProdBindRecord prodBindRecord; - @ApiParam("组织代码") private String organizeCode; @@ -38,12 +27,10 @@ public class FutrueTaskModel { @ApiParam("工作单元代码") private String workCellCode; - @ApiParam("总装批量执行逻辑") - private List requestBeanList; - - @ApiParam("总装批量执行逻辑") - private Object specialBusinessType; - + @ApiParam("数据") + private Object Obj; + @ApiParam("集合") + private List list; } From ade2d60849cfd4a9294b07d0ec7d0d61d9ee81c6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Nov 2020 09:48:59 +0800 Subject: [PATCH 327/329] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java index 837b718..ee6e90b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssembleDefectModel.java @@ -18,6 +18,9 @@ public class AssembleDefectModel { @ApiParam("过程条码") private String serialNumber; + @ApiParam("物料号") + private String partNo; + @ApiParam("抛光层级model") private AssembleDefectModel polishingModel; From e68735be83bcaf9125c52a142e2505670837e33c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 2 Nov 2020 10:15:36 +0800 Subject: [PATCH 328/329] =?UTF-8?q?MOVE=5FSN=20=E5=A2=9E=E5=8A=A0=20left?= =?UTF-8?q?=5Fcode=20=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsMessageStyleModel.java | 17 +++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 7e1103a..45c5589 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -60,4 +60,21 @@ public class WmsMessageStyleModel implements Serializable { this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } } + + public WmsMessageStyleModel(String message, double transQty, double actQty, boolean showRed) { + this.message = message; + if (actQty == 0) {//未处理 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(); + } else if (transQty > actQty) {//处理中 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); + } else if (actQty == transQty) {//处理完成 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } else if (transQty < actQty) {//处理数量大于需求数量-显示红色 + if (showRed) { + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CLOSED.getValue(); + } else { + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } + } + } } 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 8772b84..22d79be 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 @@ -88,6 +88,11 @@ public class WmsMoveSn extends BaseBean { @ApiParam("批次编号") public String lotNo; + @Column(name = "LEFT_CODE") + @ApiParam(value = "生产批次") + private String leftCode = ""; + + @Column(name = "PACKAGE_NO") @ApiParam("容器编号") public String packAgeNo; From 1825cfbdf32fc275d51cfaed734d0b5037dcfa8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 3 Nov 2020 13:56:33 +0800 Subject: [PATCH 329/329] =?UTF-8?q?revert(pojo):=E8=BF=98=E5=8E=9Fpom?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..3751cf9 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..a6c1bea 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..0a2f9d4 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..2bf0e5c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..557548a 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..34a7337 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..670eb15 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..ce2dc01 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..b8c9643 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..1d29933 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..284225c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..7ff16c9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..353a02b 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..b125cee 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..c9d54a9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..39f1e2f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..df01041 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..0cfb344 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform