From 5dc142ba3459a35872606257db53460f4b12929a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 7 Sep 2020 09:56:57 +0800 Subject: [PATCH 01/16] =?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 193cff013f0e38a62199bb6eb539d1b87e60b83b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 8 Sep 2020 10:26:29 +0800 Subject: [PATCH 02/16] =?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 03/16] =?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 04/16] =?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 05/16] =?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 06/16] =?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 07/16] =?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 08/16] =?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 09/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMGN=E7=B3=BB=E5=88=97BU?= =?UTF-8?q?G?= 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 10/16] =?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 11/16] =?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 12/16] =?UTF-8?q?=E3=80=9011181=2019048-=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E5=92=8C?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=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 13/16] =?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 14/16] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E5=AF=BC=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 15/16] =?UTF-8?q?feat:=E5=AD=97=E5=85=B8=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=81=E8=AE=B8=E5=80=BC=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/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 16/16] =?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;