From d18beff50cf8b17aa24bd23b4f1b933d9c52e44e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 9 Jun 2020 18:00:58 +0800 Subject: [PATCH 001/156] Finish Task #2094 Cost:16h --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ++++++++++++++++ .../i3plus/pojo/mes/model/PlcEquStatusModel.java | 64 ++++++++++++++++++++++ .../EquOperationStatusMonitorRepository.java | 16 ++++++ 3 files changed, 126 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.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 66b958a..477300d 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 @@ -4147,4 +4147,50 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * plc状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PLC_STATUS { + + UN_CONNECT(0, "断开"), + CONNECT(1, "连接"); + + private int value; + private String description; + + MES_PLC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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) { + 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/PlcEquStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java new file mode 100644 index 0000000..6891043 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class PlcEquStatusModel implements Serializable { + + // 主站/从站 + @ApiParam("站位") + private String stationPosition; + + // 站位IP + @ApiParam("IP地址") + private String ipAddress; + + // IP状态 -- 连接/断开 + @ApiParam("IP状态") + private Integer ipStatus; + + // 电检设备名称 + @ApiParam("电检设备名称") + private String electricalEqu; + + // 电检设备状态哦 -- 连接/断开 + @ApiParam("电检设备状态") + private Integer electricalEquStatus; + + // 产线状态 + @ApiParam("产线状态") + private Integer workCenterStatus; + + @ApiParam("停机类型") + private Integer stopType; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("停机开始时间") + private String stopStartTime; + + @ApiParam("停机结束时间") + private String stopEndTime; + + @ApiParam("停机原因") + private String stopReason; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.java new file mode 100644 index 0000000..3da78a6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.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.MesEquipment; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface EquOperationStatusMonitorRepository extends BaseRepository { +} From 84e1c9f717afe6a4dda9d47a3c4c58e7c8101b4e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Jun 2020 18:35:08 +0800 Subject: [PATCH 002/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 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 b948580..a9e288f 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 e12eaee..a44418c 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 c338f71..2de88b5 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 7637865..50ab2c2 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 d98b7d8..7f94617 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 bf96e57..d800ecf 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 a758a6a..60fc467 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 efacfd2..d65e031 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 dba12cc..a785f21 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 81670b2..d6d2f8e 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 26a7311..0fbfb69 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 eaf2544..76739f9 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 0f615b6..0368700 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 9e5f745..b2eedd4 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 0fea52b..5fcd08a 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 cc8fce6..2eddf76 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 32ddc567a0417baacdfbb23122856d70b09e6968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 9 Jun 2020 18:44:41 +0800 Subject: [PATCH 003/156] Start Task #2021 Cost:24h Left:0h Finish Task #2021 Cost:24h --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 91597a2..632df5d 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 @@ -116,16 +116,16 @@ public class MesPcnHqlPack { * 获取原材料扫描信息的对应工序BOM * * @param stationBom - * @param rawPartNo + * @param rawPartSn * @return */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) { + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); return packBean; } From 9675274a0d88d1cfe629bcbd62f27c47ac40d82f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 10 Jun 2020 13:28:06 +0800 Subject: [PATCH 004/156] ptl --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java | 3 +++ 3 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index 2e8c77e..edaab1e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java @@ -51,10 +51,12 @@ public class AndonCellAlarmCause extends BaseBean implements Serializable { @ApiParam(value = "事件描述") private String acCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "安灯类型名称") private String alarmCodeName; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "呼叫原因描述") private String acName; 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 c677396..47588b4 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 @@ -45,4 +45,7 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") private boolean errorInnerAction = false; + @ApiModelProperty("默认异常入库") + private boolean errorInsertFlag = true; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index 1f9945f..633331e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -51,4 +51,7 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") private boolean errorInnerAction = false; + @ApiModelProperty("默认异常入库") + private boolean errorInsertFlag = true; + } From e063608cb11813c2d22f3b272c6163b081affcbc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 10 Jun 2020 16:22:53 +0800 Subject: [PATCH 005/156] =?UTF-8?q?ptl=20IF=5F=E6=8B=A3=E8=B4=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java | 54 ++++++++++++++++++++++ .../pojo/ptl/repository/IfPickDataRepository.java | 15 ++++++ 2 files changed, 69 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java new file mode 100644 index 0000000..bd78695 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.ptl.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 wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "IF_PICK_DATA") +@EqualsAndHashCode(callSuper = true) +@Api("IF_拣货数据") +public class IfPickData extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1057633269490937118L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "SECTION_NO") + @ApiParam("区段编号") + private String sectionNo; + + @Column(name = "PART_NO") + @ApiParam("物料编号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("拣货数量") + private Integer qty; + + @Column(name = "SYNC_FLAG") + @ApiParam("同步标识:1=已同步 2=未同步") + private Integer syncFlag; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java new file mode 100644 index 0000000..0e84dc9 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.IfPickData; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +public interface IfPickDataRepository extends BaseRepository { + +} From 28fe4a03f83d413eba7fcb95023b1034312759aa Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 10 Jun 2020 16:52:08 +0800 Subject: [PATCH 006/156] Finish Task#2108 Cost:12h --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + 2 files changed, 2 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 b603804..ba4acde 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 @@ -3482,6 +3482,7 @@ public class MesEnumUtil { PACKAGE_SCAN(35, "打包扫描"), INSTOCKED(40, "入库"), SHIPING(50, "发运"), + REDO(60, "重做"), CLOSE(90, "关闭"), ; 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 67911a9..8939761 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 @@ -2376,6 +2376,7 @@ public class MesPcnEnumUtil { PACKAGE_SCAN(35, "打包扫描"), INSTOCKED(40, "入库"), SHIPPING(50, "发运"), + REDO(60, "重做"), CLOSE(90, "关闭"); private int value; From 1d775acd6910cc9a0a5f3f95721cc4d38a9b3c67 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 10 Jun 2020 17:25:56 +0800 Subject: [PATCH 007/156] =?UTF-8?q?ptl=20IF=5F=E6=8B=A3=E8=B4=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 38 +++++++++++++++++++++- .../cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 3d1fc0d..d29b37b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1281,7 +1281,7 @@ public class PtlPcnEnumUtil { } /** - * mes-pcn定时任务同步结果状态 + * ptl-pcn定时任务同步结果状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PTL_PCN_TASK_SYNC_STATUS { @@ -1583,4 +1583,40 @@ public class PtlPcnEnumUtil { return tmp; } } + + /** + * 同步标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_FLAG { + + UNSYNC(1, "未同步"), + SYNCED(2, "已同步"); + + private int value; + private String description; + + SYNC_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-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java index bd78695..fbc0fe3 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java @@ -48,7 +48,7 @@ public class IfPickData extends BaseBean implements Serializable { private Integer qty; @Column(name = "SYNC_FLAG") - @ApiParam("同步标识:1=已同步 2=未同步") + @ApiParam("同步标识") private Integer syncFlag; } From 40d921ddd6c92d9a698cae1b88e42334b7548415 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 10 Jun 2020 20:15:09 +0800 Subject: [PATCH 008/156] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=82=B9=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E8=87=AA=E6=B5=8B1?= 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 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java | 4 ++++ 2 files changed, 7 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 67911a9..d82c3a2 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 @@ -3397,6 +3397,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FSM_STATE_TYPE { BEGIN(10, "begin", "开始状态点"), + BACK(20, "back", "回退状态点"), END(40, "end", "结束状态点"); private int value; @@ -3599,7 +3600,8 @@ public class MesPcnEnumUtil { START(10, "START", "开始状态"), EXECUTING(20, "EXECUTING", "执行中状态"), TERMINATE(30, "TERMINATE", "中断状态"), - FINISH(40, "FINISH", "完成状态"); + FINISH(40, "FINISH", "完成状态"), + BACK(99, "BACK", "回退状态"); private int value; private String code; 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 4b8994b..5bc6718 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 @@ -78,6 +78,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("状态类型 10=初始化状态") private Integer statusType; + @Column(name = "SEQ") + @ApiParam("状态点顺序") + private Integer seq; + @Transient @ApiParam("状态点是否完成") private boolean isComplete; From a495d0b4ce34fb6e77789e58ea51aa4904a16853 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 11 Jun 2020 14:12:16 +0800 Subject: [PATCH 009/156] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=A1=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 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 07ac37c..eb1080b 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 @@ -2937,4 +2937,21 @@ public class MesHqlPack { } return packBean; } + + /** + * 物料校验项 + * @param partCheck + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPartCheck(MesPartCheck partCheck, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partCheck, organizeCode); + if (!StringUtils.isEmpty(partCheck.getPartNo())) { + DdlPreparedPack.getStringEqualPack(partCheck.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(partCheck.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(partCheck.getObjectCode(), "objectCode", packBean); + } + return packBean; + } } From c9114c9dae0dd6ad2ae62f0aa2764fd442818502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 11 Jun 2020 14:36:57 +0800 Subject: [PATCH 010/156] Fix Bug #8688 --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 28 ++++++++++++++++++++++ 1 file changed, 28 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 eb1080b..de74501 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 @@ -2954,4 +2954,32 @@ public class MesHqlPack { } return packBean; } + + + /** + * 过程质量检测数据 + * + * @param qcOrderDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQcOrderDetailData(MesQcOrderDetail qcOrderDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode); + if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { + DdlPreparedPack.getStringRightLikerPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); + } + if (qcOrderDetail.getCheckType() != null) { + DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean); + } + if (!StringUtils.isEmpty(qcOrderDetail.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(qcOrderDetail.getSerialNumber(), "serialNumber", packBean); + } + if (!StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + qcOrderDetail.getCreateDateTimeStart(), + qcOrderDetail.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } } From d969c07317e979bb7583738657b43658483ca943 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 11 Jun 2020 17:22:01 +0800 Subject: [PATCH 011/156] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= 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, 2 insertions(+), 2 deletions(-) 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 632df5d..6efe0f4 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 @@ -119,13 +119,13 @@ public class MesPcnHqlPack { * @param rawPartSn * @return */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) { DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean); return packBean; } From 8623a5a13d62d4f54179a77c2e93177d2b6b9af8 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 11 Jun 2020 17:26:34 +0800 Subject: [PATCH 012/156] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= 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/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 577686d..807bef5 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 f714b7d..b948580 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 b7991cc..e12eaee 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 0648e9f..c338f71 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 3b9e57a..7637865 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 b1911ec..d98b7d8 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 56d54cb..bf96e57 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 830caa5..a758a6a 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 fb51da0..efacfd2 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 78bbdef..dba12cc 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 fb44d00..81670b2 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 dc4ea86..26a7311 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 8571a5f..eaf2544 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 e36258d..0f615b6 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 9915420..9e5f745 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 61027b2..0fea52b 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 c2104bf..cc8fce6 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 47ae0b46ef37bb394b4cf0cb59c1008eca15d282 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 11 Jun 2020 17:28:33 +0800 Subject: [PATCH 013/156] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= 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/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 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 a9e288f..b948580 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 a44418c..e12eaee 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 2de88b5..c338f71 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 50ab2c2..7637865 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 7f94617..d98b7d8 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 d800ecf..bf96e57 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 60fc467..a758a6a 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 d65e031..efacfd2 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 a785f21..dba12cc 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 d6d2f8e..81670b2 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 0fbfb69..26a7311 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 76739f9..eaf2544 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 0368700..0f615b6 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 b2eedd4..9e5f745 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 5fcd08a..0fea52b 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 2eddf76..cc8fce6 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 60c1f6ecab981b69dee16f89f9f09bd0cb67abd2 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 11 Jun 2020 17:30:05 +0800 Subject: [PATCH 014/156] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= 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/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 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 b948580..a9e288f 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 e12eaee..a44418c 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 c338f71..2de88b5 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 7637865..50ab2c2 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 d98b7d8..7f94617 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 bf96e57..d800ecf 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 a758a6a..60fc467 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 efacfd2..d65e031 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 dba12cc..a785f21 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 81670b2..d6d2f8e 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 26a7311..0fbfb69 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 eaf2544..76739f9 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 0f615b6..0368700 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 9e5f745..b2eedd4 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 0fea52b..5fcd08a 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 cc8fce6..2eddf76 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 cb4fd979e153e717e044fba80dd11ef426c73e63 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 11 Jun 2020 17:31:11 +0800 Subject: [PATCH 015/156] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 10 +++++----- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) 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 7158108..9f80bcc 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 @@ -100,11 +100,11 @@ public class IfPackageDetail extends BaseBean implements Serializable { @ApiParam("容器编号") private String ctNo; - @Column(name = "SN_TYPE") - @ApiParam("条码类型") - private String snType; + @Column(name = "SAMPLE_TYPE") + @ApiParam("样本类型") + private String sampleType; - @Column(name = "SHIPPING_FLAG") + @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") - private String shippingFlag; + private String custDeliveryLocation; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index f0851f2..129d45e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -54,7 +54,7 @@ public class MesCustomer extends BaseBean implements Serializable { @ApiParam("客户电话") private String telephone; - @Column(name = "SHIPPING_FLAG") + @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") - private String shippingFlag; + private String custDeliveryLocation; } 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 c7d49ea..f8312be 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 @@ -110,13 +110,13 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("容器编号") private String ctNo; - @Column(name = "SN_TYPE") - @ApiParam("条码类型") - private String snType; + @Column(name = "SAMPLE_TYPE") + @ApiParam("样本类型") + private String sampleType; @Transient @ApiParam("客户发往地") - private String shippingFlag; + private String custDeliveryLocation; public MesPackage() { } From ce020cc1ab5a02fcd382ae6e94556f307c05fcdc Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 11 Jun 2020 23:24:39 +0800 Subject: [PATCH 016/156] Start Task #2134 Cost: 8h --- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 8 ++++ .../pojo/aps/bean/MaterialDeliveryPromise.java | 52 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 5 ++ .../estsh/i3plus/pojo/aps/common/DateDuration.java | 4 ++ .../pojo/aps/holders/EMaterialDeliveryPromise.java | 5 ++ .../i3plus/pojo/aps/model/DelaySalesOrder.java | 56 ++++++++++++++++++++++ .../i3plus/pojo/aps/model/LargeSpanOrder.java | 53 ++++++++++++++++++++ .../pojo/aps/model/MaterialDeliveryAnalyze.java | 36 ++++++++++++++ .../i3plus/pojo/aps/model/PrematureProduct.java | 48 +++++++++++++++++++ .../MaterialDeliveryPromiseRepository.java | 9 ++++ .../relations/MaterialDeliveryPromise.xml | 5 ++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 29 +++++++++++ 12 files changed, 310 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index effc70e..039b7a9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -143,6 +143,14 @@ public class Material extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String orderBatchPeriod; + @Column(name="LABEL_NAME") + @ApiParam(value ="标签名称") + private String labelName; + + @Column(name="LABEL_COLOR") + @ApiParam(value ="标签颜色") + private String labelColor; + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java new file mode 100644 index 0000000..dcb7f0b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.aps.holders.EMaterialDeliveryPromise; +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 javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description :物料交期承诺 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_MATERIAL_DELIVERY_PROMISE") +@Api("物料") +public class MaterialDeliveryPromise extends BaseBean { + @Column(name="QTY") + @ApiParam(value ="到货数量") + private Double count; + + @Column(name="DATE_TIME") + @ApiParam(value ="到货日期") + private Date dateTime; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material", notEmpty = true) + private Long materialId; + + public Material getMaterial() { + return BeanRelation.get(this, EMaterialDeliveryPromise.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EMaterialDeliveryPromise.Material, material); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 7baa32a..bd8679a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -51,6 +51,11 @@ public class SalesOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; + @Column(name="ALLOW_DELAY_TIME") + @ApiParam(value ="允许延期时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String allowDelayTime; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index 0e529ea..6d1814a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -29,6 +29,10 @@ public class DateDuration { private double rate = 0.0; private boolean bValid = false; + public DateDuration(int value) { + this.time = value; + } + public DateDuration(String value) { setValue(value); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java new file mode 100644 index 0000000..abc6ec5 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EMaterialDeliveryPromise { + Material, +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java new file mode 100644 index 0000000..9d24208 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 延期订单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class DelaySalesOrder { + @ApiParam(value ="订单编码") + private String orderCode; + + @ApiParam(value ="订单名称") + private String orderName; + + @ApiParam(value ="物料编码") + private String materialCode; + + @ApiParam(value ="物料名称") + private String materialName; + + @ApiParam(value ="订单数量") + private Double count; + + @ApiParam(value ="最晚结束时间") + private Date let; + + @ApiParam(value ="计划开始时间") + private Date planStart; + + @ApiParam(value ="计划结束时间") + private Date planEnd; + + @ApiParam(value ="总跨度时间") + private String overTime; + + @ApiParam(value ="总生产时间") + private String productTime; + + @ApiParam(value ="延期时间") + private String delayTime; + + @ApiParam(value ="允许的最大延期时间") + private String allowDelayTime; + + // 0正常显示，1显示黄色，2显示红色 + @ApiParam(value ="背景显示颜色") + private Integer backgroundColor; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java new file mode 100644 index 0000000..134243a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 大跨度订单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class LargeSpanOrder { + @ApiParam(value ="订单编码") + private String orderCode; + + @ApiParam(value ="订单名称") + private String orderName; + + @ApiParam(value ="物料编码") + private String materialCode; + + @ApiParam(value ="物料名称") + private String materialName; + + @ApiParam(value ="订单数量") + private Double count; + + @ApiParam(value ="最晚结束时间") + private Date let; + + @ApiParam(value ="计划开始时间") + private Date planStart; + + @ApiParam(value ="计划结束时间") + private Date planEnd; + + @ApiParam(value ="总跨度时间") + private String overTime; + + @ApiParam(value ="总生产时间") + private String productTime; + + @ApiParam(value ="跨度时间") + private String spanTime; + + // 0正常显示，1显示黄色，2显示红色 + @ApiParam(value ="背景显示颜色") + private Integer backgroundColor; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java new file mode 100644 index 0000000..5e6421d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 物料交期分析表 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class MaterialDeliveryAnalyze { + + private String orderCode; + + private String orderName; + + private String materialCode; + + private String materialName; + + private String labelName; + + private String labelColor; + + private Date requireDate; + + private Date arrivalDate; + + private Double requireCount; + + private Double count; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java new file mode 100644 index 0000000..bd33577 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 过早生产 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class PrematureProduct { + @ApiParam(value ="订单编码") + private String orderCode; + + @ApiParam(value ="订单名称") + private String orderName; + + @ApiParam(value ="物料编码") + private String materialCode; + + @ApiParam(value ="物料名称") + private String materialName; + + @ApiParam(value ="订单编码") + private Double count; + + @ApiParam(value ="最晚结束时间") + private Date let; + + @ApiParam(value ="计划开始时间") + private Date planStart; + + @ApiParam(value ="计划结束时间") + private Date planEnd; + + @ApiParam(value ="提前完成时间") + private String times; + + // 0正常显示，1显示红色 + @ApiParam(value ="背景显示颜色") + private Integer backgroundColor; + +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java new file mode 100644 index 0000000..afe26b8 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.MaterialDeliveryPromise; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MaterialDeliveryPromiseRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml new file mode 100644 index 0000000..310c255 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 5338751..6a70eb3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1110,4 +1110,33 @@ public class ApsEnumUtil { return description; } } + + /** + * 订单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_STATUS { + NOPLAN("NOPLAN", "未计划"), + PLANDONE("PLANDONE", "计划完毕"), + INDICATIONDONE("INDICATIONDONE", "指示完毕"), + CONFIRM("CONFIRM", "确认"), + STARTPRODUCT("STARTPRODUCT", "开始生产"), + FINISH("FINISH", "完成"); + + private String value; + private String description; + + ORDER_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From 5ee4fd644110cb05f6297440653c65f94046b356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 12 Jun 2020 15:06:53 +0800 Subject: [PATCH 017/156] =?UTF-8?q?=E5=BC=80=E5=8F=91MES=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?AGV=E5=81=9C=E6=9C=BA=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 19 +++++++++++++++++++ 1 file changed, 19 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 de74501..6b20941 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 @@ -2982,4 +2982,23 @@ public class MesHqlPack { } return packBean; } + + /** + * MES AGV停机记录信息条件查询 + * @param stopRecord + * @return + */ + public static DdlPackBean getMesAgvRecoredData(MesAgvStopRecord stopRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(stopRecord.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getNumEqualPack(stopRecord.getStopType(), "stopType", packBean); + DdlPreparedPack.getStringEqualPack(stopRecord.getProductSn(), "productSn", packBean); + DdlPreparedPack.getNumEqualPack(stopRecord.getPartNo(), "partNo", packBean); + if (!StringUtils.isEmpty(stopRecord.getStopStartTime()) || !StringUtils.isEmpty(stopRecord.getStopEndTime())) { + DdlPreparedPack.timeBuilder(stopRecord.getCreateDateTimeStart(), stopRecord.getCreateDateTimeEnd(), + "stopEndTime", packBean, true); + } + return packBean; + } } From 27cb1dddfe584c12205289a859a949c017aec41d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 12 Jun 2020 17:21:04 +0800 Subject: [PATCH 018/156] =?UTF-8?q?=E3=80=901603=20=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E6=9F=A5=E8=AF=A2-=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=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/WmsMoveSn.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/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 6c182e1..1a11e38 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 @@ -340,7 +340,7 @@ public class WmsMoveSn extends BaseBean { } public WmsMoveSn(Long id,String organizeCode,String outRefSrc,String rcRefSrc,String outSn,String rcSn, - String rcPartNo,String outPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty, + String outPartNo,String rcPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty, String outDatetime,String rcDatetime ,String vendorNo, String modifyUser,String modifyDatetime) { this.id = id; this.organizeCode = organizeCode; From 7a60d37ddc7cff729f7a708a970f4349b523738d Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 12 Jun 2020 17:29:57 +0800 Subject: [PATCH 019/156] Finish Task #2080 Cost:8h --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 077e388..b6385a9 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 @@ -7550,13 +7550,13 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SCAN_CATEGORY { - ASN(10, "wmsDoMovementMasterRepository", "ASN"), - PO(20, "wmsDoMovementMasterRepository", "PO"), - SO(30, "wmsDoMovementMasterRepository", "SO"), - MOVE(40, "wmsDoMovementMasterRepository", "移库单"), - IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"), - SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"), - QC(70, "wmsDoMovementMasterRepository", "质检单"), + ASN(10, "wmsDocMovementMasterRepository", "ASN"), + PO(20, "wmsDocMovementMasterRepository", "PO"), + SO(30, "wmsDocMovementMasterRepository", "SO"), + MOVE(40, "wmsDocMovementMasterRepository", "移库单"), + IN_STOCK(50, "wmsDocMovementMasterRepository", "入库单"), + SHIPPING(60, "wmsDocMovementMasterRepository", "发运单"), + QC(70, "wmsQCMasterRepository", "质检单"), CS(80, "wmsCSOrderMasterRepository", "盘点单"), SN(90, "wmsStockSnRepository", "条码"), PO_SN(100, "wmsPoSnRepository", "收货条码"); From 764060bf20b02cc077121e85416c4c33ed9de85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 12 Jun 2020 18:15:09 +0800 Subject: [PATCH 020/156] Start Task #2118 Cost:8h Left:0h Finish Task #2118 Cost:8h --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ---------------------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++-- 3 files changed, 50 insertions(+), 50 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 ba4acde..03a76b9 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 @@ -6278,4 +6278,50 @@ public class MesEnumUtil { return tmp; } } + + /** + * 停机类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOP_MACHINE_TYPE { + TIMER_TIME_OUT(10, "计时器超时停机"), + DELAY_HELP(20, "延时帮助停机"), + URGENT_STOP(30, "急停停机"); + + private int value; + private String description; + + STOP_MACHINE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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) { + 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 b7ed38c..6f4c656 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 @@ -4073,52 +4073,6 @@ public class MesPcnEnumUtil { } /** - * 停机类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum STOP_MACHINE_TYPE { - TIMER_TIME_OUT(10, "计时器超时停机"), - DELAY_HELP(20, "延时帮助停机"), - URGENT_STOP(30, "急停停机"); - - private int value; - private String description; - - STOP_MACHINE_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - 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) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** * plc状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 6b20941..d325b7d 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 @@ -2991,13 +2991,13 @@ public class MesHqlPack { public static DdlPackBean getMesAgvRecoredData(MesAgvStopRecord stopRecord, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringLikerPack(stopRecord.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getNumEqualPack(stopRecord.getStopType(), "stopType", packBean); - DdlPreparedPack.getStringEqualPack(stopRecord.getProductSn(), "productSn", packBean); - DdlPreparedPack.getNumEqualPack(stopRecord.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(stopRecord.getProductSn(), "productSn", packBean); + DdlPreparedPack.getStringEqualPack(stopRecord.getPartNo(), "partNo", packBean); if (!StringUtils.isEmpty(stopRecord.getStopStartTime()) || !StringUtils.isEmpty(stopRecord.getStopEndTime())) { DdlPreparedPack.timeBuilder(stopRecord.getCreateDateTimeStart(), stopRecord.getCreateDateTimeEnd(), - "stopEndTime", packBean, true); + "stopStartTime", packBean, true); } return packBean; } From f5452667f6d2c88bcbc72c285772af5393a0b6ff Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 13 Jun 2020 18:05:50 +0800 Subject: [PATCH 021/156] Start Task #2139 Cost:16h Left:8h --- .../{DataReviewStepModel.java => DataReviewModel.java} | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{DataReviewStepModel.java => DataReviewModel.java} (63%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java similarity index 63% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 22a3440..ab021fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Api("数据复核model") -public class DataReviewStepModel { +public class DataReviewModel { @ApiParam("关键件") private String itemPartNo; @@ -25,5 +25,16 @@ public class DataReviewStepModel { @ApiParam("对象代码") private String objectCode; + @ApiParam("对象名称") + private String objectCodeName; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("复核结果") + private Integer reviewResult; + + @ApiParam("补录操作") + private Integer supplementaryOperate; } From f3857116d14ddd5786d73b675a721f0022657ae3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 14 Jun 2020 18:31:26 +0800 Subject: [PATCH 022/156] =?UTF-8?q?=E3=80=902074=2006=201.2.3.8=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E7=AD=96=E7=95=A5-=E8=AE=A1=E7=AE=97COI=E5=80=BC?= =?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/WmsEnumUtil.java | 476 +++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java | 64 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 20 + .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 10 + .../cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java | 126 ++++++ .../pojo/wms/repository/WmsCoiRepository.java | 16 + .../pojo/wms/repository/WmsTracticsRepository.java | 16 + 7 files changed, 728 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCoiRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTracticsRepository.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 077e388..f75521d 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 @@ -7635,4 +7635,480 @@ public class WmsEnumUtil { return null; } } + + /** + * 策略等级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRACTICS_GRADE { + ONE_TRACTICS_GRADE(10, "ONE_TRACTICS_GRADE", "1级策略"), + TWO_TRACTICS_GRADE(20, "TWO_TRACTICS_GRADE", "2级策略"), + THREE_TRACTICS_GRADE(30, "THREE_TRACTICS_GRADE", "3级策略"); + + private int value; + private String code; + private String description; + + TRACTICS_GRADE(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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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 TRACTICS_GRADE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * 策略组 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRACTICS_GROUP { + INSTOCK(10, "INSTOCK", "上架"), + PICKING(20, "PICKING", "拣货"); + + private int value; + private String code; + private String description; + + TRACTICS_GROUP(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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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 TRACTICS_GROUP codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * 上架:策略项:1级策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INSTOCK_TRACTICS_ITEM_ONE { + COI_RECOMMEND(10, "COI_RECOMMEND", "COI推荐"), + ADJACENT_RECOMMEND(20, "ADJACENT_RECOMMEND", "高频推荐(相邻)"), + AREA_RECOMMEND(30, "AREA_RECOMMEND", "区域随机推荐"), + INERTIA_RECOMMEND(40, "INERTIA_RECOMMEND", "惯性推荐"), + ARTIFICIAL_RECOMMEND(50, "ARTIFICIAL_RECOMMEND", "人工指定"); + + private int value; + private String code; + private String description; + + INSTOCK_TRACTICS_ITEM_ONE(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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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 INSTOCK_TRACTICS_ITEM_ONE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * 上架:策略项:2级策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INSTOCK_TRACTICS_ITEM_TWO { + FULL_RECOMMEND(10, "FULL_RECOMMEND", "放满推荐"), + EMPTY_RECOMMEND(20, "EMPTY_RECOMMEND", "空位推荐"); + + private int value; + private String code; + private String description; + + INSTOCK_TRACTICS_ITEM_TWO(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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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 INSTOCK_TRACTICS_ITEM_TWO codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * 上架:策略项:3级策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INSTOCK_TRACTICS_ITEM_THREE { + FCL_RECOMMEND(10, "FCL_RECOMMEND", "整箱推荐"), + EMPTY_BOX_RECOMMEND(20, "EMPTY_BOX_RECOMMEND", "零箱推荐"), + WHOLE_BOX_RECOMMEND(30, "WHOLE_BOX_RECOMMEND", "整零箱推荐"); + + private int value; + private String code; + private String description; + + INSTOCK_TRACTICS_ITEM_THREE(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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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 INSTOCK_TRACTICS_ITEM_THREE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * 拣货:策略项:1级策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PICKING_TRACTICS_ITEM_ONE { + ABSOLUTE_PATH(10, "ABSOLUTE_PATH", "绝对路径"), + RELATIVE_PATH(20, "RELATIVE_PATH", "相对路径"), + LOCATE_ORDER_BY(30, "LOCATE_ORDER_BY", "库位编号排序"); + + private int value; + private String code; + private String description; + + PICKING_TRACTICS_ITEM_ONE(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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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 PICKING_TRACTICS_ITEM_ONE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * 库位坐标是否允许偏移 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DOWN_OR_UP { + + IS_TRUE(10, "IS_TRUE", "允许"), + IS_FALSE(20, "IS_FALSE", "不允许"); + + private int value; + private String codeValue; + private String description; + + DOWN_OR_UP(int value, String codeValue, String description) { + this.value = value; + this.codeValue = codeValue; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCodeValue() { + return codeValue; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java new file mode 100644 index 0000000..e07cb5f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.wms.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 : COI对照表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-09 16:59 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_COI") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="COI对照表",description = "COI对照表") +public class WmsCoi extends BaseBean { + + private static final long serialVersionUID = -8298385889006722335L; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "PART_VOL") + @ApiParam(value = "体积") + private Double partVol; + + @Column(name = "TRUNROUND_RATE") + @ApiParam(value = "周转率") + private Double trunroundRate; + + @Column(name = "COI_VALUE") + @ApiParam(value = "COI值") + private Double coiValue; + + @Column(name = "LAST_UPDATE_DATE") + @ApiParam(value = "末次更新日期") + private String lastUpdateDate; + + @Column(name = "FREQUENCY") + @ApiParam(value = "频次") + private Double frequency; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位") + private String locateNo; +} 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 0876d86..e75def7 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 @@ -165,6 +165,26 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description") private Integer bhLocateType; + @Column(name = "DOWN_X") + @ApiParam(value = "X向下偏移", example = "-1") + @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") + private Integer downX; + + @Column(name = "UP_X") + @ApiParam(value = "X向上偏移", example = "-1") + @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") + private Integer upX; + + @Column(name = "DOWN_Y") + @ApiParam(value = "Y向下偏移", example = "-1") + @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") + private Integer downY; + + @Column(name = "UP_Y") + @ApiParam(value = "Y向上偏移", example = "-1") + @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description") + private Integer upY; + // 导入用 @ApiParam(value = "工厂") @Transient 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 235fd54..1878152 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 @@ -226,6 +226,11 @@ public class WmsPart extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; + @Column(name = "PART_VOL", columnDefinition = "decimal(18,8)") + @ApiParam(value = "体积", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double partVol; + @Transient @ApiParam("总数量") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) @@ -290,6 +295,11 @@ public class WmsPart extends BaseBean { public WmsPart() { } + public Double getPartVol() { + return partVol == null ? 0 : partVol; + } + + public Double getQty() { return qty == null ? 0 : qty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java new file mode 100644 index 0000000..1220b53 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java @@ -0,0 +1,126 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 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; +import javax.persistence.Transient; + +/** + * @Description : 策略表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-09 16:45 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_TRACTICS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="策略表",description = "策略表") +public class WmsTractics extends BaseBean { + + private static final long serialVersionUID = -8203200560604263871L; + @Column(name="TRACTICS_CODE") + @ApiParam(value ="策略代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tracticsCode; + + @Column(name="TRACTICS_NAME") + @ApiParam(value ="策略名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tracticsName; + + @Column(name="TRACTICS_DESC") + @ApiParam(value ="策略描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tracticsDesc; + + @Column(name="TRACTICS_GRADE") + @ApiParam(value ="策略等级") + // @AnnoOutputColumn(refClass = WmsEnumUtil.TRACTICS_GRADE.class, refForeignKey = "value", value = "description") +// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "TRACTICS_GRADE") + private Integer tracticsGrade; + + @Column(name="TRACTICS_GROUP") + @ApiParam(value ="策略组") +// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "TRACTICS_GROUP") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRACTICS_GROUP.class, refForeignKey = "value", value = "description") + private Integer tracticsGroup; + + @Column(name="TRACTICS_ITEM") + @ApiParam(value ="策略项") +// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer tracticsItem; + + @Column(name="TRACTICS_PART_GROUP") + @ApiParam(value ="策略适用物料组") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", + searchColumnName = "partGroupNo,partGroupName", listColumnName = "partGroupNo,partGroupName", explicitColumnName = "partGroupNo") + private String tracticsPartGroup; + + @Column(name="TRACTICS_ZONE") + @ApiParam(value ="策略适用存储区") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") + private String tracticsZone; + + @Column(name="TRACTICS_PARAM") + @ApiParam(value ="参数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tracticsParam; + + @Column(name="TRACTICS_START_TIME") + @ApiParam(value ="策略生效日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String tracticsStartTime; + + @Column(name="TRACTICS_END_TIME") + @ApiParam(value ="策略失效日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) + private String tracticsEndTime; + + @Column(name="LEV1_STRATEGY") + @ApiParam(value ="1级策略上架") + @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE") + private String lev1Strategy; + +// @Column(name="LEV1_STRATEGY") + @Transient + @ApiParam(value ="1级策略拣货") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE") + private String lev1StrategyPicking; + + @Column(name="LEV2_STRATEGY") + @ApiParam(value ="2级策略") + @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO") + private String lev2Strategy; + + @Column(name="LEV3_STRATEGY") + @ApiParam(value ="3级策略") + @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE") + private String lev3Strategy; + +// public String getIev1StrategyPicking (String lev1StrategyPicking) { +// return this.lev1Strategy = lev1StrategyPicking; +// } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCoiRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCoiRepository.java new file mode 100644 index 0000000..23df52e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCoiRepository.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.WmsCoi; +import org.springframework.stereotype.Repository; + +/** + * @Description : COI对照表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-10 10:24 + * @Modify: + **/ +@Repository +public interface WmsCoiRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTracticsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTracticsRepository.java new file mode 100644 index 0000000..d058755 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTracticsRepository.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.WmsTractics; +import org.springframework.stereotype.Repository; + +/** + * @Description : 策略表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-10 10:24 + * @Modify: + **/ +@Repository +public interface WmsTracticsRepository extends BaseRepository{ +} From 53298f6b88b4f9b6cf436a6c8e52c85fbbd877e4 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 15 Jun 2020 09:15:18 +0800 Subject: [PATCH 023/156] Finish Task #2080 Cost:8h --- .../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 b6385a9..adf2ba9 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 @@ -7559,7 +7559,7 @@ public class WmsEnumUtil { QC(70, "wmsQCMasterRepository", "质检单"), CS(80, "wmsCSOrderMasterRepository", "盘点单"), SN(90, "wmsStockSnRepository", "条码"), - PO_SN(100, "wmsPoSnRepository", "收货条码"); + PO_SN(100, "wmsPoSnRepository,wmsASNMasterDetailsRepository", "收货条码"); private int value; private String code; From e7e13e53f4a0f783867b6eb83cf1298592d96b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 15 Jun 2020 10:23:16 +0800 Subject: [PATCH 024/156] =?UTF-8?q?=E3=80=90=E5=B7=A5=E8=89=BA=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=AE=BE=E8=AE=A1-=E6=9B=B4=E6=96=B0=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=BB=84=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 | 3 ++- .../estsh/i3plus/pojo/mes/bean/MesStepParam.java | 31 ++++++++++++++++++++++ 2 files changed, 33 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 b603804..ae9cd66 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 @@ -3829,7 +3829,8 @@ public class MesEnumUtil { QUALIFIED(10, "number", "数字"), DEFECTED(20, "text", "字符串"), SCRAPED(30, "select", "可选值"), - BUTTON(40, "button", "按钮"); + BUTTON(40, "button", "按钮"), + WINDOW(50, "window", "开窗"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index 237df3e..dd0d6b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -11,7 +11,10 @@ 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; +import java.util.List; +import java.util.Map; /** * @Description :工步参数 @@ -49,4 +52,32 @@ public class MesStepParam extends BaseBean implements Serializable { @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性 text select") private String paramAttribute; + + @Column(name = "EXHIBITION_KEY") + @ApiParam("展示key") + private String exhibitionKey; + + @Column(name = "EXHIBITION_VALUE") + @ApiParam("展示value") + private String exhibitionValue; + + @Column(name = "OBJECT_CODE") + @ApiParam("参数对象") + private String objectCode; + + @Column(name = "TYPE") + @ApiParam("type") + private Integer type = 0; + + @Transient + @ApiParam("可选值的数据") + private List> enumList; + + @Transient + @ApiParam("key的值") + private Object geValue; + + @Transient + @ApiParam("value的值") + private Object geDescription; } From 6c47817bfe713fde1e7af7695685e57d15151793 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 15 Jun 2020 15:09:16 +0800 Subject: [PATCH 025/156] mes enuk --- .../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 0a82de8..885c8f0 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 @@ -1903,7 +1903,8 @@ public class MesEnumUtil { MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"), MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"), MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), - MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"); + MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"), + MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"); private int value; private String service; From 4de301bf79db302a342e2022b7e2698fc51334b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 15 Jun 2020 17:06:49 +0800 Subject: [PATCH 026/156] =?UTF-8?q?MDM=20=E7=B3=BB=E7=BB=9F=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BC=98=E5=8C=96=20=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 4 ++++ .../cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java | 12 +++++++++--- .../i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java | 12 ++++++------ .../i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java | 10 +++++----- .../cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java | 12 ++++++++++++ .../i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java | 4 ++-- .../cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java | 13 ++++++++++++- .../i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java | 2 +- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 1 + 10 files changed, 53 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java index e8c5618..84e7427 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java @@ -123,7 +123,7 @@ public class MdmEnumUtil { public enum MDM_SYNC_TYPE{ INSERT(1, "新增"), UPDATE(2, "修改"), - DELETE(2, "删除"); + DELETE(3, "删除"); private int value; private String description; 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..7417439 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 @@ -76,6 +76,10 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否编辑") private Integer isObjectEdit; + @Column(name = "IS_READ_ONLY_SHOW") + @ApiParam(value = "是否只读显示") + private Integer isReadOnlyShow; + @Column(name = "IS_OBJECT_DEL") @ApiParam(value = "是否删除") private Integer isObjectDel; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index 859a6b3..3fef7c4 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -30,12 +30,13 @@ public abstract class BaseMdmBean extends BaseBean { @Transient @ApiModelProperty("是否主数据") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); @Column(name = "MDM_VERSION") @ApiModelProperty("mdm数据版本") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) private Long mdmVersion; public long getMdmVersionVal() { @@ -50,21 +51,26 @@ public abstract class BaseMdmBean extends BaseBean { @Column(name = "IS_MDM_PUBLISHED") @ApiModelProperty("是否发布") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) private Integer isMdmPublished; @Column(name = "MDM_OPERATE_TYPE") @ApiModelProperty("操作类型") - @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class) + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true) private Integer mdmOperateType; public Integer getMdmOperateTypeVal() { return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType; } + public String getMdmOperateTypeTxt(){ + return MdmEnumUtil.MDM_OPERATE_TYPE.valueOfDescription(getMdmOperateTypeVal()); + } + @Column(name = "MDM_REF_ID") @ApiModelProperty("关联id") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) private Long mdmRefId; //排序方式 diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java index 96d8c16..ef84a68 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java @@ -28,22 +28,22 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean { @Transient @ApiModelProperty("是否主数据") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true) public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); @Transient @ApiModelProperty("主数据Class") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) - public static Class mdmMasterClass = BaseMdmBean.class; + @AnnoOutputColumn(hidden = true) + protected static Class mdmMasterClass = BaseMdmBean.class; @Transient @ApiModelProperty("软件模块") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) - public static Integer mdmSoftType; + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true) + protected static Integer mdmSoftType; @Column(name = "MDM_MASTER_ID") @ApiModelProperty("主数据id") @JsonSerialize(using = ToStringSerializer.class) - private Long mdmMasterId; + public Long mdmMasterId; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java index 3aafc4b..1fe17c1 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java @@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty; **/ public abstract class BaseMdmBusiModelBean { + public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) { + this.mdmMasterBean = mdmMasterBean; + this.mdmBusiBean = mdmBusiBean; + } + @ApiModelProperty("主数据") private M mdmMasterBean; @@ -20,11 +25,6 @@ public abstract class BaseMdmBusiModelBean Date: Mon, 15 Jun 2020 17:30:39 +0800 Subject: [PATCH 027/156] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java | 3 ++- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java | 3 ++- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java | 3 ++- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index 7d49ff3..d53eb6b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -10,9 +10,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.Table; /** @@ -23,7 +23,7 @@ import javax.persistence.Table; * @Modify: **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index eed1578..90e1854 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,7 +24,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index ce575dc..f14accf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,7 +27,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index 2c6c575..c45cd05 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; import javax.persistence.Entity; @@ -26,7 +27,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 23f1a00..9d1de96 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -12,9 +12,9 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.Table; /** @@ -25,7 +25,7 @@ import javax.persistence.Table; * @Modify : **/ @Data -@Entity +@Document @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) From b114daed3fee465c7eb3bf0aa2da03214c2ef578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 15 Jun 2020 17:45:32 +0800 Subject: [PATCH 028/156] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=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/mes/bean/MesPcnTask.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 83f9049..3c83ccd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -11,6 +11,7 @@ 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; @@ -79,6 +80,7 @@ public class MesPcnTask extends BaseBean implements Serializable { @ApiParam("任务周期描述") private String taskCycleDescription; + @Lob @Column(name = "TASK_PARAM") @ApiParam("任务参数") private String taskParam; From e457b50145c71371e6fae2156d56d630d49cb1bf Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 15 Jun 2020 18:11:30 +0800 Subject: [PATCH 029/156] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= 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 667156b..169c59d 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 @@ -224,6 +224,7 @@ public class WmsHqlPack { 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); getStringBuilderPack(wmsDocMovementMaster, packBean); From b0b07437d6b8323d0fb1ba6dbc0b7acaa965266a Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 15 Jun 2020 20:01:55 +0800 Subject: [PATCH 030/156] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= 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/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 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 a9e288f..b948580 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 a44418c..e12eaee 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 2de88b5..c338f71 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 50ab2c2..7637865 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 7f94617..d98b7d8 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 d800ecf..bf96e57 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 60fc467..a758a6a 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 d65e031..efacfd2 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 a785f21..dba12cc 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 d6d2f8e..81670b2 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 0fbfb69..26a7311 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 76739f9..eaf2544 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 0368700..0f615b6 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 b2eedd4..9e5f745 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 5fcd08a..0fea52b 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 2eddf76..cc8fce6 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 ab8ee21c664ca7f2182d5ab01bb9ac8e8476866b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 15 Jun 2020 20:12:14 +0800 Subject: [PATCH 031/156] Finish Task #2139 Cost:8h --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 12 ++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) 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 7fbe7f7..76ee1d5 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 @@ -12,6 +12,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; /** @@ -56,4 +57,15 @@ public class MesPartCheck extends BaseBean implements Serializable { @ApiParam("校验表达式描述") private String recordNumDesc; + @Transient + @ApiParam("复核结果") + private Integer reviewResult = 1; + + @Transient + @ApiParam("对象名称") + private String objectCodeName; + + @Transient + @ApiParam("产线") + private String workCenterCode; } 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 ab021fd..3d121d7 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 @@ -25,16 +25,4 @@ public class DataReviewModel { @ApiParam("对象代码") private String objectCode; - @ApiParam("对象名称") - private String objectCodeName; - - @ApiParam("产线") - private String workCenterCode; - - @ApiParam("复核结果") - private Integer reviewResult; - - @ApiParam("补录操作") - private Integer supplementaryOperate; - } From 3fe454da39e029a87069908ea7ed66419983b532 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 15 Jun 2020 21:14:00 +0800 Subject: [PATCH 032/156] Fix bug#8909 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) 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 3b790fb..5ad3da6 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 @@ -745,7 +745,7 @@ public class WmsStockSn extends BaseBean { String shippingFlag, String workCenterCode, Integer snType, String packagePartNo, Integer useCount, Integer seqNo, String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, - String prodCfgTypeName, String custNameRdd) { + String prodCfgTypeName, String custNameRdd, String workOrderCode) { this.organizeCode = organizeCode; this.id = id; this.sn = sn; @@ -791,7 +791,7 @@ public class WmsStockSn extends BaseBean { this.partTypeDesc = partTypeDesc; this.prodCfgTypeName = prodCfgTypeName; this.custNameRdd = custNameRdd; - this.vendorNameRdd = vendorNameRdd; + this.workOrderCode = workOrderCode; } 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 a20ea25..2c5f6e1 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 @@ -77,6 +77,10 @@ public class WmsTransType extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description") private Integer orderBackType; + @Column(name = "TM_NAME") + @ApiParam(value = "交易处理组件名称") + private String tmName; + @Transient @ApiParam("菜单URL") private String menuUrl; From 638c032d95c0d3525b51002d82e782433989613c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 16 Jun 2020 13:14:27 +0800 Subject: [PATCH 033/156] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E7=BB=84=E4=BB=B6=E8=B0=83=E7=94=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 5 ++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 51 +++++++++++++++++++++- 2 files changed, 52 insertions(+), 4 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 885c8f0..7fc29e9 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 @@ -70,8 +70,9 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(10, "展示组件"), - BUTTON_MODULE(30, "按钮组件"); + REVEAL_MODULE(20, "展示组件"), + BUTTON_MODULE(30, "按钮组件"), + TIMING_MODULE(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 6f4c656..c9c15e5 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 @@ -18,8 +18,9 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(10, "展示组件"), - BUTTON_MODULE(30, "按钮组件"); + REVEAL_MODULE(20, "展示组件"), + BUTTON_MODULE(30, "按钮组件"), + TIMING_MODULE(40, "定时组件"); private int value; private String description; @@ -4073,6 +4074,52 @@ public class MesPcnEnumUtil { } /** + * 停机类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOP_MACHINE_TYPE { + TIMER_TIME_OUT(10, "计时器超时停机"), + DELAY_HELP(20, "延时帮助停机"), + URGENT_STOP(30, "急停停机"); + + private int value; + private String description; + + STOP_MACHINE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * plc状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 089f655cfebae5a49567d173f8b5fd86b46a24bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 16 Jun 2020 13:14:45 +0800 Subject: [PATCH 034/156] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E7=BB=84=E4=BB=B6=E8=B0=83=E7=94=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 6 ++++++ 1 file changed, 6 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 bb6d667..7952b14 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 @@ -138,6 +138,12 @@ public class StationRequestBean implements Serializable { @ApiParam("工步弹框状态") private Boolean stepDialogStatus = false; + @ApiParam("是否按时完成") + private Integer isOnTimeComplete; + + @ApiParam("工位剩余时间") + private Integer remainWorkTime; + @ApiParam("特殊展示数据") private Map specialDisplayMap = new HashMap<>(); From bdb5e6e27c2cfa533c0748db9556ab745760cee6 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 11 Jun 2020 17:47:52 +0800 Subject: [PATCH 035/156] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 43 ++++ .../estsh/i3plus/pojo/platform/bean/SysUser.java | 5 + .../i3plus/pojo/platform/bean/SysUserPassword.java | 47 ++++ .../repository/SysUserPasswordRepository.java | 14 ++ .../estsh/i3plus/pojo/report/bean/BrPojoAttr.java | 244 ++++++++++----------- .../report/repository/BrPojoAttrRepository.java | 30 +-- 6 files changed, 246 insertions(+), 137 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 0574e44..64a9161 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1234,4 +1234,47 @@ public class ImppEnumUtil { return null; } } + + /** + * 密码策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_TEXT { + PASSWORD_VERIFY(1, "保存策略"), + PASSWORD_LOGIN(2, "登录策略"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private CHECK_TEXT(int value, String description) { + this.value = value; + this.description = description; + } + + 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 CHECK_TEXT valueOfEnum(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-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 9afa74c..02c2570 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -58,6 +58,11 @@ public class SysUser extends BaseBean { @ApiParam(value ="登陆密码") private String userLoginPassword; + @Column(name="USER_LOGIN_PASSWORD_ID") + @ApiParam(value ="密码ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userLoginPasswordId; + @Column(name="USER_TYPE") @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") private Integer userType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java new file mode 100644 index 0000000..e2902ca --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.platform.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.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 : wei.peng + * @CreateDate : 20-6-4 下午3:38 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_USER_PASSWORD") +@Api(value="账号密码") +public class SysUserPassword extends BaseBean { + private static final long serialVersionUID = 4536854582252378921L; + + @Column(name="USER_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="USER_PASSWORD") + @ApiParam(value ="用户密码") + private String userPassword; + + @Column(name="USER_LOGIN_LAST_DATE_TIME") + @ApiParam(value ="账号最后登录时间") + private String userLoginLastDateTime; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java new file mode 100644 index 0000000..dda7e76 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.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.SysUserPassword; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-6-4 下午3:46 + * @Modify: + **/ +public interface SysUserPasswordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index 5387dcd..6a9df34 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -1,122 +1,122 @@ -package cn.estsh.i3plus.pojo.report.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.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 : Adair Peng - * @CreateDate : 2019-01-18 11:32 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_POJO_ATTR") -@Api(value="对象属性",description = "对象属性") -public class BrPojoAttr extends BaseBean { - - private static final long serialVersionUID = -9025365832485707583L; - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="SERVER_ID") - @ApiParam(value ="服务ID",example = "-1") - private Integer serverId; - - @Column(name="POJO_ID") - @ApiParam(value ="模板对象ID" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long pojoId; - - @Column(name="POJO_NAME") - @ApiParam(value ="对象名称") - private String pojoName; - - @Column(name="PACKAGE_NAME_RDD") - @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") - private String packageNameRdd; - - @Column(name="POJO_TABLE_NAME_ALIAS") - @ApiParam(value ="对象别名") - private String pojoTableNameAlias; - - @Column(name="ATTR_COLUMN_NAME") - @ApiParam(value ="属性别名") - private String attrColumnName; - - @Column(name="ATTR_COLUMN_NAME_ALIAS") - @ApiParam(value ="属性别名") - private String attrColumnNameAlias; - - @Column(name="PARENT_ID") - @ApiParam(value ="上级ID",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - - @Column(name="ATTR_TYPE") - @ApiParam(value ="属性类型",example = "-1") - private Integer attrType; - - @Column(name="ATTR_REF_TYPE") - @ApiParam(value ="关系类型",example = "-1") - private Integer attrRefType; - - @Column(name="DATA_TYPE") - @ApiParam(value ="数据类型",example = "-1") - private Integer dataType; - - @Column(name="CHART_ATTR_NAME") - @ApiParam(value ="图标属性名称") - private String chartAttrName; - - @Column(name="AGGREGATION_TYPE") - @ApiParam(value ="聚合类型",example = "-1") - private Integer aggregationType; - - @Column(name="AGGREGATION_ID") - @ApiParam(value ="聚合类型",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long aggregationId; - - @Column(name="ATTR_SORT") - @ApiParam(value ="字段排序") - private Integer attrSort; - - @Column(name="ATTR_DATA_SORT") - @ApiParam(value ="字段排序") - private Integer attrDataSort; - - @Column(name="ATTR_STYLE") - @ApiParam(value ="字段样式") - private Integer attrStyle; - - @Column(name="ATTR_STYLE_RDD") - @ApiParam(value ="字段样式") - private String attrStyleRdd; - - @Column(name="ATTR_DEFAULT_VALUE") - @ApiParam(value ="属性默认值") - private String attrDefaultValue; - - @Column(name="ATTR_SHOW") - @ApiParam(value ="属性是否显示",example = "-1") - private Integer attrShow; - -} +//package cn.estsh.i3plus.pojo.report.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.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 : Adair Peng +// * @CreateDate : 2019-01-18 11:32 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_POJO_ATTR") +//@Api(value="对象属性",description = "对象属性") +//public class BrPojoAttr extends BaseBean { +// +// private static final long serialVersionUID = -9025365832485707583L; +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="SERVER_ID") +// @ApiParam(value ="服务ID",example = "-1") +// private Integer serverId; +// +// @Column(name="POJO_ID") +// @ApiParam(value ="模板对象ID" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long pojoId; +// +// @Column(name="POJO_NAME") +// @ApiParam(value ="对象名称") +// private String pojoName; +// +// @Column(name="PACKAGE_NAME_RDD") +// @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") +// private String packageNameRdd; +// +// @Column(name="POJO_TABLE_NAME_ALIAS") +// @ApiParam(value ="对象别名") +// private String pojoTableNameAlias; +// +// @Column(name="ATTR_COLUMN_NAME") +// @ApiParam(value ="属性别名") +// private String attrColumnName; +// +// @Column(name="ATTR_COLUMN_NAME_ALIAS") +// @ApiParam(value ="属性别名") +// private String attrColumnNameAlias; +// +// @Column(name="PARENT_ID") +// @ApiParam(value ="上级ID",example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long parentId; +// +// @Column(name="ATTR_TYPE") +// @ApiParam(value ="属性类型",example = "-1") +// private Integer attrType; +// +// @Column(name="ATTR_REF_TYPE") +// @ApiParam(value ="关系类型",example = "-1") +// private Integer attrRefType; +// +// @Column(name="DATA_TYPE") +// @ApiParam(value ="数据类型",example = "-1") +// private Integer dataType; +// +// @Column(name="CHART_ATTR_NAME") +// @ApiParam(value ="图标属性名称") +// private String chartAttrName; +// +// @Column(name="AGGREGATION_TYPE") +// @ApiParam(value ="聚合类型",example = "-1") +// private Integer aggregationType; +// +// @Column(name="AGGREGATION_ID") +// @ApiParam(value ="聚合类型",example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long aggregationId; +// +// @Column(name="ATTR_SORT") +// @ApiParam(value ="字段排序") +// private Integer attrSort; +// +// @Column(name="ATTR_DATA_SORT") +// @ApiParam(value ="字段排序") +// private Integer attrDataSort; +// +// @Column(name="ATTR_STYLE") +// @ApiParam(value ="字段样式") +// private Integer attrStyle; +// +// @Column(name="ATTR_STYLE_RDD") +// @ApiParam(value ="字段样式") +// private String attrStyleRdd; +// +// @Column(name="ATTR_DEFAULT_VALUE") +// @ApiParam(value ="属性默认值") +// private String attrDefaultValue; +// +// @Column(name="ATTR_SHOW") +// @ApiParam(value ="属性是否显示",example = "-1") +// private Integer attrShow; +// +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java index 386bfc5..b719014 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrMenu; -import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:03 - * @Modify: - **/ -public interface BrPojoAttrRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrMenu; +//import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:03 +// * @Modify: +// **/ +//public interface BrPojoAttrRepository extends BaseRepository { +//} From 4208d39e3f0cb1f9de24428288a2b323f7a18b60 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 15 Jun 2020 18:46:20 +0800 Subject: [PATCH 036/156] =?UTF-8?q?feat(=E5=AF=86=E7=A0=81=E8=A7=84?= =?UTF-8?q?=E5=88=99=E9=AA=8C=E8=AF=81=E5=AE=8C=E6=88=90):=20=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95,=E5=AF=86=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=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/platform/bean/SysUser.java | 2 ++ .../java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 02c2570..643cb74 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -54,6 +54,7 @@ public class SysUser extends BaseBean { @ApiParam(value ="工号") private String userEmpNo; + @Deprecated // 废弃密码新 , 使用ID作为密码信息, 改密码作为数据传输使用 @Column(name="USER_LOGIN_PASSWORD") @ApiParam(value ="登陆密码") private String userLoginPassword; @@ -83,6 +84,7 @@ public class SysUser extends BaseBean { @ApiParam(value ="登录次数",example = "0") private Integer userLoginNum; + @Deprecated @Column(name="USER_LOGIN_LAST_DATE_TIME") @ApiParam(value ="账号最后登录时间") private String userLoginLastDateTime; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java index e2902ca..bd94c41 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java @@ -44,4 +44,11 @@ public class SysUserPassword extends BaseBean { @ApiParam(value ="账号最后登录时间") private String userLoginLastDateTime; + public SysUserPassword() { + } + + public SysUserPassword(Long userId, String userPassword) { + this.userId = userId; + this.userPassword = userPassword; + } } From 2546395b8d65efc87e1b717c853056a746262215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 16 Jun 2020 15:46:16 +0800 Subject: [PATCH 037/156] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E7=BB=84=E4=BB=B6=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=92=8C=E5=89=8D=E5=90=8E=E7=AB=AF=E8=B0=83=E7=94=A8=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/StationRequestBean.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 7952b14..7117863 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 @@ -142,7 +142,10 @@ public class StationRequestBean implements Serializable { private Integer isOnTimeComplete; @ApiParam("工位剩余时间") - private Integer remainWorkTime; + private Long remainWorkTime; + + @ApiParam("是否操作超时") + private Integer isTimeOut; @ApiParam("特殊展示数据") private Map specialDisplayMap = new HashMap<>(); From 0ea80a0f63ac17e05ceeb1badf93a1f1a09cf2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 16 Jun 2020 17:43:04 +0800 Subject: [PATCH 038/156] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/SysTaskTimeRecordingRepository.java | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java deleted file mode 100644 index 749dd25..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; - -/** - * @Description : 定时任务执行记录 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 12:03:01.409 - * @Modify : - **/ -public interface SysTaskTimeRecordingRepository extends BaseRepository { -} From 99f1ba98b680d833611d3d6f7cf82569c4cba3a7 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 16 Jun 2020 19:08:16 +0800 Subject: [PATCH 039/156] =?UTF-8?q?=E3=80=902077=2006=201.2.3.8=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E7=AD=96=E7=95=A5-4.5=09=E6=96=B0=E5=A2=9E=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E6=8E=A8=E8=8D=90=E7=BB=84=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java | 8 ++--- .../pojo/wms/modelbean/WmsStrategyModel.java | 41 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java index 1220b53..96ed7f1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java @@ -99,26 +99,26 @@ public class WmsTractics extends BaseBean { @ApiParam(value ="1级策略上架") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE") - private String lev1Strategy; + private Integer lev1Strategy; // @Column(name="LEV1_STRATEGY") @Transient @ApiParam(value ="1级策略拣货") @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE") - private String lev1StrategyPicking; + private Integer lev1StrategyPicking; @Column(name="LEV2_STRATEGY") @ApiParam(value ="2级策略") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO") - private String lev2Strategy; + private Integer lev2Strategy; @Column(name="LEV3_STRATEGY") @ApiParam(value ="3级策略") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE") - private String lev3Strategy; + private Integer lev3Strategy; // public String getIev1StrategyPicking (String lev1StrategyPicking) { // return this.lev1Strategy = lev1StrategyPicking; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java new file mode 100644 index 0000000..26f97a1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsTractics; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-15 13:21 + * @Modify: + **/ +@Data +@Api("策略返回model") +public class WmsStrategyModel { + + @ApiParam(value = "物料编号") + private String partNo; + + @ApiParam(value = "数量") + private Double qty; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam("策略对象") + public WmsTractics wmsTractics; + + @ApiParam("List结果集") + public List resultList; + + @ApiParam("List结果集") + public List strategyList; + + @ApiParam("返回错误信息") + public String errorMsg; +} From 67a7904024610b1fe3134429f446ba3ec76f7e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 17 Jun 2020 10:02:02 +0800 Subject: [PATCH 040/156] =?UTF-8?q?=E3=80=90=E6=B3=B0=E5=9B=BD=E6=BC=94?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=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/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 bb6d667..2acb63c 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 @@ -141,6 +141,9 @@ public class StationRequestBean implements Serializable { @ApiParam("特殊展示数据") private Map specialDisplayMap = new HashMap<>(); + @ApiParam("物料名称") + private String partName; + @Override public String toString() { return "StationRequestBean{" + From 212dccad6cb5b6074b54ceb6be5ffe725e18b823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 17 Jun 2020 11:50:44 +0800 Subject: [PATCH 041/156] =?UTF-8?q?=E5=90=8C=E5=89=8D=E7=AB=AF=E8=81=94?= =?UTF-8?q?=E8=B0=83=E5=80=92=E8=AE=A1=E6=97=B6=E7=BB=84=E4=BB=B6=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/StationRequestBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7117863..cb0303b 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 @@ -139,13 +139,13 @@ public class StationRequestBean implements Serializable { private Boolean stepDialogStatus = false; @ApiParam("是否按时完成") - private Integer isOnTimeComplete; + private Integer isOnTimeComplete = 1; @ApiParam("工位剩余时间") private Long remainWorkTime; @ApiParam("是否操作超时") - private Integer isTimeOut; + private Integer isTimeOut = 2; @ApiParam("特殊展示数据") private Map specialDisplayMap = new HashMap<>(); From fb65b042f07d369c6f3ec60e6818bbf49edd5573 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 17 Jun 2020 14:10:47 +0800 Subject: [PATCH 042/156] =?UTF-8?q?getByProperty=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 3 +++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 31 +++++++++++----------- 2 files changed, 19 insertions(+), 15 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 9d06adc..e2e0255 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 @@ -243,6 +243,9 @@ public interface BaseRepository extends JpaReposito T getByProperty(String[] propertyNames, Object[] values); + @Deprecated + T getByPropertyPager(String[] propertyNames, Object[] values,Pager pager); + int listCount(); int findByPropertyCount(String propertyName, Object value); 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 2e3d875..d93bac0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -46,6 +46,8 @@ public class BaseRepositoryImpl extends SimpleJpaRep private Class persistentClass; private SnowflakeIdMaker snowflakeIdMaker; + /* 默认查询数据条数 */ + private static final Pager DEFAULT_PAGER = new Pager(0,10); public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); @@ -506,10 +508,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { - try { - List list = findByHqlWhere(packBean); - return list.size() != 0 ? list.get(0) : null; + List list = findByHqlWherePage(packBean,DEFAULT_PAGER); + return list != null && list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在，DdlPackBean：{}",packBean); return null; @@ -521,21 +522,18 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(String propertyName, Object value) { - String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName; - try { - List list = entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); - return list.size() != 0 ? list.get(0) : null; - }catch(NoResultException ne){ - LOGGER.error("数据不存在，prop：{},value：{}",propertyName,value,ne); - return null; - }catch(NonUniqueResultException ex){ - LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}",propertyName,value,ex); - throw new RuntimeException("存在多条记录：" + ex.getMessage()); - } + return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER); } @Override public T getByProperty(String[] propertyNames, Object[] values) { + return getByPropertyPager(propertyNames, values, DEFAULT_PAGER); + } + + @Override + public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) { + pager = pager == null ? DEFAULT_PAGER: pager; + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -561,7 +559,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep } try{ - List list = queryObject.getResultList(); + List list = queryObject + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); return list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在",ne); From 0388c36c411ec438f4590f8a60c19646d7f67d69 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 17 Jun 2020 14:51:48 +0800 Subject: [PATCH 043/156] mes --- .../estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 20 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 8 ++++++++ 3 files changed, 32 insertions(+), 2 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 7fc29e9..cc97315 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 @@ -3248,7 +3248,8 @@ public class MesEnumUtil { BH_ORDER(40, "B&H工单"), JIT_ORDER(50, "JIT工单"), STOCK_ORDER(60, "库存工单"), - REPAIR(70, "返修插单"); + REPAIR(70, "返修插单"), + FICTIVE(80, "虚拟工单"); private int value; private String description; @@ -4897,7 +4898,8 @@ public class MesEnumUtil { public enum PART_TRAIT { NORMAL(10, "正常件"), FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"), - FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"); + FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"), + FICTIVE(40, "虚拟件"); private int value; private String description; 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 b65531b..e2b4a01 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 @@ -96,6 +96,26 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("物料特性") private Integer partTrait; + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "SHELVES_AMOUNT") + @ApiParam("挂架数") + private Integer shelvesAmount; + + @Column(name = "QUANTITY_PER_RACK") + @ApiParam("挂架可放零件数") + private Integer quantityPerRack; + + @Column(name = "PAINT_TANK_CODE") + @ApiParam("供漆罐代码") + private String paintTankCode; + + @Column(name = "PRE_PART_NO") + @ApiParam("打磨件物料号") + private String prePartNo; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; 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 f244016..d09d54d 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 @@ -173,6 +173,14 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("预留字段5") private String reserved5; + @Column(name = "RESERVED6") + @ApiParam("预留字段6") + private String reserved6; + + @Column(name = "RESERVED7") + @ApiParam("预留字段7") + private String reserved7; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") From 25b2109144490dcd8cc198567dbee8250445cc0c Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 17 Jun 2020 15:17:30 +0800 Subject: [PATCH 044/156] =?UTF-8?q?getByProperty=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=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/common/Pager.java | 42 ++++++++++++++++++++++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 10 +++--- 2 files changed, 46 insertions(+), 6 deletions(-) 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 b961226..89e11c0 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 @@ -31,6 +31,24 @@ public class Pager { @ApiParam("翻页操作") private String pageMethod; + private static final Pager min; + private static final Pager max; + private static final Pager defaultPager; + + static { + min = new Pager(); + min.setCurrentPage(1); + min.setPageSize(10); + + max = new Pager(); + max.setCurrentPage(1); + max.setPageSize(65535); + + defaultPager = new Pager(); + defaultPager.setCurrentPage(1); + defaultPager.setPageSize(100); + } + public Pager() { } @@ -231,6 +249,30 @@ public class Pager { return currentPage > 1; } + /** + * 获取默认最小分页数量 + * @return + */ + public static Pager defaultMinPager(){ + return min; + } + + /** + * 默认最大分页数量 + * @return + */ + public static Pager defaultMaxPager(){ + return max; + } + + /** + * 默认分页数量 + * @return + */ + public static Pager defaultPager(){ + return defaultPager; + } + @Override public String toString() { return "Pager{" + 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 d93bac0..034855d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -46,8 +46,6 @@ public class BaseRepositoryImpl extends SimpleJpaRep private Class persistentClass; private SnowflakeIdMaker snowflakeIdMaker; - /* 默认查询数据条数 */ - private static final Pager DEFAULT_PAGER = new Pager(0,10); public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); @@ -509,7 +507,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { try { - List list = findByHqlWherePage(packBean,DEFAULT_PAGER); + List list = findByHqlWherePage(packBean,Pager.defaultMinPager()); return list != null && list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在，DdlPackBean：{}",packBean); @@ -522,17 +520,17 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(String propertyName, Object value) { - return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER); + return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, Pager.defaultMinPager()); } @Override public T getByProperty(String[] propertyNames, Object[] values) { - return getByPropertyPager(propertyNames, values, DEFAULT_PAGER); + return getByPropertyPager(propertyNames, values, Pager.defaultMinPager()); } @Override public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) { - pager = pager == null ? DEFAULT_PAGER: pager; + pager = pager == null ? Pager.defaultMinPager(): pager; if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); From d5051cabdbafe3384bd1fa6280e93c40ebe4beff Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 17 Jun 2020 15:19:20 +0800 Subject: [PATCH 045/156] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=BB?= =?UTF-8?q?=E5=86=99=E5=88=86=E7=A6=BB=20=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= 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 | 3 +++ 1 file changed, 3 insertions(+) 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 89e11c0..0a90b00 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 @@ -31,8 +31,11 @@ public class Pager { @ApiParam("翻页操作") private String pageMethod; + /* 默认最小数量分页 */ private static final Pager min; + /* 默认最大数量分页 */ private static final Pager max; + /* 默认数量分页 */ private static final Pager defaultPager; static { From 91f4edc83f686c2e547eba99e05582af4ed0d44d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 17 Jun 2020 15:38:55 +0800 Subject: [PATCH 046/156] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=BB?= =?UTF-8?q?=E5=86=99=E5=88=86=E7=A6=BB=20=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 034855d..3d220a2 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 @@ -390,7 +390,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List listPager(Pager pager) { - if (pager.getTotalRows() > 0) { + if (pager != null) { return entityManager.createQuery("from " + persistentClass.getName()) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) @@ -647,7 +647,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff; return entityManager.createQuery(queryString) .setParameter(propertyName, value) @@ -659,7 +659,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -790,7 +790,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) { - if(pager.getTotalRows() > 0){ + if(pager != null){ if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -825,7 +825,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Deprecated @Override public List findByHqlWherePage(String hqlWhere, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -844,7 +844,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWherePage(DdlPackBean packBean, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getPackedHql()); @@ -922,7 +922,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPage(String hqlWhere, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -941,7 +941,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPage(DdlPackBean packBean, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getPackedHql()); @@ -959,7 +959,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) { - if(pager.getTotalRows() > 0) { + if(pager != null) { Query queryObject = entityManager.createQuery(hql); for (int i = 0; i < paramName.length; i++) { if (paramValue[i] != null) { @@ -987,7 +987,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlPage(String sql, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { return entityManager.createNativeQuery(sql) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) @@ -999,7 +999,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlPage(String sql, Class entity, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ return entityManager.createNativeQuery(sql,entity) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) @@ -1112,7 +1112,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { StringBuffer queryString = new StringBuffer(); queryString.append(hql + " as model where 1=1 "); @@ -1151,7 +1151,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPageObjects(String hql, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); }else{ return new ArrayList(); @@ -1160,7 +1160,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) { - if(pager.getTotalRows() > 0) { + if(pager != null) { Query queryObject = entityManager.createQuery(hql); for (int i = 0; i < paramName.length; i++) { if (paramValue[i] != null) { @@ -1181,7 +1181,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlObjListByPager(String sql, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ return entityManager.createNativeQuery(sql) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) From a59fa1bf9b2ecb56de5cc43eab7a04c88e4b3a94 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 17 Jun 2020 20:17:33 +0800 Subject: [PATCH 047/156] =?UTF-8?q?=E3=80=902078=2006=201.2.3.9=E6=8B=A3?= =?UTF-8?q?=E8=B4=A7=E7=AD=96=E7=95=A5-=E6=96=B0=E5=A2=9E=E6=8B=A3?= =?UTF-8?q?=E8=B4=A7=E6=8E=A8=E8=8D=90=E7=BB=84=E4=BB=B7=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/modelbean/WmsStrategyModel.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/WmsStrategyModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java index 26f97a1..6e8535f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java @@ -33,7 +33,7 @@ public class WmsStrategyModel { @ApiParam("List结果集") public List resultList; - @ApiParam("List结果集") + @ApiParam("List策略项名集") public List strategyList; @ApiParam("返回错误信息") From c066820b185d1cca2eadcfe8afc3d991d2987808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 18 Jun 2020 11:31:13 +0800 Subject: [PATCH 048/156] =?UTF-8?q?Fix=20Bug=20#9001=20=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E4=BB=B6=E7=BB=91=E5=AE=9A=E5=BC=82=E5=B8=B8=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/MesProdBindRecord.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/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index b3e82e2..66ba978 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 @@ -112,7 +112,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("产品条码零件名称") private String partName; - @Transient + @Column(name = "ITEM_PART_NAME") @ApiParam("原材料零件名称") private String itemPartName; From fdd5516a0f05fc18c638b40aea62021a4797ba40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 18 Jun 2020 18:29:28 +0800 Subject: [PATCH 049/156] =?UTF-8?q?FTP=E9=80=82=E9=85=8D=E5=99=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20=E8=A1=A8=E5=8D=95=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20UA=20=E9=80=82=E9=85=8D=20LONG=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 82 ++++++++++++++++++++++ .../base/enumutil/BlockSoftSwitchEnumUtil.java | 5 +- .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 4 -- .../pojo/form/bean/BfMethodDetailProperty.java | 6 ++ .../pojo/form/bean/BfMethodDetailPropertyRef.java | 64 +++++++++++++++++ .../BfElementConstraintPropertyRepository.java | 14 ---- .../BfMethodDetailPropertyRefRepository.java | 14 ++++ .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 14 +++- .../i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 34 +++++++-- 9 files changed, 209 insertions(+), 28 deletions(-) create mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java delete mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java create mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.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 241e028..14ef7d8 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 @@ -1069,6 +1069,88 @@ public class BlockFormEnumUtil { /** + * 元素编辑信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROPERTY_EDIT_STATUS { + ON(1, "ON", "开启"), + OFF(2, "OFF", "关闭"), + READONLY(3, "READONLY", "只读"); + + private int value; + private String code; + private String description; + + private PROPERTY_EDIT_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(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) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static PROPERTY_EDIT_STATUS 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 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; + } + } + + /** * 属性字段排序规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 0b8c98b..dd4bd75 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 @@ -689,8 +689,9 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FTP_ENCODE { - CONN_SUCCESS(10, "UTF-8", "UTF-8"), - CONN_FAILURE(20, "GBK", "GBK"); + UTF8(10, "UTF-8", "UTF-8"), + GBK(20, "GBK", "GBK"), + ISO88591(30, "ISO-8859-1", "ISO-8859-1"); private int value; private String encode; 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 7417439..29d0044 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 @@ -76,10 +76,6 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否编辑") private Integer isObjectEdit; - @Column(name = "IS_READ_ONLY_SHOW") - @ApiParam(value = "是否只读显示") - private Integer isReadOnlyShow; - @Column(name = "IS_OBJECT_DEL") @ApiParam(value = "是否删除") private Integer isObjectDel; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index 9f2b83c..8085d44 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -108,4 +110,8 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD") @ApiParam(value ="关联对象元素属性Code") private String secElementPropertyCodeRdd; + + @Transient + @ApiParam(value ="表单功能明细关联属性") + private List refList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java new file mode 100644 index 0000000..0a5e8be --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.form.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.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 : yunhao + * @CreateDate : 2019-03-21 21:03 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BF_METHOD_DETAIL_PROPERTY") +@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") +public class BfMethodDetailPropertyRef extends BaseBean { + + private static final long serialVersionUID = -7541677357317732343L; + @Column(name="DETAIL_PROPERTY_ID") + @ApiParam(value ="功能明细关联属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long detailPropertyId; + + @Column(name="PRI_ELEMENT_PROPERTY_ID") + @ApiParam(value ="主对象元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long priElementPropertyId; + + @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD") + @ApiParam(value ="主对象元素属性名称") + private String priElementPropertyNameRdd; + + @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD") + @ApiParam(value ="主对象元素属性code") + private String priElementPropertyCodeRdd; + + @Column(name="SEC_ELEMENT_PROPERTY_ID") + @ApiParam(value ="关联对象元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long secElementPropertyId; + + @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD") + @ApiParam(value ="关联对象元素属性名称") + private String secElementPropertyNameRdd; + + @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD") + @ApiParam(value ="关联对象元素属性Code") + private String secElementPropertyCodeRdd; +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java deleted file mode 100644 index b3de0fb..0000000 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -//package cn.estsh.i3plus.pojo.form.repository; -// -//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -//import cn.estsh.i3plus.pojo.form.bean.BfElementConstraintProperty; -// -///** -// * @Description : 元素约束属性 -// * @Reference : -// * @Author : yunhao -// * @CreateDate : 2019-03-21 20:27 -// * @Modify: -// **/ -//public interface BfElementConstraintPropertyRepository extends BaseRepository { -//} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java new file mode 100644 index 0000000..122ba80 --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.form.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.form.bean.BfMethodDetailPropertyRef; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-06-16 16:56 + * @Modify: + **/ +public interface BfMethodDetailPropertyRefRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index c220ed2..d913912 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -394,7 +394,6 @@ public final class FormHqlPack { return ddlPackBean; } - /** * 数据对象查询条件拼接 * @param bfCascade @@ -409,4 +408,17 @@ public final class FormHqlPack { return ddlPackBean; } + /** + * 数据对象查询条件拼接 + * @param bfMethodDetailPropertyRef + * @return + */ + public static DdlPackBean packHqlBfMethodDetailPropertyRef(BfMethodDetailPropertyRef bfMethodDetailPropertyRef){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetailPropertyRef); + + DdlPreparedPack.getNumEqualPack(bfMethodDetailPropertyRef.getDetailPropertyId(), "detailPropertyId", ddlPackBean); + + return ddlPackBean; + } + } 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 ab14d8d..aa9bd67 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 @@ -1,5 +1,6 @@ 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.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -10,6 +11,7 @@ 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; @@ -38,19 +40,37 @@ public class BsSuitCaseFTP extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseId; - @Column(name = "file_Name") + @Column(name = "File_Name") @ApiParam(value = "文件名") private String fileName; + @Column(name = "FILE_ENCODE") + @ApiParam(value = "文件编码") + private String fileEncode; + + @Column(name = "IS_TRANSFORM_MESSAGE") + @ApiParam(value = "是否转换报文") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isTransformMessage; + + public int getIsTransformMessageVal() { + return isTransformMessage == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isTransformMessage; + } + + public boolean isTransformMessage() { + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsTransformMessageVal()); + } + + @Column(name = "ENCODE") - @ApiParam(value = "编码") + @ApiParam(value = "ftp编码") private Integer encode; @Column(name = "IS_READ_AND_EMPTY") @ApiParam(value = "读取并清空") private Integer isReadAndEmpty; - public boolean isReadAndEmpty(){ + public boolean isReadAndEmpty() { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndEmpty); } @@ -58,7 +78,7 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "读取并删除") private Integer isReadAndDelete; - public boolean isReadAndDelete(){ + public boolean isReadAndDelete() { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndDelete); } @@ -66,7 +86,7 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "是否需要遍历") private Integer isNeedTraversal; - public boolean isNeedTraversal(){ + public boolean isNeedTraversal() { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isNeedTraversal); } @@ -74,12 +94,12 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "是否增量读取") private Integer isIncrementalRead; - public boolean isIncrementalRead(){ + public boolean isIncrementalRead() { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead); } @Transient - @ApiParam(value = "是否增量读取") + @ApiParam(value = "临时适配路径") private String tempSuitFilePath; @Transient From 64b00d6717bb243efca5268f1fed87cca8fa930b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 18 Jun 2020 22:57:00 +0800 Subject: [PATCH 050/156] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=A7=E5=93=81=E6=9D=A1=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/IfPackageDetail.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 2708fcf..e02f6cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -40,9 +40,13 @@ public class IfPackageDetail extends BaseBean implements Serializable { private String partName; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PACKAGE_NO") @ApiParam("包装条码") private String packageNo; From 0c0d43cd96f499f9d9fe28323dce4781c471f088 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 19 Jun 2020 11:37:16 +0800 Subject: [PATCH 051/156] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=EF=BC=9A=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 1 + 2 files changed, 5 insertions(+), 2 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 f75521d..904d9b3 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 @@ -726,7 +726,8 @@ public class WmsEnumUtil { TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), LOADING_ORDER(530, "LOADING_ORDER", "装车单"), - SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"); + SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"), + FORK_INSTORE(550, "FORK_INSTORE", "采购入库"); private int value; private String code; private String description; @@ -4133,7 +4134,8 @@ public class WmsEnumUtil { MENU_OPT(30, "MENU_OPT", "手工操作"), AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"), CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"), - UPDATE_TASK(60, "UPDATE_TASK", "复用任务"); + UPDATE_TASK(60, "UPDATE_TASK", "复用任务"), + AUTO_INSTORE_DOCMOVE(70, "AUTO_INSTORE", "自动入库移库单"); 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/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index e75def7..640dca1 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 @@ -109,6 +109,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @Column(name = "STATUS") @ApiParam(value = "库位状态", example = "-1") + @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_STATUS.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "LOCATE_STATUS") private Integer status; From edae2b00f68bf7cfb417e6719849735c364ac786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 19 Jun 2020 19:31:54 +0800 Subject: [PATCH 052/156] =?UTF-8?q?Fix=20Bug=20#8996,#9033=201.PCN?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=96=B9=E5=BC=8F=E5=8F=8A=E5=90=8C=E6=AD=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA-0617=202.?= =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E4=B8=8A=E7=BA=BF=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=B0=E9=87=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index d97a57a..6913759 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -30,4 +30,6 @@ public class CellFeedModel { private String scanQty; + private String LineRemainQty; + } From 3dda15e00aa6e10ca774f2327229166c4b5bdfe3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 19 Jun 2020 20:18:20 +0800 Subject: [PATCH 053/156] Finish Task #2153 Cost:24h --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 +++++++++++++++++++ .../i3plus/pojo/mes/bean/MesDefectRecord.java | 9 ++-- .../i3plus/pojo/mes/bean/MesProduceCategory.java | 6 ++- .../estsh/i3plus/pojo/mes/bean/MesStationBom.java | 8 ++++ .../pojo/mes/bean/template/MesWorkCellDefect.java | 53 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StepPrintSnModel.java | 7 +++ .../repository/MesWorkCellDefectRepository.java | 15 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 +++++++++- 8 files changed, 160 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.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 c9c15e5..604aa39 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 @@ -4164,4 +4164,50 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 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; + } + } } 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 a3a2cdb..793563e 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 @@ -81,14 +81,13 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("备注") private String memo; -// @Column(name = "WORK_ORDER_NO") -// @ApiParam("工单号") -// private String workOrderNo; - - @Transient private List mesDefectList; + @Transient + @ApiParam("后移数量") + private Integer backwardNum; + 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/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java index fdf53da..853652c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_CATEGORY") -@Api("系统业务动作") +@Api("MES_产品位置") public class MesProduceCategory extends BaseBean implements Serializable { private static final long serialVersionUID = -992595557921651448L; @@ -37,4 +37,8 @@ public class MesProduceCategory extends BaseBean implements Serializable { @Column(name = "PRODUCE_CTGY_NAME") @ApiParam("产品类型名称") private String produceCategoryName; + + @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/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index d2e6a0b..a2cd693 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 @@ -130,6 +130,14 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("主任务编号") private String orderNo; + @Transient + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Transient + @ApiParam("产品类型名称") + private String produceCategoryName; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java new file mode 100644 index 0000000..025ae54 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean.template; + +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/6/17 8:39 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_DEFECT") +@Api("MES_工位缺陷") +public class MesWorkCellDefect extends BaseBean implements Serializable { + + private static final long serialVersionUID = -528051790747923632L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "PART_ASSEMBLE") + @ApiParam("物料集") + private String partAssemble; + + @Transient + @ApiParam("缺陷名称") + private String defectCodeName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 5f95f8f..2ac3a02 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -101,4 +101,11 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("包装数量") private Integer pgCodeNum; + @ApiParam("批次") + private String lotNo; + @ApiParam("备注") + private String memo; + @ApiParam("产品配置名称") + private String prodCfgCodeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java new file mode 100644 index 0000000..43b09f2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.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.template.MesWorkCellDefect; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/6/17 8:46 下午 + * @Modify: + */ +@Repository +public interface MesWorkCellDefectRepository 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 d325b7d..18b47c8 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,6 +9,7 @@ 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.template.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import org.springframework.util.StringUtils; @@ -1524,7 +1525,6 @@ public class MesHqlPack { } /** - * <<<<<<< Updated upstream * MES 缺陷查询条件封装 * * @param mesDefect @@ -3001,4 +3001,25 @@ public class MesHqlPack { } return packBean; } + + /** + * MES 工位缺陷查询条件封装 + * + * @param workCellDefect + * @param organizeCode + * @return + */ + public static DdlPackBean getMesWorkCellDefect(MesWorkCellDefect workCellDefect, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(workCellDefect, organizeCode); + if (!StringUtils.isEmpty(workCellDefect.getDefectCode())) { + DdlPreparedPack.getStringLikerPack(workCellDefect.getDefectCode(), "defectCode", packBean); + } + if (!StringUtils.isEmpty(workCellDefect.getWorkCellCode())) { + DdlPreparedPack.getStringLikerPack(workCellDefect.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(workCellDefect.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(workCellDefect.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } } From 2ef42fdadd4916128df8537e1ae19ce8ad39a1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 19 Jun 2020 20:53:48 +0800 Subject: [PATCH 054/156] =?UTF-8?q?Finish=20Task:2160,2175.=E5=8C=97?= =?UTF-8?q?=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=80=E5=8F=91=E3=80=82=20Finish=20Task=20#2160,21?= =?UTF-8?q?75=20Cost:10h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 43 ++++++++++- .../estsh/i3plus/pojo/mes/bean/MesPartFormula.java | 8 ++ .../i3plus/pojo/mes/bean/MesPartProdCfgType.java | 37 +++++++++ .../i3plus/pojo/mes/bean/MesScatterBomCfg.java | 88 ++++++++++++++++++++++ .../repository/MesPartProdCfgTypeRepository.java | 15 ++++ .../mes/repository/MesScatterBomCfgRepository.java | 15 ++++ .../repository/MesWorkCellDefectsRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 63 ++++++++++++++++ 8 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.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 cc97315..2e1287d 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 @@ -1905,7 +1905,9 @@ public class MesEnumUtil { MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"), MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"), - MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"); + MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"), + NEW_SCATTER_BOM(460, "ScatterBomCfgExcelService", "新散件BOM导入"), + ENCODE_RULE_MAP(470, "MesEncodeRuleMapExcelService", "编码规则映射导入"); private int value; private String service; @@ -6329,4 +6331,43 @@ public class MesEnumUtil { return tmp; } } + + + /** + * 选项代码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPTION_CODE { + EXISTENCE("+", "存在"), + NON_EXISTENCE("-", "不存在"), + BRACKET_OPERATION("()", "括号运算"), + AND("&", " 与"), + OR("|", "或"); + + private String value; + private String description; + + OPTION_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 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/bean/MesPartFormula.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java index 63b5871..87bcffe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java @@ -38,6 +38,14 @@ public class MesPartFormula extends BaseBean implements Serializable { @ApiParam("配方内容") private String formulaContent; + @Column(name = "FORMULA_DESC") + @ApiParam("配方描述") + private String formulaDesc; + + @Column(name = "QTY") + @ApiParam("配方零件总数") + private Integer qty; + @Column(name = "FORMULA_TYPE") @ApiParam("配方类型") private Integer formulaType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java new file mode 100644 index 0000000..c5c1b75 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java @@ -0,0 +1,37 @@ +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; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "MES_PART_PROD_CFG_TYPE") +@EqualsAndHashCode(callSuper = true) +@Api("MES_物料项目关系") +public class MesPartProdCfgType extends BaseBean implements Serializable { + private static final long serialVersionUID = -640972198237355570L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java new file mode 100644 index 0000000..7642f27 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java @@ -0,0 +1,88 @@ +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 adair.song + * @date 2020/06/17 13:12 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "MES_SCATTER_BOM_CFG") +@EqualsAndHashCode(callSuper = true) +@Api("MES_散件BOM配置") +public class MesScatterBomCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 521506217898252289L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam("客户零件号") + private String customerPartNo; + + @Column(name = "PART_LOCATION1") + @ApiParam("产品位置1") + private String partLocation1; + + @Column(name = "PART_LOCATION2") + @ApiParam("产品位置2") + private String partLocation2; + + @Column(name = "PART_LOCATION3") + @ApiParam("产品位置3") + private String partLocation3; + + @Column(name = "PART_LOCATION4") + @ApiParam("产品位置4") + private String partLocation4; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "CATEGORY_CODE2") + @ApiParam("类型2") + private String categoryCode2; + + @Column(name = "CATEGORY_CODE3") + @ApiParam("类型3") + private String categoryCode3; + + @Column(name = "IS_BIND_KEY") + @ApiParam("是否关键件") + private Integer isBindKey = 1; + + @Column(name = "CHECK_GROUP") + @ApiParam("校验分组号") + private String checkGroup; + + @Column(name = "OPTION_CODE") + @ApiParam("选项代码") + private String optionCode; + + @Column(name = "RECIPE_ITEM") + @ApiParam("配方项") + private String recipeItem; + + @Column(name = "RECIPE_SEQ") + @ApiParam("配方序号") + private String recipeSeq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.java new file mode 100644 index 0000000..9d81a01 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.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.MesPartProdCfgType; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate: 2020\06\17 14:01 + */ +@Repository +public interface MesPartProdCfgTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.java new file mode 100644 index 0000000..2ffeac0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.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.MesScatterBomCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : adair.song + * @CreateDate: 2020\06\17 14:01 + */ +@Repository +public interface MesScatterBomCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java new file mode 100644 index 0000000..be056c0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.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.template.MesWorkCellDefect; +import org.springframework.stereotype.Repository; +/** + * @Description: + * @Author: jokelin + * @Date: 2020/6/17 8:46 下午 + * @Modify: + */ +@Repository +public interface MesWorkCellDefectsRepository 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 18b47c8..4437049 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 @@ -3022,4 +3022,67 @@ public class MesHqlPack { } return packBean; } + + /** + * 散件BOM + * + * @param scatterBomCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesScatterBomCfg(MesScatterBomCfg scatterBomCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(scatterBomCfg, organizeCode); + if (!StringUtils.isEmpty(scatterBomCfg.getPartNo())) { + DdlPreparedPack.getStringLikerPack(scatterBomCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(scatterBomCfg.getCustomerPartNo())) { + DdlPreparedPack.getStringLikerPack(scatterBomCfg.getCustomerPartNo(), "customerPartNo", packBean); + } + if (!StringUtils.isEmpty(scatterBomCfg.getWorkCellCode())) { + DdlPreparedPack.getStringLikerPack(scatterBomCfg.getWorkCellCode(), "workCellCode", packBean); + } + return packBean; + } + + /** + * 物料项目关系 + * + * @param partProdCfgType + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPartProdCfgType(MesPartProdCfgType partProdCfgType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partProdCfgType, organizeCode); + if (!StringUtils.isEmpty(partProdCfgType.getPartNo())) { + DdlPreparedPack.getStringLikerPack(partProdCfgType.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(partProdCfgType.getCustCode())) { + DdlPreparedPack.getStringLikerPack(partProdCfgType.getCustCode(), "custCode", packBean); + } + if (!StringUtils.isEmpty(partProdCfgType.getProdCfgTypeCode())) { + DdlPreparedPack.getStringLikerPack(partProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + return packBean; + } + + /** + * 编码规则映射表 + * + * @param encodeRuleMap + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEncodeRuleMap(MesEncodeRuleMap encodeRuleMap, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(encodeRuleMap, organizeCode); + if (!StringUtils.isEmpty(encodeRuleMap.getTypeCode())) { + DdlPreparedPack.getStringLikerPack(encodeRuleMap.getTypeCode(), "typeCode", packBean); + } + if (!StringUtils.isEmpty(encodeRuleMap.getTypeName())) { + DdlPreparedPack.getStringLikerPack(encodeRuleMap.getTypeName(), "typeName", packBean); + } + if (!StringUtils.isEmpty(encodeRuleMap.getBusinessCode())) { + DdlPreparedPack.getStringLikerPack(encodeRuleMap.getBusinessCode(), "businessCode", packBean); + } + return packBean; + } } From 77e6ee3b985201fce912e30a2a2a997e608ec045 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 20 Jun 2020 13:08:40 +0800 Subject: [PATCH 055/156] =?UTF-8?q?=E3=80=902180=2006=201.2.3.8=E6=B3=B0?= =?UTF-8?q?=E5=9B=BDWMS=EF=BC=8D=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=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/enumutil/WmsEnumUtil.java | 11 +++++++++++ 1 file changed, 11 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 84f4742..5892134 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 @@ -3361,6 +3361,7 @@ public class WmsEnumUtil { public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), + TGMES("TGMES", "泰国MES"), AMP("AMP", "AMP系统"), DR("DR", "直送拉动"); @@ -3379,6 +3380,16 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + public static String descriptionOfValue(String value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].value; + } + } + return tmp; + } } public static Map getEnumByName(String enumName) throws Exception { From 68c3f087dc676603bbed48d791f38e2ab19ccfa2 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 20 Jun 2020 13:09:29 +0800 Subject: [PATCH 056/156] =?UTF-8?q?=E3=80=902180=2006=201.2.3.8=E6=B3=B0?= =?UTF-8?q?=E5=9B=BDWMS=EF=BC=8D=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=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/WmsDocFgDetail.java | 8 ++++++++ 1 file changed, 8 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 08e50e1..47406c1 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 @@ -153,4 +153,12 @@ public class WmsDocFgDetail extends BaseBean { @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") private String bomVersion; + + @Column(name = "FIX_LOT_NO", nullable = false) + @ApiParam(value = "特殊批次") + private String fixLotNo = ""; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + private String packageNo; } From 87dc9ab9663c006f79d36243adfd150f7959f469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 20 Jun 2020 15:43:35 +0800 Subject: [PATCH 057/156] =?UTF-8?q?=E4=B8=8E=E5=89=8D=E7=AB=AF=E8=81=94?= =?UTF-8?q?=E8=B0=83=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/base/enumutil/MesEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 2e1287d..fbf2d06 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 @@ -1906,8 +1906,9 @@ public class MesEnumUtil { MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"), MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"), - NEW_SCATTER_BOM(460, "ScatterBomCfgExcelService", "新散件BOM导入"), - ENCODE_RULE_MAP(470, "MesEncodeRuleMapExcelService", "编码规则映射导入"); + NEW_SCATTER_BOM(460, "scatterBomCfgExcelService", "新散件BOM导入"), + ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"), + SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"); private int value; private String service; From 8cf6e99cf6be5aae32feb9026075cd05a6d1ecaa Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 20 Jun 2020 15:47:23 +0800 Subject: [PATCH 058/156] mes --- .../i3plus/pojo/mes/bean/MesExtendObjectCfg.java | 64 ++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 23 ++- .../i3plus/pojo/mes/model/ExcelDataParamModel.java | 181 --------------------- .../repository/MesExtendObjectCfgRepository.java | 14 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 +++ 5 files changed, 112 insertions(+), 193 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java new file mode 100644 index 0000000..cc8aac2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; +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: wangjie + * @CreateDate: 2019\11\5 10:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EXTEND_OBJECT_CFG") +@Api("扩展对象结构") +public class MesExtendObjectCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6773040095905972250L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("扩展字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("扩展字段名称") + private String fieldName; + + @Column(name = "FIELD_TYPE") + @ApiParam("扩展字段类型") + @AnnoOutputColumn(refClass = MesEnumUtil.DATA_FORMAT.class, refForeignKey = "value", value = "description") + private Integer fieldType; + + @Column(name = "FIELD_LENGTH") + @ApiParam("扩展字段类型") + private String fieldLength; + + @Column(name = "DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + + @Column(name = "FIELD_DESC") + @ApiParam("扩展字段描述") + private String fieldDesc; +} 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 d09d54d..e46dec6 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * @Description: @@ -153,6 +154,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; + @Lob + @Column(name = "EXTEND") + @ApiParam("扩展数据") + private String extend; + @Column(name = "RESERVED1") @ApiParam("预留字段1") private String reserved1; @@ -169,18 +175,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("预留字段4") private String reserved4; - @Column(name = "RESERVED5") - @ApiParam("预留字段5") - private String reserved5; - - @Column(name = "RESERVED6") - @ApiParam("预留字段6") - private String reserved6; - - @Column(name = "RESERVED7") - @ApiParam("预留字段7") - private String reserved7; - @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") @@ -272,6 +266,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "完成按钮编号") public String comButtonCode; + @Transient + @ApiParam(value = "扩展数据MAP") + public Map extendMap; + + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java deleted file mode 100644 index f9eeea2..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java +++ /dev/null @@ -1,181 +0,0 @@ -//package cn.estsh.i3plus.pojo.mes.model; -// -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiParam; -//import lombok.AllArgsConstructor; -//import lombok.Data; -//import lombok.NoArgsConstructor; -//import org.apache.poi.ss.usermodel.CellStyle; -//import org.springframework.util.StringUtils; -// -//import java.io.Serializable; -//import java.math.BigDecimal; -// -///** -// * @Author: wangjie -// * @CreateDate: 2019/8/21 9:19 AM -// * @Description: -// **/ -//@Data -//@NoArgsConstructor -//@AllArgsConstructor -//@Api("EXCEL参数model") -//public class ExcelDataParamModel implements Serializable { -// -// public ExcelDataParamModel(Class clazz){ -// this.clazz = clazz; -// } -// -// @ApiParam("获取相对应的类，用来映射数据,如果不设置此值，那么整个数据将会用String[]作为数据，不再通过映射拿取数据") -// private Class clazz; -// -// @ApiParam("对应类的映射字段名，String类型") -// private String[] strField; -// -// @ApiParam("对应类的标题，需要一一对应") -// private String[] titleStr; -// -// @ApiParam("大标题") -// private String title; -// -// @ApiParam("文件名，如果传入的ExcelDataParamModel是一个List的时候，以sheetNo = 1为文件名，如果sheetNo为空，则默认随机") -// private String fileName; -// -// @ApiParam("后缀") -// private String sufix; -// -// @ApiParam("大标题样式") -// private CellStyle bigTitleCellStyle; -// -// @ApiParam("标题样式") -// private CellStyle titleCellStyle; -// -// @ApiParam("数据样式") -// private CellStyle cellStyle; -// -// @ApiParam("sheet名") -// private String sheetName; -// -// @ApiParam("每个格子的宽度") -// private BigDecimal[] cellWidth; -// -// @ApiParam("如果传入的ExcelDataParamModel是List的时候，默认以sheetNo排序") -// private Integer sheetNo; -// -// @ApiParam("导出数据转换器") -// private QueryDataInterface queryDataInterface; -// -// public Class getClazz() { -// return clazz; -// } -// -// public String[] getStrField() { -// return strField; -// } -// -// public String[] getTitleStr() { -// return titleStr; -// } -// -// public String getTitle() { -// if(StringUtils.isEmpty(this.title)){ -// return "无效的标题"; -// }else{ -// return title; -// } -// } -// -// public String getFileName() { -// if(StringUtils.isEmpty(this.fileName)){ -// return "未命名"; -// }else{ -// return this.fileName; -// } -// } -// -// public CellStyle getBigTitleCellStyle() { -// return bigTitleCellStyle; -// } -// -// public CellStyle getTitleCellStyle() { -// return titleCellStyle; -// } -// -// public CellStyle getCellStyle() { -// return cellStyle; -// } -// -// public String getSheetName() { -// return sheetName; -// } -// -// public Integer getSheetNo() { -// return sheetNo; -// } -// -// public BigDecimal[] getCellWidth() { -// return cellWidth; -// } -// -// public String getSufix() { -// return sufix; -// } -// -// public QueryDataInterface getQueryDataInterface() { -// return queryDataInterface; -// } -// -// public void setClazz(Class clazz) { -// this.clazz = clazz; -// } -// -// public void setStrField(String[] strField) { -// this.strField = strField; -// } -// -// public void setTitleStr(String[] titleStr) { -// this.titleStr = titleStr; -// } -// -// public void setTitle(String title) { -// this.title = title; -// } -// -// public void setFileName(String fileName) { -// this.fileName = fileName; -// } -// -// public void setSufix(String sufix) { -// this.sufix = sufix; -// } -// -// public void setBigTitleCellStyle(CellStyle bigTitleCellStyle) { -// this.bigTitleCellStyle = bigTitleCellStyle; -// } -// -// public void setTitleCellStyle(CellStyle titleCellStyle) { -// this.titleCellStyle = titleCellStyle; -// } -// -// public void setCellStyle(CellStyle cellStyle) { -// this.cellStyle = cellStyle; -// } -// -// public void setSheetName(String sheetName) { -// this.sheetName = sheetName; -// } -// -// public void setCellWidth(BigDecimal[] cellWidth) { -// this.cellWidth = cellWidth; -// } -// -// -// public void setSheetNo(Integer sheetNo) { -// this.sheetNo = sheetNo; -// } -// -// public void setQueryDataInterface(QueryDataInterface queryDataInterface) { -// this.queryDataInterface = queryDataInterface; -// } -// -//} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.java new file mode 100644 index 0000000..2f6f967 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.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.MesExtendObjectCfg; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesExtendObjectCfgRepository 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 4437049..da79ca8 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 @@ -3085,4 +3085,27 @@ public class MesHqlPack { } return packBean; } + + /** + * 扩展对象配置 + * @param extendObjectCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesExtendObjectCfg(MesExtendObjectCfg extendObjectCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(extendObjectCfg, organizeCode); + if (!StringUtils.isEmpty(extendObjectCfg.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(extendObjectCfg.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(extendObjectCfg.getFieldCode())) { + DdlPreparedPack.getStringLikerPack(extendObjectCfg.getFieldCode(), "fieldCode", packBean); + } + if (!StringUtils.isEmpty(extendObjectCfg.getFieldName())) { + DdlPreparedPack.getStringLikerPack(extendObjectCfg.getFieldName(), "fieldName", packBean); + } + if (!StringUtils.isEmpty(extendObjectCfg.getFieldType())) { + DdlPreparedPack.getNumEqualPack(extendObjectCfg.getFieldType(), "fieldType", packBean); + } + return packBean; + } } From 08187783460b4eece7eaf0b013fabaeaec567313 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 20 Jun 2020 16:40:48 +0800 Subject: [PATCH 059/156] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=B8=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsAutoStrategyMaster.java | 88 ++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java new file mode 100644 index 0000000..ca598b0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java @@ -0,0 +1,88 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 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.Index; +import javax.persistence.Table; + + +/** + * @Description : 自动化策略主表 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-06-20 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_AUTO_STRATEGY_MASTER", indexes = { + @Index(columnList = "STRATEGY_NO"), + @Index(columnList = "ROUTING_CODE") +}) +@Api("自动化策略主表") +public class WmsAutoStrategyMaster extends BaseBean { + private static final long serialVersionUID = -1818481118386594571L; + + @Column(name = "STRATEGY_NO") + @ApiParam(value = "策略编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyNo; + + @Column(name = "STRATEGY_NAME") + @ApiParam(value = "策略名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyName; + + @Column(name = "STRATEGY_SPEC") + @ApiParam(value = "策略描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategySpec; + + @Column(name = "STRATEGY_TYPE") + @ApiParam(value = "策略类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "OUT_MOVEMENT_MOVE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description", hidden = true) + private Integer strategyType; + + @Column(name = "ROUTING_CODE") + @ApiParam(value = "物料路线代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String routingCode; + + @Column(name = "ROUTING_NAME") + @ApiParam(value = "物流路线名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String routingName; + + @Column(name = "STRATEGY_QTY_CONTROL") + @ApiParam(value = "数量控制") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "SHIPP_QTY_CONTROL") + @AnnoOutputColumn(refClass = WmsEnumUtil.SHIPP_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true) + private Integer strategyQtyControl; + + @Column(name = "START_EFFECT_DATE") + @ApiParam(value = "开始生效时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String startEffectDate; + + @Column(name = "END_EFFECT_DATE") + @ApiParam(value = "结束生效时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String endEffectDate; + +} From e340749f872698679ffb6baef87608f895ad5d9e Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 20 Jun 2020 17:06:41 +0800 Subject: [PATCH 060/156] Finish Task #2196 Cost:4h --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 6 +++--- 2 files changed, 6 insertions(+), 4 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 904d9b3..482019c 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 @@ -727,7 +727,9 @@ public class WmsEnumUtil { EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), LOADING_ORDER(530, "LOADING_ORDER", "装车单"), SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"), - FORK_INSTORE(550, "FORK_INSTORE", "采购入库"); + FORK_INSTORE(550, "FORK_INSTORE", "采购入库"), + CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "料车出库"), + CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "料车入库"); 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/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index 702df84..90713b3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -47,7 +47,7 @@ public class WmsPackageSpec extends BaseBean { @Column(name = "PARENT_SPEC") @ApiParam(value = "上级规格") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, - isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specCode") + isRequire = 2, dataSrc = "/wms/base-data/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specCode") private String parentSpec; @Column(name = "SPEC_LEVEL") @@ -64,12 +64,12 @@ public class WmsPackageSpec extends BaseBean { @Column(name = "POCKET_TYPE") @ApiParam(value = "容器类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, - dataSrc = "/wms/wms-container-type/query", listColumnName = "ctName", explicitColumnName = "ctCode") + dataSrc = "/wms/base-data/wms-container-type/query", listColumnName = "ctName", explicitColumnName = "ctCode") private String pocketType; @ApiParam(value = "上级规格名称") @Column(name = "PARENT_NAME") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, - isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName") + isRequire = 2, dataSrc = "/wms/base-data/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName") private String parentName; } From ac7e69e51e9227c6f348f7315b66a3554da64d4b Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 20 Jun 2020 17:56:14 +0800 Subject: [PATCH 061/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..577686d 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 b948580..f714b7d 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 e12eaee..b7991cc 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 c338f71..0648e9f 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 7637865..3b9e57a 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 d98b7d8..b1911ec 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 bf96e57..56d54cb 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 a758a6a..830caa5 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 efacfd2..fb51da0 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 dba12cc..78bbdef 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 81670b2..fb44d00 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 26a7311..dc4ea86 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 eaf2544..8571a5f 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 0f615b6..e36258d 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 9e5f745..9915420 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 0fea52b..61027b2 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 cc8fce6..c2104bf 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 From 78fa4f3a3716acb00e4e11a946a6fb2f8fe5aadd Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 20 Jun 2020 18:03:06 +0800 Subject: [PATCH 062/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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..932bdd9 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 49f9d06d5fbc7ecc32948fefa0acde2035c8dc71 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 20 Jun 2020 20:51:56 +0800 Subject: [PATCH 063/156] =?UTF-8?q?Fix=20bug#9062=20=E6=97=A0=E9=94=A1?= =?UTF-8?q?=E5=96=9C=E5=BE=B7-=E7=94=9F=E4=BA=A7=E6=B1=87=E6=8A=A5?= =?UTF-8?q?=EF=BC=88=E5=8E=9F=E6=9D=90=E6=96=99/=E6=88=90=E5=93=81?= =?UTF-8?q?=EF=BC=89=E7=94=A8=20=E5=87=BD=E6=95=B0=E5=8F=96=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E7=88=B6=E4=BD=8D=E7=BD=AE=E5=92=8C=E5=AD=90?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=8F=B7=E5=8F=AF=E8=83=BD=E4=BC=9A=E6=9C=89?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA-0620?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 13 ++++++++++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 12 ++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index c13b717..b816bfe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -126,10 +126,19 @@ public class SapDocFgSum extends BaseBean { @ApiParam(value = "产品报工orderNo") private String fGOrderNo; + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + private String itemSeqNo; + public SapDocFgSum(){} public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, - String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion, String fGOrderNo) { + String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, + String effStartTime, String bomVersion, String fGOrderNo, String seqNo, String itemSeqNo) { this.wdfdId = wdfdId; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -147,6 +156,8 @@ public class SapDocFgSum extends BaseBean { this.effStartTime = effStartTime; this.bomVersion = bomVersion; this.fGOrderNo = fGOrderNo; + this.seqNo = seqNo; + this.itemSeqNo = itemSeqNo; } public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { 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 08e50e1..672dc3c 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 @@ -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 com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -153,4 +155,14 @@ public class WmsDocFgDetail extends BaseBean { @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") private String bomVersion; + + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemSeqNo; } From f90371f63281557ec0196dbf2585c070914d4a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 21 Jun 2020 14:26:25 +0800 Subject: [PATCH 064/156] =?UTF-8?q?=E3=80=902144=2006=201.2.4.6.1.3=20?= =?UTF-8?q?=E8=A3=85=E9=85=8D=E8=AE=A1=E5=88=92=E6=8E=92=E4=BA=A7=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 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 12 ++++++++++++ 3 files changed, 18 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 cc97315..e992adc 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 @@ -1905,7 +1905,8 @@ public class MesEnumUtil { MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"), MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"), - MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"); + MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"), + MES_WORK_ORDER_PAINT_ZS(460, "planZSOrderExcelService", "生产工单-注塑"); private int value; private String service; 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 fb6c793..141f713 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 @@ -123,4 +123,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "VIN_CODE") @ApiParam("vin") private String vinCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; } 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 d09d54d..a83b4a0 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 @@ -272,6 +272,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "完成按钮编号") public String comButtonCode; + @Transient + @ApiParam("工单源序号") + private Double srcSeq; + + @Transient + @ApiParam("零件号集合") + private String partNoList; + + @Transient + @ApiParam("零件名称集合") + private String partNameList; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 6c5c7261876d7eb5d918ac55978b0f52ace55f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 21 Jun 2020 14:56:50 +0800 Subject: [PATCH 065/156] =?UTF-8?q?REST=20=E6=9C=8D=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=99=A8=E6=94=AF=E6=8C=81JSON=E4=B8=8EXML?= =?UTF-8?q?=20FTP=20=E6=94=AF=E6=8C=81=E5=A2=9E=E9=87=8F=E5=86=99=E5=85=A5?= =?UTF-8?q?=20=E5=9B=BD=E9=99=85=E5=8C=96=E8=B5=84=E6=BA=90=E5=86=85?= =?UTF-8?q?=E5=AD=98=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 12 ++++++++++++ 1 file changed, 12 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 aa9bd67..f3cb0ae 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 @@ -98,6 +98,18 @@ public class BsSuitCaseFTP extends BaseBean { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead); } + @Column(name = "IS_INCREMENTAL_WRITE") + @ApiParam(value = "是否增量写入") + private Integer isIncrementalWrite; + + public int getIsIncrementalWriteVal(){ + return isIncrementalWrite == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isIncrementalWrite; + } + + public boolean isIncrementalWrite() { + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal()); + } + @Transient @ApiParam(value = "临时适配路径") private String tempSuitFilePath; From 26b564f0bed9da5fb753aeea67bbe97856611cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 21 Jun 2020 16:33:00 +0800 Subject: [PATCH 066/156] =?UTF-8?q?FTP=20=E6=96=87=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f3cb0ae..f7fbfb9 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 @@ -46,7 +46,7 @@ public class BsSuitCaseFTP extends BaseBean { @Column(name = "FILE_ENCODE") @ApiParam(value = "文件编码") - private String fileEncode; + private Integer fileEncode; @Column(name = "IS_TRANSFORM_MESSAGE") @ApiParam(value = "是否转换报文") From 3d889133434c3948931ba5938831f6c4d8e7d6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sun, 21 Jun 2020 16:40:06 +0800 Subject: [PATCH 067/156] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E5=87=86=E5=8C=85=E8=A7=84=E6=95=B0?= =?UTF-8?q?=E9=87=8F=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/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 e2b4a01..817a07c 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 @@ -48,6 +48,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("零件规格") private String partSpec; + @Column(name = "PART_SPEC_QTY") + @ApiParam("标准包规数量") + private Double partSpecQty; + @Column(name = "CATEGORY_CODE1") @ApiParam("分类1") private String categoryCode1; From e94e4ad189ebd62c29373540429342847802c2ff Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 21 Jun 2020 17:26:32 +0800 Subject: [PATCH 068/156] =?UTF-8?q?=E3=80=902180=2006=201.2.3.8=E6=B3=B0?= =?UTF-8?q?=E5=9B=BDWMS=EF=BC=8D=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=91=20=E3=80=902181=2006=201.2.3.8=20?= =?UTF-8?q?=E6=B3=B0=E5=9B=BDWMS-=E5=AE=B9=E5=99=A8=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E6=8E=A5=E5=8F=A3=E3=80=91=20=E3=80=902180?= =?UTF-8?q?=2006=201.2.3.8=E6=B3=B0=E5=9B=BDWMS=EF=BC=8D=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=8E=A5=E5=8F=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 82 +++++++++++++++++++++ .../i3plus/pojo/model/wms/WmsJobParamModel.java | 1 + .../pojo/wms/bean/WmsAutoStrategyDetail.java | 86 ++++++++++++++++++++++ .../pojo/wms/bean/WmsAutoStrategyMethod.java | 51 +++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 12 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java | 5 ++ .../WmsAutoStrategyDetailRepository.java | 16 ++++ .../WmsAutoStrategyMasterRepository.java | 16 ++++ .../WmsAutoStrategyMethodRepository.java | 16 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 60 +++++++++++++++ 10 files changed, 345 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.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 482019c..98df4b4 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 @@ -8115,4 +8115,86 @@ public class WmsEnumUtil { return description; } } + + /** + * 动作类型 + * 10-锁定库存，20-解锁库存、30-锁定库位、40-解锁库位、50-锁定料车、60-解锁料车、70-生成任务、 + * 80-取消任务、90-递进交换 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STRATEGY_ACTION_TYPE { + LOCKING_IN_STOCK(10, "LOCKING_IN_STOCK", "锁定库存"), + UNLOCK_IN_STOCK(20, "UNLOCK_IN_STOCK", "解锁库存"), + LOCKING_LOCATE(30, "LOCKING_LOCATE", "锁定库位"), + UNLOCK_LOCATE(40, "UNLOCK_LOCATE", "解锁库位"), + LOCKING_FEED_CAR(50, "LOCKING_FEED_CAR", "锁定料车"), + UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"), + GENERATE_TASK(70, "GENERATE_TASK", "生成任务"), + CANCEL_TASK(80, "CANCEL_TASK", "取消任务"), + PROGRESSIVE_EXCHANGE(90, "PROGRESSIVE_EXCHANGE", "递进交换"); + + private int value; + private String code; + private String description; + + STRATEGY_ACTION_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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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 STRATEGY_ACTION_TYPE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } 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 6bfdd58..2c30912 100644 --- 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 @@ -17,6 +17,7 @@ public class WmsJobParamModel implements Serializable { private static final long serialVersionUID = 5784492509251527816L; private String organizeCode;//工厂代码 private List zonesNoList;//存储区编号 + private String src;//单据来源枚举 private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 private Integer minuteDiff;//处理周期(分钟) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java new file mode 100644 index 0000000..e5fb349 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 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.Index; +import javax.persistence.Table; + +/** + * @Description : 自动化策略明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-20 16:51 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_AUTO_STRATEGY_DETAIL", indexes = { + @Index(columnList = "AUTO_STRATEGY_NO"), + @Index(columnList = "STRATEGY_ITEM_NO") +}) +@Api("自动化策略明细表") +public class WmsAutoStrategyDetail extends BaseBean { + private static final long serialVersionUID = 6855278572650548519L; + + @Column(name = "AUTO_STRATEGY_NO") + @ApiParam(value = "自动化策略编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String autoStrategyNo; + + @Column(name = "STRATEGY_ITEM_NO") + @ApiParam(value = "策略项编码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyItemNo; + + @Column(name = "STRATEGY_ITEM_NAME") + @ApiParam(value = "策略项名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyItemName; + + @Column(name = "STRATEGY_ITEM_SPEC") + @ApiParam(value = "策略项描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyItemSpec; + + @Column(name = "FILTER_CONDITION") + @ApiParam(value = "过滤条件") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String filterCondition; + + @Column(name = "SORT_CONDITION") + @ApiParam(value = "排序条件") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String sortCondition; + + @Column(name = "STRATEGY_ACTION") + @ApiParam(value = "动作") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + @AnnoOutputColumn(refClass = WmsEnumUtil.STRATEGY_ACTION_TYPE.class, refForeignKey = "value", value = "description", hidden = true) + private Integer strategyAction; + + @Column(name = "STRATEGY_METHOD") + @ApiParam(value = "方法") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyMethod; + + @Column(name = "SCRIPT_NO") + @ApiParam(value = "脚本编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String scriptNo; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java new file mode 100644 index 0000000..31f0174 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java @@ -0,0 +1,51 @@ +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.Index; +import javax.persistence.Table; + +/** + * @Description : 自动化策略方法 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_AUTO_STRATEGY_METHOD", indexes = { + @Index(columnList = "STRATEGY_ACTION") +}) +@Api("自动化策略方法") +public class WmsAutoStrategyMethod extends BaseBean { + private static final long serialVersionUID = -4424882984978962477L; + + @Column(name = "STRATEGY_ACTION") + @ApiParam(value = "动作") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Integer strategyAction; + + @Column(name = "STRATEGY_METHOD") + @ApiParam(value = "策略方法") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategyMethod; + + @Column(name = "STRATEGY_SPEC") + @ApiParam(value = "策略描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String strategySpec; +} 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 08e50e1..48fcef0 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 @@ -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 com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -153,4 +155,14 @@ public class WmsDocFgDetail extends BaseBean { @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") private String bomVersion; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + + @Column(name = "FIX_LOT_NO", nullable = false) + @ApiParam(value = "特殊批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String fixLotNo = ""; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java index 8ee1297..117d091 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -89,6 +89,11 @@ public class WmsSerialSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + public WmsSerialSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.java new file mode 100644 index 0000000..4806018 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.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.WmsAutoStrategyDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : 自动化策略明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:34 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java new file mode 100644 index 0000000..d6200d8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.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.WmsAutoStrategyMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 自动化策略主表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:34 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.java new file mode 100644 index 0000000..fba9918 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.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.WmsAutoStrategyMethod; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:51 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyMethodRepository extends BaseRepository { +} 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 667156b..d88c8fd 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 @@ -3407,4 +3407,64 @@ public class WmsHqlPack { getStringBuilderPack(wmsSerialSnTrans, packBean);*/ return packBean; } + + /** + * 自动化策略主表 分页查询 + * + * @param wmsAutoStrategyMaster + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyMaster(WmsAutoStrategyMaster wmsAutoStrategyMaster) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyMaster.getStrategyNo(), "strategyNo", result); + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyMaster.getStrategyName(), "strategyName", result); + DdlPreparedPack.getNumEqualPack(wmsAutoStrategyMaster.getStrategyType(), "strategyType", result); + DdlPreparedPack.getStringEqualPack(wmsAutoStrategyMaster.getRoutingCode(), "routingCode", result); + if (StringUtils.isNotBlank(wmsAutoStrategyMaster.getStartEffectDate()) && StringUtils.isNotBlank(wmsAutoStrategyMaster.getEndEffectDate())) { + result.setWhereAppend(result.getWhereAppend() + " and (startEffectDate >= '"+wmsAutoStrategyMaster.getStartEffectDate()+"' and endEffectDate <= '"+wmsAutoStrategyMaster.getEndEffectDate()+"' )"); + } + + getStringBuilderPack(wmsAutoStrategyMaster, result); + + return result; + } + + /** + * 自动化策略明细表 分页查询 + * + * @param wmsAutoStrategyDetail + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyDetail(WmsAutoStrategyDetail wmsAutoStrategyDetail) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyDetail.getAutoStrategyNo(), "autoStrategyNo", result); + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyDetail.getStrategyItemNo(), "strategyItemNo", result); + + getStringBuilderPack(wmsAutoStrategyDetail, result); + + return result; + } + + /** + * 自动化策略方法 分页查询 + * + * @param WmsAutoStrategyMethod + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyMethod(WmsAutoStrategyMethod WmsAutoStrategyMethod) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getNumEqualPack(WmsAutoStrategyMethod.getStrategyAction(), "strategyAction", result); + DdlPreparedPack.getStringLikerPack(WmsAutoStrategyMethod.getStrategyMethod(), "strategyMethod", result); + DdlPreparedPack.getStringLikerPack(WmsAutoStrategyMethod.getStrategySpec(), "strategySpec", result); + + getStringBuilderPack(WmsAutoStrategyMethod, result); + + return result; + } } From 17d3642fffde05f8aabc0206582de89deb2d09e4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 21 Jun 2020 17:35:20 +0800 Subject: [PATCH 069/156] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=B8=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 52 +++++++++++++++++++++- 1 file changed, 51 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 904d9b3..2969ccc 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 @@ -514,7 +514,8 @@ public class WmsEnumUtil { NC_LOCATE(60, "N", "NC库"), SPILLAGE_LOCATE(70, "Y", "溢料库"), TRANSIT_LOCATE(80, "T", "在途库"), - UTENSIL_LOCATE(90, "U", "器具库"); + UTENSIL_LOCATE(90, "U", "器具库"), + OPERATION_PALTFORM(100, "O", "工作台"); private int value; private String code; @@ -4507,6 +4508,53 @@ public class WmsEnumUtil { } } + + /** + * 客户发运 发运数量控制 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTO_STRATEGY_QTY_CONTROL { + LESS_SEND(10, "少发"), + MANY_SEND(20, "多发"), + CONSISTENT(30, "一致"); + + private int value; + private String description; + + AUTO_STRATEGY_QTY_CONTROL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static AUTO_STRATEGY_QTY_CONTROL codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + /** * 客户发运 发运数量控制 * 默认为 10 @@ -8113,4 +8161,6 @@ public class WmsEnumUtil { return description; } } + + } From 9567d62195c250a0507ab64676b4cff66bdc1551 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 21 Jun 2020 17:39:42 +0800 Subject: [PATCH 070/156] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=8A=A8=E5=8C=96?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 46 ++++++++++++++++++++++ .../pojo/wms/bean/WmsAutoStrategyMaster.java | 2 +- 2 files changed, 47 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 98df4b4..c22fa26 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 @@ -8197,4 +8197,50 @@ public class WmsEnumUtil { return null; } } + + /** + * 自动化策略 数量控制 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTO_STRATEGY_QTY_CONTROL { + LESS_SEND(10, "少发"), + MANY_SEND(20, "多发"), + CONSISTENT(30, "一致"); + + private int value; + private String description; + + AUTO_STRATEGY_QTY_CONTROL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static AUTO_STRATEGY_QTY_CONTROL codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java index ca598b0..9a4437d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java @@ -72,7 +72,7 @@ public class WmsAutoStrategyMaster extends BaseBean { @Column(name = "STRATEGY_QTY_CONTROL") @ApiParam(value = "数量控制") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "SHIPP_QTY_CONTROL") - @AnnoOutputColumn(refClass = WmsEnumUtil.SHIPP_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.AUTO_STRATEGY_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true) private Integer strategyQtyControl; @Column(name = "START_EFFECT_DATE") From 1f05cfca4ccf79f5e8c37281120019d71373aa0a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 21 Jun 2020 17:55:22 +0800 Subject: [PATCH 071/156] Finish Task #2152 Cost:16h --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 49 +++++++++++++++++++++- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 8 +++- .../pojo/mes/bean/MesWorkCellPointGroup.java | 8 ++++ .../i3plus/pojo/mes/model/MesStationBomModel.java | 18 ++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 13 ++++-- 5 files changed, 90 insertions(+), 6 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 604aa39..e92e50f 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 @@ -2024,7 +2024,8 @@ public class MesPcnEnumUtil { NORMAL(10, "正常"), CLOSE(20, "关闭"), - FINISH(30, "完成"); + FINISH(30, "完成"), + OFF_LINE_REWORK(40, "线下返修"); private int value; private String description; @@ -4210,4 +4211,50 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 绑定模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum KEY_BIND_MODE { + + PRODUCE_BOM_BIND(10, "产品BOM绑定"), + SCATTER_BOM_BIND(20, "散件BOM绑定"); + + private int value; + private String description; + + KEY_BIND_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 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/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index fa22aa7..5aba4be 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 @@ -65,11 +65,11 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { private String workType; @Column(name = "PRODUCE_CATEGORY_CODE") - @ApiParam("产品类型代码") + @ApiParam("产品位置") private String produceCategoryCode; @Column(name = "PRODUCE_CATEGORY_NAME_RDD") - @ApiParam("产品类型名称") + @ApiParam("产品位置名称") private String produceCategoryNameRdd; @Column(name = "PPT_CODE") @@ -104,6 +104,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("组件编号") private String assyNo; + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + @Transient @ApiParam("队列序号") private Double queueSeq; 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 53ce112..91a7275 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 @@ -79,6 +79,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("显示颜色") private String color; + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品位置代码") + private String produceCategoryCode; + 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/MesStationBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java index e0f1f6f..45d14ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java @@ -40,6 +40,9 @@ public class MesStationBomModel { @ApiParam("报废数") private Integer scrapQty; + @ApiParam(value = "是否可重复") + private Integer isRepeat; + public MesStationBomModel() { } @@ -72,4 +75,19 @@ public class MesStationBomModel { this.parentPartNo = parentPartNo; this.parentPartName = parentPartName; } + + public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName, Integer isRepeat) { + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + this.isRepeat = isRepeat; + } } 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 bf91927..f128cd8 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 @@ -81,12 +81,16 @@ public class QueueOrderModel implements Serializable { @ApiParam("JIT队列批次") private String jitLotNo; + @ApiParam("vin") private String vinCode; @ApiParam("客户JIT队列编号") private String jitActualNo; + @ApiParam("产品位置") + private String produceCategoryCode; + public QueueOrderModel() { } @@ -231,9 +235,9 @@ public class QueueOrderModel implements Serializable { this.serialNumber=serialNumber; } - //料架分组队列展示组件 + //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { + Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) { this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.orderNo = orderNo; @@ -242,13 +246,16 @@ public class QueueOrderModel implements Serializable { this.partNo = partNo; this.partNameRdd = partNameRdd; this.organizeCode = organizeCode; + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; } - public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) { + public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) { this.id = id; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; this.vinCode = vinCode; this.organizeCode = organizeCode; + this.produceCategoryCode = produceCategoryCode; } } From 0d81228ce788d8bb48a7e6db82380fffabc0cb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 21 Jun 2020 17:58:16 +0800 Subject: [PATCH 072/156] =?UTF-8?q?=E3=80=902145=2006=201.2.4.6.1.1=20?= =?UTF-8?q?=E6=B3=A8=E5=A1=91=E8=AE=A1=E5=88=92=E6=8E=92=E4=BA=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesMouldPart.java | 41 ++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java | 50 +++++++++++++++++ .../i3plus/pojo/mes/model/ZzMesWorkOrderModel.java | 65 ++++++++++++++++++++++ .../mes/repository/MesMouldPartRepository.java | 17 ++++++ .../pojo/mes/repository/MesPartTaktRepository.java | 17 ++++++ 5 files changed, 190 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMouldPartRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartTaktRepository.java 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 new file mode 100644 index 0000000..34186bd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -0,0 +1,41 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MOULD_PART") +@Api("MES_模具_零件对照表") +public class MesMouldPart extends BaseBean implements Serializable { + private static final long serialVersionUID = -773118210589936438L; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "MOULD_CODE") + @ApiParam("模具代码") + private String mouldCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java new file mode 100644 index 0000000..c738fc7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.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.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :MES_生产节拍 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLAN_TAKT") +@Api("MES_生产节拍") +public class MesPartTakt extends BaseBean implements Serializable { + private static final long serialVersionUID = -7731182105899332278L; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("零件名称") + private String partName; + + @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/model/ZzMesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java new file mode 100644 index 0000000..fb93d98 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java @@ -0,0 +1,65 @@ +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; + +/** +* @Description : 总装生产工单导入模板 +* @Reference : +* @author: jessica.chen +* @date: 2020/6/12 17:10 +* @Modify: +*/ + +@Data +@Api(value="总装生产工单导入模板",description = "总装生产工单导入模板") +public class ZzMesWorkOrderModel extends BaseBean { + + private static final long serialVersionUID = 5790342327875846646L; + @ApiParam(value = "日期") + @AnnoOutputColumn + private String workDate; + + @ApiParam(value = "班次") + @AnnoOutputColumn + private String shiftName; + + @ApiParam(value = "项目名称") + @AnnoOutputColumn(required = false) + private String prodCfgTypeName; + + @ApiParam(value = "SAP物料号") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "产品名称") + @AnnoOutputColumn(required = false) + private String partName; + + @ApiParam(value = "产线代码") + private String workCenterCode; + + @ApiParam(value = "计划数") + @AnnoOutputColumn + private String qty; + + @ApiParam(value = "标包") + @AnnoOutputColumn(required = false) + private String snp; + + @ApiParam(value = "包装规格") + @AnnoOutputColumn + private String packageSpec; + + @ApiParam(value = "备注") + @AnnoOutputColumn(required = false) + private String memo; + + @ApiParam(value = "行数") + @AnnoOutputColumn(required = false) + private Integer rows; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMouldPartRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMouldPartRepository.java new file mode 100644 index 0000000..0d17747 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMouldPartRepository.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.MesMouldPart; +import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesMouldPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartTaktRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartTaktRepository.java new file mode 100644 index 0000000..4f17599 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartTaktRepository.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.MesPart; +import cn.estsh.i3plus.pojo.mes.bean.MesPartTakt; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartTaktRepository extends BaseRepository { +} From c2a6fb1684dec8edbb8c9923a020116e6a9481e2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 22 Jun 2020 09:44:01 +0800 Subject: [PATCH 073/156] =?UTF-8?q?[=E4=BB=BB=E5=8A=A12186=20=E6=B6=82?= =?UTF-8?q?=E8=A3=85=E5=AF=BC=E5=85=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 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 d2b83c3..27ad0ee 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 @@ -2,12 +2,14 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; +import com.alibaba.fastjson.JSONObject; 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 org.springframework.util.StringUtils; import javax.persistence.*; import java.io.Serializable; @@ -270,7 +272,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "扩展数据MAP") public Map extendMap; - @Transient @ApiParam("工单源序号") private Double srcSeq; @@ -314,4 +315,16 @@ public class MesWorkOrder extends BaseBean implements Serializable { public int getApprovalStatusVal() { return this.approvalStatus == null ? 0 : this.approvalStatus; } + + public Map getExtendMap() { + try { + if (!StringUtils.isEmpty(this.extend)) { + return JSONObject.parseObject(this.extend, Map.class); + } else { + return null; + } + } catch (Exception e) { + return null; + } + } } From 98b0110ff38e566d578840d6978335b809cc6787 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 22 Jun 2020 10:17:46 +0800 Subject: [PATCH 074/156] Finish Task #2080 Cost:8h --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 12 +++++++++++- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) 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 be8dd7d..99716c7 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 @@ -9,8 +9,13 @@ 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.math.BigDecimal; +import java.util.List; /** * @Description : 作业任务明细信息 @@ -140,6 +145,11 @@ public class WmsTaskDetails extends BaseBean { @ApiParam("交易类型") public String transTypeCodeRdd; + @Transient + @ApiParam("工厂代码集合") + private List organizeCodeList; + + public Double getQty() { return this.qty == null ? 0 : this.qty; } 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 169c59d..bc80d7b 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 @@ -1913,6 +1913,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsTaskDetails(WmsTaskDetails taskDetails) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getInPackList(taskDetails.getOrganizeCodeList(), "organizeCode", result); getStringBuilderPack(taskDetails, result); return result; } From 498d6821a1139b9ace34d1ec65e508c30e10f95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 22 Jun 2020 11:25:49 +0800 Subject: [PATCH 075/156] =?UTF-8?q?=E3=80=902145=2006=201.2.4.6.1.1=20?= =?UTF-8?q?=E6=B3=A8=E5=A1=91=E8=AE=A1=E5=88=92=E6=8E=92=E4=BA=A7=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/MesPackSpec.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/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index 1880189..dac14a4 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 @@ -43,7 +43,7 @@ public class MesPackSpec extends BaseBean implements Serializable { @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "包装数量", example = "0") - private Double qty; + private Double qty = 0d; @Column(name = "QTY2") @ColumnDefault("0") From d08465dd38f2028eec6f52a0f0a774bcf6f0bfdc Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 22 Jun 2020 11:57:32 +0800 Subject: [PATCH 076/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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/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 +- 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 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 b948580..a9e288f 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 e12eaee..a44418c 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 c338f71..2de88b5 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 7637865..50ab2c2 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 d98b7d8..7f94617 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 bf96e57..d800ecf 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 a758a6a..60fc467 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 efacfd2..d65e031 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 dba12cc..a785f21 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 81670b2..d6d2f8e 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 26a7311..0fbfb69 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 eaf2544..76739f9 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 0f615b6..0368700 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 9e5f745..b2eedd4 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 0fea52b..5fcd08a 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 cc8fce6..2eddf76 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 932bdd9..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-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From c8178975afff89c26af45a7160dffc0637da9f89 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 22 Jun 2020 14:27:51 +0800 Subject: [PATCH 077/156] =?UTF-8?q?StationRequestBean=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=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/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 1c5a88e..a480700 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 @@ -153,6 +153,9 @@ public class StationRequestBean implements Serializable { @ApiParam("物料名称") private String partName; + @ApiParam("状态机代码") + private String smCode; + @Override public String toString() { return "StationRequestBean{" + From 5431d09073d28ff3d805cbd3cd23d60c9cbadb64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 22 Jun 2020 16:25:02 +0800 Subject: [PATCH 078/156] =?UTF-8?q?=E3=80=908983=20=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4-=E6=B3=B0=E5=9B=BDMES=EF=BC=8C=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E8=BE=BE=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= =?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/mes/bean/MesWorkCenter.java | 4 ++++ 1 file changed, 4 insertions(+) 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 6cfbd40..c67110f 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 @@ -62,6 +62,10 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("产能") private Integer productionCapacity; + @Column(name = "GENERATE_TYPE") + @ApiParam("条码生成模式") + private Integer generateType; + @Transient @ApiParam(value = "子集列表") private List childTreeList; From 68fa329701c1db389ce281d8b63a3de61d229e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 22 Jun 2020 16:51:04 +0800 Subject: [PATCH 079/156] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 5 ++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++ .../mes/model/PackageSnLabelTemplateDataModel.java | 30 ++++++++++ .../pojo/mes/model/PaintWorkOrderSnModel.java | 64 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/model/ProdPackModel.java | 60 ++++++++++++++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 43 +++++++++++++++ 6 files changed, 206 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.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 4b81afd..541d461 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 @@ -118,6 +118,11 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("客户发往地") private String custDeliveryLocation; + // 赋值模板代码 + @Column(name = "PACKAGE_LABEL_TEMPLATE") + @ApiParam("包装标签模板") + private String packageLabelTemplate; + public MesPackage() { } 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 27ad0ee..0a67fe0 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 @@ -177,6 +177,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("预留字段4") private String reserved4; + @Column(name = "PARENT_PART_NO") + @ApiParam("父阶物料号") + private String parentPartNo; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java new file mode 100644 index 0000000..426707f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class PackageSnLabelTemplateDataModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + // 工单表.包装规格描述 + @ApiParam("包装规格") + private Double packSpecQty; + + @ApiParam("生产日期") + private String prodDate; + + @ApiParam("工单班次") + private String workOrderShift; + + @ApiParam("操作人员名称") + private String operatorName; + + @ApiParam("工厂名称") + private String organizeName; +} 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 new file mode 100644 index 0000000..16a9bfe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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.NoArgsConstructor; + +import java.util.List; + +/** + * @Description : 涂装工单条码-展示组件model + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-06-21 11:02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("涂装工单条码展示组件model") +public class PaintWorkOrderSnModel extends BaseBean { + + @ApiParam("工单号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("颜色名称") + private String colorName; + + @ApiParam("工单数量") + private Double workOrderQty; + + @ApiParam("包装数量") + private Double packageQty; + + @ApiParam("项目名称") + private String prodCfgTypeName; + + @ApiParam("圈数") + private Integer groupNum; + + @ApiParam("工单状态") + private Integer workOrderStatus; + + // 父阶物料号 -- 涂装客户标签打印 + @ApiParam("父阶物料号") + private String parentPartNo; + + // 父阶物料名称 -- 涂装二次条码打印 + @ApiParam("父阶物料名称") + private String parentPartName; + + private List prodPackageList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java new file mode 100644 index 0000000..b00f907 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 涂装工单条码-展示组件(产品包装)model + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-06-21 11:02 + * @Modify: + **/ +@Data +@Api("产品包装model") +public class ProdPackModel { + + // 产品条码表--产品条码 + @ApiParam("产品条码") + private String productSn; + + // 包装主表--包装标号 + @ApiParam("一检箱条码") + private String packageNo; + + // 包装明细表--创建时间 + @ApiParam("一检校验时间") + private String createDatetime; + + // 包装主表--打印状态(10：未打印 20：已打印) + @ApiParam("箱条码状态") + private Integer printStatus; + + // 涂装客户标签打印 + @ApiParam("客户标签") + private String custSn; + + // 涂装客户标签打印 + @ApiParam("当前工序") + private String processCode; + + // 涂装客户标签打印 + @ApiParam("更新时间") + private String modifyDateTime; + + public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) { + this.productSn = productSn; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.printStatus = printStatus; + } + + public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) { + this.productSn = productSn; + this.packageNo = packageNo; + this.custSn = custSn; + this.processCode = processCode; + this.modifyDateTime = modifyDateTime; + } +} 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 9d81d04..0539818 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 @@ -616,4 +616,47 @@ public class MesPcnHqlPack { return endIndex; } + /** + * 涂装一次箱条码打印获取工单 查询条件封装 + * + * @param mesWorkOrder + * @return + */ + public static DdlPackBean getWorkOrderList(MesWorkOrder mesWorkOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkOrder, organizeCode); + if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); + } + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + // 时间段查询 + if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + + return packBean; + } } From 3f88a390e4a7a53d8ab990231374a98647bda481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 22 Jun 2020 17:49:54 +0800 Subject: [PATCH 080/156] =?UTF-8?q?=E3=80=908983=20=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4-=E6=B3=B0=E5=9B=BDMES=EF=BC=8C=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E8=BE=BE=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= =?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 ++++++++++++++++++++++ 1 file changed, 45 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 657a47e..c91e8b0 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 @@ -1144,6 +1144,16 @@ public class MesEnumUtil { return tmp; } + 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 Integer descriptionOfValue(String description) { Integer tmp = null; for (int i = 0; i < values().length; i++) { @@ -6372,4 +6382,39 @@ public class MesEnumUtil { return tmp; } } + + /** + * 条码生成模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GENERATE_TYPE { + RELEASE_GENERATION(10, "下达生成"), + STATION_GENERATION(20, "工位生成"); + + private Integer value; + private String description; + + GENERATE_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.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 6c6fbf7e2ce065c4d0263e69865ed41d4beaa5e0 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 22 Jun 2020 20:12:42 +0800 Subject: [PATCH 081/156] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E6=98=BE=E7=A4=BA=E6=94=B6=E8=B4=A7=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 11 +++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 15 +++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index 57c8ee6..8055c00 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -102,6 +102,9 @@ public class PrintOrderDataModel implements Serializable { @Transient public String createDateTime; + @Transient + public String receiveDateTime; + public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); 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 0600820..00036f6 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 @@ -212,6 +212,17 @@ public class WmsASNMaster extends BaseBean { this.recStatus = recStatus; } + public WmsASNMaster(String orderNo, Integer asnStatus, String organizeCode, String vendorNo, String dockCode, String zdoc, String createDateTime, String receiveDateTime) { + this.orderNo = orderNo; + this.asnStatus = asnStatus; + this.organizeCode = organizeCode; + this.vendorNo = vendorNo; + this.dock = dockCode; + this.zdoc = zdoc; + this.createDatetime = createDateTime; + this.createDateTimeStart = receiveDateTime; + } + public int getAsnStatusVal() { return this.asnStatus == null ? 0 : this.asnStatus; } 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 e18d087..1dcc9ff 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 @@ -171,6 +171,21 @@ public class WmsPOMaster extends BaseBean { @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''") public String zdoc; + public WmsPOMaster() { + + } + + public WmsPOMaster(String orderNo, Integer poStatus, String organizeCode, String vendorNo, String dockCode, String zdoc, String createDateTime, String receiveDateTime) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.organizeCode = organizeCode; + this.vendorNo = vendorNo; + this.dock = dockCode; + this.zdoc = zdoc; + this.createDatetime = createDateTime; + this.createDateTimeStart = receiveDateTime; + } + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } From 66b98dd6d56273efec559a21ab73f8ee7b940670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 22 Jun 2020 20:17:51 +0800 Subject: [PATCH 082/156] =?UTF-8?q?1.=E5=BC=80=E5=8F=91=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=8A=9F=E8=83=BD=E9=80=BB=E8=BE=91=202.?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B6=82=E8=A3=85=E5=B7=A5=E5=8D=95=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=93=E5=8D=B0=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/mes/bean/MesCellFeed.java | 5 ++ .../pojo/mes/model/MesPaintSnPrintModel.java | 45 ++++++++++++++++++ .../i3plus/pojo/mes/model/PaintOnLineModel.java | 55 ++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java 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 41042ca..40939d5 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 @@ -30,6 +30,11 @@ import java.io.Serializable; @Api("工位投料信息") public class MesCellFeed extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369479107782L; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java new file mode 100644 index 0000000..abf1eff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020\06\22 15:58 + * @Modify: + **/ +@Data +public class MesPaintSnPrintModel implements Serializable { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产品条码") + private String produceSn; + + @ApiParam("包装编号") + private String packageNo; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("打印模板") + private MesLabelTemplate labelTemplate; +} 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 new file mode 100644 index 0000000..33f7751 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.mes.bean.MesCellFeed; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Author: siliter.yuan + * @CreateDate: 2020/6/21 8:06 PM + * @Description: + **/ +@Data +@Api("涂装上线MODEL") +public class PaintOnLineModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色") + private String color; + + @ApiParam("工单数量") + private Double orderNum; + + @ApiParam("包装数量") + private Double packageNum; + + @ApiParam("项目名称") + private String productName; + + @ApiParam("创建时间") + private String createDateTime; + + @ApiParam("圈数") + private Integer rounds; + + @ApiParam("工位投料数据列表") + private List cellFeedList; +} From 20cefbfec69b4aa040adf5b8d955981a44453231 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 22 Jun 2020 20:51:54 +0800 Subject: [PATCH 083/156] Finish Task #2080 Cost:8h --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index a5a4d10..33bed63 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -116,6 +116,9 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "分组KEY") public String groupKey; + @ApiParam(value = "工厂代码") + private String organizeCode; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; From fe05a76f6fc0894ebbe293211e7dd6f0df8f7089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 23 Jun 2020 09:19:01 +0800 Subject: [PATCH 084/156] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E4=B8=8E?= =?UTF-8?q?model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 bc568d7..09296ef 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 @@ -140,6 +140,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("产品标签模板") private String prodLabelTemplate; + @Column(name = "CUST_LABEL_TEMPLATE") + @ApiParam("客户标签模板") + private String custLabelTemplate; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index b00f907..f4a4de9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -19,7 +19,7 @@ public class ProdPackModel { @ApiParam("产品条码") private String productSn; - // 包装主表--包装标号 + // 包装主表--包装编号 @ApiParam("一检箱条码") private String packageNo; From 3247ef5ed7a514dce6ab4014511f6ae727dc0c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 23 Jun 2020 09:51:05 +0800 Subject: [PATCH 085/156] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=B7=A5=E4=BD=8D=E5=B1=95=E7=A4=BA=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=80=BB=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/PaintOnLineModel.java | 6 ------ 1 file changed, 6 deletions(-) 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 33f7751..f1f7d53 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 @@ -1,13 +1,10 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesCellFeed; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import java.util.List; - /** * @Author: siliter.yuan * @CreateDate: 2020/6/21 8:06 PM @@ -49,7 +46,4 @@ public class PaintOnLineModel { @ApiParam("圈数") private Integer rounds; - - @ApiParam("工位投料数据列表") - private List cellFeedList; } From 913991d30de99a5be6d90714ccfeed68ddb8dfbc Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 23 Jun 2020 11:30:31 +0800 Subject: [PATCH 086/156] =?UTF-8?q?=E3=80=902193=2006=201.2.3.7.4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?JOB=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 8 ++++-- .../pojo/wms/bean/WmsDocMovementDetails.java | 30 ++++++++++++++++++++++ .../pojo/wms/modelbean/WmsAutoTaskModel.java | 27 +++++++++++++++++++ 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.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 957ed64..87b0b83 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 @@ -729,7 +729,10 @@ public class WmsEnumUtil { SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"), FORK_INSTORE(550, "FORK_INSTORE", "采购入库"), CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "料车出库"), - CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "料车入库"); + CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "料车入库"), + AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"), + FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "叉车物料出库"), + FORKLIFT_PART_NO_INSTORE(600, "FORKLIFT_PART_NO_INSTORE", "叉车物料入库"); private int value; private String code; private String description; @@ -924,7 +927,8 @@ public class WmsEnumUtil { VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PICK_RC("KT_PICK_RC", "坤泰拣货"), UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"), - TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料"); + TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料"), + INTELLIGENT("INTELLIGENT", "智能化"); private String 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 f149f30..80a7f60 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 @@ -232,6 +232,10 @@ public class WmsDocMovementDetails extends BaseBean { private String seqNo; @Transient + @ApiParam(value = "客户编号") + private String custNo; + + @Transient @ApiParam(value = "替代物料编码") private String subPartNo; @@ -421,4 +425,30 @@ public class WmsDocMovementDetails extends BaseBean { this.planDate = poMasterDetails.getPlanDate(); this.planTime = poMasterDetails.getPlanTime(); } + + public WmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails,Integer busiType,String srcZoneNo,String destZoneNo, + String custNo) { + this.orderNo = wmsDocMovementDetails.getOrderNo(); + this.partNo = wmsDocMovementDetails.getPartNo(); + this.qty = wmsDocMovementDetails.getQty(); + this.taskGenerateQty = wmsDocMovementDetails.getTaskGenerateQty(); + this.partNameRdd = wmsDocMovementDetails.getPartNameRdd(); + this.unit = wmsDocMovementDetails.getUnit(); + this.custNo = wmsDocMovementDetails.getCustNo(); + this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo(); + this.srcWhNo = wmsDocMovementDetails.getSrcWhNo(); + this.srcLocateNo = wmsDocMovementDetails.getSrcLocateNo(); + this.destWhNo = wmsDocMovementDetails.getDestWhNo(); + this.destZoneNo = wmsDocMovementDetails.getDestZoneNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.srcAreaNo = wmsDocMovementDetails.getSrcAreaNo(); + this.destAreaNo = wmsDocMovementDetails.getDestAreaNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); + this.busiType = busiType; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.custNo = custNo; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java new file mode 100644 index 0000000..16100ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-22 18:59 + * @Modify: + **/ +@Data +public class WmsAutoTaskModel { + + String lockLocacte; + String lockCar; + + Integer busiType; + + String srcZoneNo; + String descZoneNo; + List partList; + + String organizeCode; +} From 1e1f7cc1fb36b13b3698a16d72afe076c6e13ae3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 23 Jun 2020 13:05:51 +0800 Subject: [PATCH 087/156] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 70d58be136cc4174dd58987f6d97876128e86f6a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 23 Jun 2020 13:06:35 +0800 Subject: [PATCH 088/156] pom --- modules/i3plus-pojo-aps/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 +- 19 files changed, 19 insertions(+), 19 deletions(-) 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 577686d..807bef5 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 f714b7d..b948580 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 b7991cc..e12eaee 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 0648e9f..c338f71 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 3b9e57a..7637865 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 b1911ec..d98b7d8 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 56d54cb..bf96e57 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 830caa5..a758a6a 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 fb51da0..efacfd2 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 78bbdef..dba12cc 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 fb44d00..81670b2 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 dc4ea86..26a7311 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 8571a5f..eaf2544 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 e36258d..0f615b6 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 9915420..9e5f745 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 61027b2..0fea52b 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 c2104bf..cc8fce6 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 e3513bddaab75a9a4e73be8a5a19c4c66c41a812 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 23 Jun 2020 13:11:18 +0800 Subject: [PATCH 089/156] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=B8=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 55 ++++++++++++++++++++++ 1 file changed, 55 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 d0b9ffc..a36111b 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 @@ -8244,4 +8244,59 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 自动入库任务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTO_FORK_TASK_TYPE { + MOVE(10, "W05", "W05"); + + private int value; + private String code; + private String description; + + AUTO_FORK_TASK_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 String valueOfDescription(int val) { + return valueOf(val); + } + } } From 7d5d36d08424cc94dcbfaa700f0093c0b4ee9f14 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 23 Jun 2020 13:34:13 +0800 Subject: [PATCH 090/156] test merge master --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..577686d 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 b948580..f714b7d 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 e12eaee..b7991cc 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 c338f71..0648e9f 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 7637865..3b9e57a 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 d98b7d8..b1911ec 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 bf96e57..56d54cb 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 a758a6a..830caa5 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 efacfd2..fb51da0 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 dba12cc..78bbdef 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 81670b2..fb44d00 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 26a7311..dc4ea86 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 eaf2544..8571a5f 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 0f615b6..e36258d 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 9e5f745..9915420 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 0fea52b..61027b2 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 cc8fce6..c2104bf 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 From 84dbbcd9a8388a22a08d96140782a4a36a458f25 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 23 Jun 2020 14:21:38 +0800 Subject: [PATCH 091/156] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=B8=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 313b78b..849aa74 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 @@ -728,12 +728,11 @@ public class WmsEnumUtil { EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), LOADING_ORDER(530, "LOADING_ORDER", "装车单"), SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"), - FORK_INSTORE(550, "FORK_INSTORE", "采购入库"), - CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "料车出库"), - CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "料车入库"), + FORK_INSTORE(550, "FORK_INSTORE", "叉车入库"), + CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "AGV料车出库"), + CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"), AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"), - FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "叉车物料出库"), - FORKLIFT_PART_NO_INSTORE(600, "FORKLIFT_PART_NO_INSTORE", "叉车物料入库"); + FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"); private int value; private String code; private String description; From f3ffdc7d4c68957afb39ebd090de65fc5709b8e0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 23 Jun 2020 14:27:14 +0800 Subject: [PATCH 092/156] dev merge test --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 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 a9e288f..b948580 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 a44418c..e12eaee 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 2de88b5..c338f71 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 50ab2c2..7637865 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 7f94617..d98b7d8 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 d800ecf..bf96e57 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 60fc467..a758a6a 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 d65e031..efacfd2 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 a785f21..dba12cc 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 d6d2f8e..81670b2 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 0fbfb69..26a7311 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 76739f9..eaf2544 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 0368700..0f615b6 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 b2eedd4..9e5f745 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 5fcd08a..0fea52b 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 2eddf76..cc8fce6 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 aa44420c85fbd5280fb3cf0fa7a5ec2f52d26374 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 23 Jun 2020 14:45:15 +0800 Subject: [PATCH 093/156] sonar-project.properties --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 55e4e84..932bdd9 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 fa383f6417f0c7ee7d8406c2c595228b0099beab Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 23 Jun 2020 15:20:31 +0800 Subject: [PATCH 094/156] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=B8=BB=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/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 849aa74..b9ad153 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 @@ -515,7 +515,7 @@ public class WmsEnumUtil { SPILLAGE_LOCATE(70, "Y", "溢料库"), TRANSIT_LOCATE(80, "T", "在途库"), UTENSIL_LOCATE(90, "U", "器具库"), - OPERATION_PALTFORM(100, "O", "工作台"); + OPERATION_PALTFORM(100, "W", "工作台"); private int value; private String code; From b32136f75d6a9316142fe841574afe4c7bc00861 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 23 Jun 2020 15:58:54 +0800 Subject: [PATCH 095/156] Fix Bug #9078 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 275d38f..3f00ee7 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 @@ -1515,7 +1515,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean); } if (mesQcCheckStandard.getCheckType() != null) { - DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); + DdlPreparedPack.getNumEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); } if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) { DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean); From 9218ca44a79a79078df01f312935a9535e0fd84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 23 Jun 2020 16:08:42 +0800 Subject: [PATCH 096/156] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7=E6=89=B9=E6=AC=A1?= =?UTF-8?q?lotNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++++ 1 file changed, 4 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 09296ef..c1296dd 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 @@ -144,6 +144,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("客户标签模板") private String custLabelTemplate; + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") From ed64d128756ed6d3c6a6d8cdee6682c6e51dbbc2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 23 Jun 2020 19:07:33 +0800 Subject: [PATCH 097/156] pojo --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java index cc8aac2..33b0024 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java @@ -51,7 +51,7 @@ public class MesExtendObjectCfg extends BaseBean implements Serializable { private Integer fieldType; @Column(name = "FIELD_LENGTH") - @ApiParam("扩展字段类型") + @ApiParam("扩展字段长度") private String fieldLength; @Column(name = "DEFAULT_VALUE") 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 ac78dd7..7c57d0a 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 @@ -151,6 +151,11 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; + @Lob + @Column(name = "EXTEND") + @ApiParam("扩展数据") + private String extend; + @Column(name = "RESERVED1") @ApiParam("预留字段1") private String reserved1; @@ -167,10 +172,6 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("预留字段4") private String reserved4; - @Column(name = "RESERVED5") - @ApiParam("预留字段5") - private String reserved5; - /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") From ea5a069eebfc563f3c6f24b32c86d5aecaf4fb78 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 23 Jun 2020 19:12:47 +0800 Subject: [PATCH 098/156] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 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 b948580..a9e288f 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 e12eaee..a44418c 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 c338f71..2de88b5 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 7637865..50ab2c2 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 d98b7d8..7f94617 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 bf96e57..d800ecf 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 a758a6a..60fc467 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 efacfd2..d65e031 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 dba12cc..a785f21 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 81670b2..d6d2f8e 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 26a7311..0fbfb69 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 eaf2544..76739f9 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 0f615b6..0368700 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 9e5f745..b2eedd4 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 0fea52b..5fcd08a 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 cc8fce6..2eddf76 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 15e7f2a0b540cd1e71b84a6eb808c139c2f977ed Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 23 Jun 2020 19:14:52 +0800 Subject: [PATCH 099/156] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 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 a9e288f..b948580 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 a44418c..e12eaee 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 2de88b5..c338f71 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 50ab2c2..7637865 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 7f94617..d98b7d8 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 d800ecf..bf96e57 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 60fc467..a758a6a 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 d65e031..efacfd2 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 a785f21..dba12cc 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 d6d2f8e..81670b2 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 0fbfb69..26a7311 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 76739f9..eaf2544 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 0368700..0f615b6 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 b2eedd4..9e5f745 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 5fcd08a..0fea52b 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 2eddf76..cc8fce6 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 cf1edee02eeac79236fcfa1bb881d1a08b22c2e4 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 23 Jun 2020 22:24:58 +0800 Subject: [PATCH 100/156] edi --- .../i3plus/pojo/base/common/XStreamFactory.java | 219 +++++++++++---------- .../i3plus/pojo/mes/bean/IfEdiInitialData.java | 54 +++++ .../estsh/i3plus/pojo/mes/model/CellFeedModel.java | 2 +- .../estsh/i3plus/pojo/mes/model/EdiFileModel.java | 21 ++ .../i3plus/pojo/mes/model/EdiRequestModel.java | 33 ++++ .../i3plus/pojo/mes/model/QueueJitPlanModel.java | 27 +++ .../i3plus/pojo/mes/model/mgnbj/CodeRule.java | 23 +++ .../i3plus/pojo/mes/model/mgnbj/Document.java | 23 +++ .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java | 39 ++++ .../estsh/i3plus/pojo/mes/model/mgnbj/Message.java | 22 +++ .../i3plus/pojo/mes/model/mgnbj/OptionCode.java | 22 +++ .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 30 +++ .../estsh/i3plus/pojo/mes/model/mgnbj/Parts.java | 21 ++ .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java | 45 +++++ .../mes/repository/IfEdiInitialDataRepository.java | 16 ++ 15 files changed, 496 insertions(+), 101 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index b1738c3..a5c3a42 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -1,22 +1,33 @@ package cn.estsh.i3plus.pojo.base.common; import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import com.alibaba.fastjson.JSON; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.core.util.QuickWriter; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.io.naming.NameCoder; import com.thoughtworks.xstream.io.naming.NoNameCoder; import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import com.thoughtworks.xstream.io.xml.XppDomDriver; +import lombok.Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import java.io.Serializable; import java.io.Writer; import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import static cn.estsh.i3plus.pojo.base.common.XStreamFactory.toJavaBean; +import static cn.estsh.i3plus.pojo.base.common.XStreamFactory.toXml; /** * @Description : Xml 工厂 - * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm + * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm * @Reference : * @Author : wei.peng * @CreateDate : 19-7-23 下午5:58 @@ -120,9 +131,9 @@ public class XStreamFactory { } - /** * Javabean 转XML + * * @param * @return xml字符串 */ @@ -132,8 +143,8 @@ public class XStreamFactory { for (int i = 1; i < RETRY_NUM; i++) { try { return headLine + xStream.toXML(t); - }catch (Exception e){ - LOGGER.error("Bean To Xml Error Message:{} Number:{}",e.getMessage(),i); + } catch (Exception e) { + LOGGER.error("Bean To Xml Error Message:{} Number:{}", e.getMessage(), i); } } return null; @@ -141,6 +152,7 @@ public class XStreamFactory { /** * Javabean 转XML + * * @param * @return xml字符串 */ @@ -159,101 +171,108 @@ public class XStreamFactory { public static T toJavaBean(String xmlStr) { return (T) xStream.fromXML(xmlStr); } -// -// public static void main(String[] args) { -// User u = new User(0, "zhangsan0", "zhangsanpwd0"); -// User u1 = new User(1, "zhangsan1", "zhangsanpwd"); -// User u2 = new User(2, "zhangsan2", "zhangsanpwd"); -// User u3 = new User(3, "zhangsan3", "zhangsanpwd"); -// -// Role r1 = new Role(1, "Admin", "Admin1"); -// Role r2 = new Role(2, "Admin", "Admin2"); -// Role r3 = new Role(3, "Admin", "Admin3"); -// -// DataAdapter ad = new DataAdapter(10086L,UUID.randomUUID().toString(),"sssfwef",u1); -// u1.setRole(r1); -// -// u2.getRoleList().add(r1); -// u2.getRoleList().add(r2); -// u2.getRoleList().add(r3); -// -// u3.setRole(r1); -// u3.getRoleList().add(r2); -// u3.getRoleList().add(r3); -// -// System.out.println(toXml(u) + "\n\n "); -// System.out.println(toXml(u1) + "\n\n "); -// System.out.println(toXml(u2) + "\n\n "); -// System.out.println(toXml(u3) + "\n\n "); -// System.out.println(toXml(ad) + "\n\n "); -// -// System.out.println(JSON.toJSONString(toJavaBean(toXml(ad)))); -// -// } } + // -//@Data -//@XStreamAlias("DataAdapter") -////对应carInfos元素 -//class DataAdapter implements Serializable { -// -// @XStreamAsAttribute -// private Long scId; -// private String key; -// @XStreamCDATA -// private String resultData; -// -// private Object auth; -// -// public DataAdapter(Long scId, String key, String resultData, Object auth) { -// this.scId = scId; -// this.key = key; -// this.resultData = resultData; -// this.auth = auth; -// } -//} -// -//@Data -//@XStreamAlias("user") -////对应carInfos元素 -//class User implements Serializable { -// private static final long serialVersionUID = -7554548655397869156L; -// -// @XStreamAsAttribute -// private Integer id; -// private String loginName; -// private String loginPwd; -// -// private Role role; -// private List roleList = new ArrayList(); -// private List roleArray; -// -// public User() { -// } -// -// public User(Integer id, String loginName, String loginPwd) { -// this.id = id; -// this.loginName = loginName; -// this.loginPwd = loginPwd; -// } -//} -// -//@Data -//@XStreamAlias("role") -////对应carInfos元素 -//class Role implements Serializable { -// private static final long serialVersionUID = -3134157833696958743L; -// @XStreamAsAttribute -// private Integer id; -// private String roleName; -// private String roleCode; -// -// public Role() { -// } -// -// public Role(Integer id, String roleName, String roleCode) { -// this.id = id; -// this.roleName = roleName; -// this.roleCode = roleCode; -// } -//} \ No newline at end of file +class Test { + public static void main(String[] args) { + User u = new User(0, "zhangsan0", "zhangsanpwd0"); + User u1 = new User(1, "zhangsan1", "zhangsanpwd"); + User u2 = new User(2, "zhangsan2", "zhangsanpwd"); + User u3 = new User(3, "zhangsan3", "zhangsanpwd"); + + Role r1 = new Role(1, "Admin", "Admin1"); + Role r2 = new Role(2, "Admin", "Admin2"); + Role r3 = new Role(3, "Admin", "Admin3"); + + DataAdapter ad = new DataAdapter(10086L, UUID.randomUUID().toString(), "sssfwef", u1); + u1.setRole(r1); + + u2.getRoleList().add(r1); + u2.getRoleList().add(r2); + u2.getRoleList().add(r3); + + u3.setRole(r1); + u3.getRoleList().add(r2); + u3.getRoleList().add(r3); + + System.out.println(toXml(u) + "\n\n "); + System.out.println(toXml(u1) + "\n\n "); + System.out.println(toXml(u2) + "\n\n "); + System.out.println(toXml(u3) + "\n\n "); + System.out.println(toXml(ad) + "\n\n "); + + System.out.println(JSON.toJSONString(toJavaBean(toXml(ad)))); + + } + + + @Data + @XStreamAlias("DataAdapter") + static +//对应carInfos元素 + class DataAdapter implements Serializable { + + @XStreamAsAttribute + private Long scId; + private String key; + @XStreamCDATA + private String resultData; + + private Object auth; + + public DataAdapter(Long scId, String key, String resultData, Object auth) { + this.scId = scId; + this.key = key; + this.resultData = resultData; + this.auth = auth; + } + } + + @Data + @XStreamAlias("user") + static +//对应carInfos元素 + class User implements Serializable { + private static final long serialVersionUID = -7554548655397869156L; + + @XStreamAsAttribute + private Integer id; + private String loginName; + private String loginPwd; + + private Role role; + private List roleList = new ArrayList(); + private List roleArray; + + public User() { + } + + public User(Integer id, String loginName, String loginPwd) { + this.id = id; + this.loginName = loginName; + this.loginPwd = loginPwd; + } + } + + @Data + @XStreamAlias("role") + static +//对应carInfos元素 + class Role implements Serializable { + private static final long serialVersionUID = -3134157833696958743L; + @XStreamAsAttribute + private Integer id; + private String roleName; + private String roleCode; + + public Role() { + } + + public Role(Integer id, String roleName, String roleCode) { + this.id = id; + this.roleName = roleName; + this.roleCode = roleCode; + } + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java new file mode 100644 index 0000000..a735c3d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java @@ -0,0 +1,54 @@ +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 + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_EDI_INITIAL_DATA") +@Api("EDI_初始数据表") +public class IfEdiInitialData extends BaseBean implements Serializable { + private static final long serialVersionUID = -523843818485699827L; + + @Column(name = "PROGRAM_DATA") + @ApiParam("EDI抓取程序代码") + private String programData; + + @Column(name = "CONTENT") + @ApiParam("数据") + private String content; + + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("文件URL") + private String fileUrl; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index 6913759..976542a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -30,6 +30,6 @@ public class CellFeedModel { private String scanQty; - private String LineRemainQty; + private String lineRemainQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java new file mode 100644 index 0000000..e7a11f5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 15:23 + * @desc + */ +@Data +public class EdiFileModel implements Serializable { + private static final long serialVersionUID = 7085611430865514271L; + + private String content; + + private String fileName; + + private String fileUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java new file mode 100644 index 0000000..81f7156 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 14:51 + * @desc + */ +@Data +public class EdiRequestModel implements Serializable { + private static final long serialVersionUID = 7203497485903427292L; + + private String organizeCode; + + private String sourcePath; + + private List files; + + private Integer ediType; + + private String host; + + private String config; + + private String programCode; + + private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java new file mode 100644 index 0000000..83fd71f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 17:17 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class QueueJitPlanModel { + + private MesQueueJitPlan jitPlan; + + private List jitPlanDetails; + + private List jitPlanBoms; +} 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/mgnbj/CodeRule.java new file mode 100644 index 0000000..50601e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:36 + * @desc + */ +@Data +@XStreamAlias("coderule") +public class CodeRule implements Serializable { + private static final long serialVersionUID = 6090471998165282835L; + + @XStreamAlias("code") + private String code; + + @XStreamAlias("type") + private String type; +} 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/mgnbj/Document.java new file mode 100644 index 0000000..cfe4ed4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:32 + * @desc + */ +@Data +@XStreamAlias("document") +public class Document implements Serializable { + private static final long serialVersionUID = 2814403876905527454L; + + @XStreamAlias("head") + private Head head; + + @XStreamAlias("message") + private Message message; +} 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/mgnbj/Head.java new file mode 100644 index 0000000..4d2528a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:32 + * @desc + */ +@Data +@XStreamAlias("head") +public class Head implements Serializable { + private static final long serialVersionUID = 7799977037966652535L; + + @XStreamAlias("customerno") + private String customerno; + + @XStreamAlias("customername") + private String customername; + + @XStreamAlias("plantcode") + private String plantcode; + + @XStreamAlias("plantname") + private String plantname; + + @XStreamAlias("suppliernumber") + private String suppliernumber; + + @XStreamAlias("suppliername") + private String suppliername; + + @XStreamAlias("status") + private String status; + +} 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/mgnbj/Message.java new file mode 100644 index 0000000..6c530e1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamImplicit; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:33 + * @desc + */ +@Data +@XStreamAlias("message") +public class Message implements Serializable { + private static final long serialVersionUID = 8628748312808962449L; + + @XStreamImplicit + List pns; +} 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/mgnbj/OptionCode.java new file mode 100644 index 0000000..8a7070f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:36 + * @desc + */ +@Data +@XStreamAlias("optioncode") +public class OptionCode implements Serializable { + private static final long serialVersionUID = -4790746701135990728L; + + @XStreamAlias("coderule") + private List codeRules; + +} 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 new file mode 100644 index 0000000..300e621 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:35 + * @desc + */ +@Data +@XStreamAlias("part") +public class Part implements Serializable { + private static final long serialVersionUID = -8947770816754458901L; + + @XStreamAlias("item") + private String item; + + @XStreamAlias("dock") + private String dock; + + @XStreamAlias("qty") + private String qty; + + @ApiParam("是否是baseModule") + private boolean isBaseModule; +} 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/mgnbj/Parts.java new file mode 100644 index 0000000..740b5a0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:35 + * @desc + */ +@Data +@XStreamAlias("parts") +public class Parts implements Serializable { + private static final long serialVersionUID = -7294906162624860932L; + + @XStreamAlias("parts") + private List parts; +} 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/mgnbj/Pn.java new file mode 100644 index 0000000..167b4ab --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:33 + * @desc + */ +@Data +@XStreamAlias("PN") +public class Pn implements Serializable { + private static final long serialVersionUID = 194164925380216505L; + + @XStreamAlias("vin") + private String vin; + + @XStreamAlias("seqno") + private String seqno; + + @XStreamAlias("date") + private String date; + + @XStreamAlias("vehicleCode") + private String vehicleCode; + + @XStreamAlias("version") + private String version; + + @XStreamAlias("parts") + private List parts; + + @XStreamAlias("optioncode") + private List codeRules; + + @ApiParam("新vin号") + private String newVin; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java new file mode 100644 index 0000000..63e234d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.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.IfEdiInitialData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface IfEdiInitialDataRepository extends BaseRepository { +} From b68f55b06241b36c5e51ec4868bd6ca4c9460bd5 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 24 Jun 2020 00:59:45 +0800 Subject: [PATCH 101/156] =?UTF-8?q?=E3=80=902193=2006=201.2.3.7.4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?JOB=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 13 +++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 +++ .../estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 4 +++ .../pojo/wms/modelbean/WmsAutoTaskModel.java | 41 ++++++++++++++++++---- 4 files changed, 55 insertions(+), 7 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 b9ad153..c801a52 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 @@ -775,6 +775,19 @@ public class WmsEnumUtil { return tmp; } + public static OUT_MOVEMENT_BUSI_TYPE codeOfs(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { 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 1f57cde..e639538 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 @@ -212,6 +212,10 @@ public class WmsMoveToERP extends BaseBean { @Transient private Long finishedCounts; + @Column(name = "POD_DIR") + @ApiParam(value = "方向") + private Integer podDir; + @Transient private Long shippingId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index 90713b3..1d9ed2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -72,4 +72,8 @@ public class WmsPackageSpec extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, isRequire = 2, dataSrc = "/wms/base-data/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName") private String parentName; + + @Column(name = "DIRECTION") + @ApiParam(value = "方向") + private Integer direction; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java index 16100ef..9ace250 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java @@ -1,8 +1,13 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description : @@ -14,14 +19,36 @@ import java.util.List; @Data public class WmsAutoTaskModel { - String lockLocacte; - String lockCar; + @ApiParam("业务类型") + private Integer busiType; - Integer busiType; + @ApiParam("存储区") + private String zoneNo; - String srcZoneNo; - String descZoneNo; - List partList; + @ApiParam("物料集合") + private List partList; - String organizeCode; + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("交易类型") + private String transTypeCode; + + @ApiParam("锁定库位") + private String lockLocacte; + + @ApiParam("方向") + private Integer direction; + + @ApiParam("货格") + private String packageNo; + + @ApiParam("锁定料车") + private String lockCar; + + @ApiParam("物料对应的明细集合") + Map partNoDetailsList; + + @ApiParam("锁定条码") + HashMap> stringListHashMap; } From 624e8d6461730fec0ce189c37e6e3402de43cec0 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 24 Jun 2020 01:00:28 +0800 Subject: [PATCH 102/156] =?UTF-8?q?=E3=80=902193=2006=201.2.3.7.4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?JOB=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java | 43 ++++++++++++++++++++++ .../repository/WmsAutoTaskLogRecRepository.java | 16 ++++++++ 2 files changed, 59 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoTaskLogRecRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java new file mode 100644 index 0000000..10ccc90 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.wms.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 : jimmy.zeng + * @CreateDate : 2020-06-23 13:55 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_AUTO_TASK_LOG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "自动任务日志", description = "自动任务日志") +public class WmsAutoTaskLog extends BaseBean { + private static final long serialVersionUID = -7839329617395574378L; + + @Column(name = "ORDER_NO") + @ApiParam("关联订单号") + public String orderNo; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + public String busiType; + + @Column(name = "ERROR_MSG") + @ApiParam("错误信息") + public String errorMsg; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoTaskLogRecRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoTaskLogRecRepository.java new file mode 100644 index 0000000..e571629 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoTaskLogRecRepository.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.WmsAutoTaskLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-23 21:46 + * @Modify: + **/ +@Repository +public interface WmsAutoTaskLogRecRepository extends BaseRepository { +} From aaaa591be41050fa6ef1326512478def2f8ca024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 24 Jun 2020 11:31:33 +0800 Subject: [PATCH 103/156] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=BB=91=E5=AE=9A=E9=80=BB=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/bean/MesStationBom.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 a2cd693..85e63bf 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 @@ -138,6 +138,14 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryName; + @Transient + @ApiParam("字符长度") + private Integer length; + + @Transient + @ApiParam("校验内容") + private String checkContent; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From f607860c57ef0b5fc9cca525a6b16c2f1ff9a9ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 24 Jun 2020 11:34:33 +0800 Subject: [PATCH 104/156] =?UTF-8?q?Fix=20Bug=20#8845=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E9=9B=B6=E9=83=A8=E4=BB=B6=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=88=97=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B8=A6=E7=BB=91=E5=AE=9A=E6=9D=A1=E7=A0=81=E7=9A=84=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E3=80=81=E7=89=B9=E5=BE=81=E7=A0=81=E5=86=85=E5=AE=B9?= =?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/mes/bean/MesStationBom.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 a2cd693..85e63bf 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 @@ -138,6 +138,14 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryName; + @Transient + @ApiParam("字符长度") + private Integer length; + + @Transient + @ApiParam("校验内容") + private String checkContent; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 2ce2e20c0b1a1563111d674ef41eec2a59782ded Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 24 Jun 2020 13:16:34 +0800 Subject: [PATCH 105/156] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=AE=A1=E7=AE=97=E6=9C=89=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=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/MesCellFeed.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) 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 41042ca..1363382 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 @@ -12,6 +12,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; /** @@ -66,6 +67,10 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; + @Transient + @ApiParam("工单号") + private String orderNo; + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java index 9386832..ea95f55 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 @@ -66,6 +66,11 @@ public class MesCellFeedRecord extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index 6913759..976542a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -30,6 +30,6 @@ public class CellFeedModel { private String scanQty; - private String LineRemainQty; + private String lineRemainQty; } From b9ac27df19760fa40ecacf08779d8adbc42fd880 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 24 Jun 2020 13:23:16 +0800 Subject: [PATCH 106/156] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.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/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 9bba40c..0a28fe1 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 @@ -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; /** * @Description : 移库单条码表 @@ -78,6 +82,10 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "WORK_ORDER_CODE") + @ApiParam(value = "工单码") + private String workOrderCode; + @Column(name = "SN_TYPE") @ApiParam(value = "条码类型") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") From 2829bb5afbeb03607970d3ab56ae1d812dc67b5c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 24 Jun 2020 15:35:51 +0800 Subject: [PATCH 107/156] =?UTF-8?q?pcn=E5=90=8C=E6=AD=A5=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/repository/MesContainerRepository.java | 2 ++ .../pojo/mes/repository/MesContainerTypeRepository.java | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.java index 0e8dd97..9553592 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.IfDismantleRecord; import cn.estsh.i3plus.pojo.mes.bean.MesContainer; +import org.springframework.stereotype.Repository; /** * @Description: @@ -11,5 +12,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesContainer; * @CreateDate: 2019\11\18 10:33 * @Modify: **/ +@Repository public interface MesContainerRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.java new file mode 100644 index 0000000..a3792ea --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.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.MesContainerType; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/6/24 3:34 下午 + * @Modify: + */ +@Repository +public interface MesContainerTypeRepository extends BaseRepository { +} From 08fe2de0180bdcdb25e708171d009bec29bd51af Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 24 Jun 2020 17:14:32 +0800 Subject: [PATCH 108/156] mes --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 ++++++++++ 1 file changed, 10 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 c91e8b0..b5b8273 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 @@ -5102,6 +5102,16 @@ public class MesEnumUtil { } 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; + } } /** From cf1020d82f4880da4f6862e2d6436d1a6668ddca Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 24 Jun 2020 17:15:38 +0800 Subject: [PATCH 109/156] =?UTF-8?q?=E5=88=A0=E9=99=A4@Lob?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 3c83ccd..f22f371 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -80,7 +80,6 @@ public class MesPcnTask extends BaseBean implements Serializable { @ApiParam("任务周期描述") private String taskCycleDescription; - @Lob @Column(name = "TASK_PARAM") @ApiParam("任务参数") private String taskParam; From 62c9d8d27dc395fd4f4c63bcf8947f65924df63f Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 24 Jun 2020 17:54:19 +0800 Subject: [PATCH 110/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AC=A7=E6=B4=B2FIF?= =?UTF-8?q?O=E8=B7=B3=E8=BF=87=E6=9C=AA=E8=BF=9B=E8=A1=8C=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E5=A4=84=E7=90=86Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 2e166b2..80ee2b6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -117,4 +117,8 @@ public class AmpJisRec extends BaseBean { this.qty = qty; this.unit = unit; } + + public AmpJisRec() { + + } } From e3a86fdbab2dcf842ccc307bc72464e32183913a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 24 Jun 2020 19:14:00 +0800 Subject: [PATCH 111/156] =?UTF-8?q?=E6=B6=82=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E3=80=81=E6=B6=82=E8=A3=85=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=81=94=E8=B0=83?= 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 0539818..59975a8 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 @@ -357,6 +357,10 @@ public class MesPcnHqlPack { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); } + if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) { + DdlPreparedPack.getNumEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); + } + // 时间段查询 if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( From 6f454c95a4a4595bb6d1ebb393e337ee21ac707e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 24 Jun 2020 19:54:49 +0800 Subject: [PATCH 112/156] Start Task #2212,2205 Cost:8h Left:16h --- .../estsh/i3plus/pojo/mes/model/ProdPackModel.java | 30 ++++++++++++++++------ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 4 ++- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index f4a4de9..63903d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -4,6 +4,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : 涂装工单条码-展示组件(产品包装)model * @Reference : @@ -13,35 +15,47 @@ import lombok.Data; **/ @Data @Api("产品包装model") -public class ProdPackModel { +public class ProdPackModel implements Serializable { // 产品条码表--产品条码 @ApiParam("产品条码") - private String productSn; + public String productSn; // 包装主表--包装编号 @ApiParam("一检箱条码") - private String packageNo; + public String packageNo; // 包装明细表--创建时间 @ApiParam("一检校验时间") - private String createDatetime; + public String createDatetime; // 包装主表--打印状态(10：未打印 20：已打印) @ApiParam("箱条码状态") - private Integer printStatus; + public Integer printStatus; // 涂装客户标签打印 @ApiParam("客户标签") - private String custSn; + public String custSn; // 涂装客户标签打印 @ApiParam("当前工序") - private String processCode; + public String processCode; // 涂装客户标签打印 @ApiParam("更新时间") - private String modifyDateTime; + public String modifyDateTime; + + @ApiParam("工单号") + public String workOrderNo; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("物料号") + public String parentPartNo; + + public ProdPackModel() { + } public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) { this.productSn = productSn; 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 59975a8..60c7e68 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 @@ -640,7 +640,9 @@ public class MesPcnHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } - DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + } // 时间段查询 if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { DdlPreparedPack.timeBuilder( From 3b5142a1f8aff85de77df33123b617aeed82ae09 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 26 Jun 2020 15:16:17 +0800 Subject: [PATCH 113/156] edi --- .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 19 +++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java | 3 +++ 2 files changed, 22 insertions(+) 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 300e621..09dd62f 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 @@ -27,4 +27,23 @@ public class Part implements Serializable { @ApiParam("是否是baseModule") private boolean isBaseModule; + + @ApiParam("前左数量") + private String flQty = "0"; + + @ApiParam("前右数量") + private String frQty = "0"; + + @ApiParam("后左数量") + private String rlQty = "0"; + + @ApiParam("后右数量") + private String rrQty = "0"; + + @ApiParam("配方") + private String recipeItem; + + @ApiParam("配方顺序") + private String recipeSeq; + } 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/mgnbj/Pn.java index 167b4ab..c1d74b6 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/mgnbj/Pn.java @@ -41,5 +41,8 @@ public class Pn implements Serializable { @ApiParam("新vin号") private String newVin; + @ApiParam("新vin号") + private Boolean result; + } From 370b09972906d530e4336fc26d0c11f78e54cfd5 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 27 Jun 2020 11:53:28 +0800 Subject: [PATCH 114/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= 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 932bdd9..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-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 5269cfb7322956469ea22cca9e69d1499ef01351 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 28 Jun 2020 09:36:44 +0800 Subject: [PATCH 115/156] =?UTF-8?q?BH=20=E9=9C=80=E6=B1=82=E4=BF=AE?= =?UTF-8?q?=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/wms/bean/WmsDocMovementSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 0a28fe1..2db18a2 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 @@ -86,6 +86,10 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "工单码") private String workOrderCode; + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + private String seqNo; + @Column(name = "SN_TYPE") @ApiParam(value = "条码类型") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") From 2478fc3b14e4de400b63dad335a2106c76fafe49 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 28 Jun 2020 10:13:39 +0800 Subject: [PATCH 116/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=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/MesCellFeed.java | 5 ----- sonar-project.properties | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) 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 0b9d661..1363382 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 @@ -31,11 +31,6 @@ import java.io.Serializable; @Api("工位投料信息") public class MesCellFeed extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369479107782L; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..3428e74 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 272d647073a23334e989336293b624dfcd728cde Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 28 Jun 2020 10:29:29 +0800 Subject: [PATCH 117/156] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A12219?= =?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/MesPcnEnumUtil.java | 2 +- .../i3plus/pojo/mes/bean/MesCellFeedRecord.java | 5 +++ .../i3plus/pojo/mes/bean/MesProdWorkCenter.java | 50 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 +- .../repository/MesProdWorkCenterRepository.java | 16 +++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 ++++++++ 6 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.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 e92e50f..034f476 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 @@ -2479,7 +2479,7 @@ public class MesPcnEnumUtil { public enum PACKAGE_PRINT_STATUS { UNPRINTED(10, "未打印"), - PRINTED(20, "打印"); + PRINTED(20, "已打印"); private int value; private String description; 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 9386832..c15fc1b 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 @@ -30,6 +30,11 @@ import java.io.Serializable; @Api("工位投料履历信息") public class MesCellFeedRecord extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369489107783L; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + @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/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java new file mode 100644 index 0000000..c4eae0c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.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.Table; +import java.io.Serializable; + +/** + * @Description :产品工作中心配置 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_WORK_CENTER") +@Api("产品工作中心配置") +public class MesProdWorkCenter extends BaseBean implements Serializable { + + private static final long serialVersionUID = 9215737252535074536L; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "IS_DEFAULT") + @ApiParam("是否默认") + private Integer isDefault; + + @Column(name = "PART_SN") + @ApiParam("料箱条码") + private String partSn; +} 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 c1296dd..7a2bf4c 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 @@ -181,7 +181,9 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型名称") private String snTypeName; - + @Transient + @ApiParam("条码打印状态名称") + private String printStatusName; public MesProduceSn() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.java new file mode 100644 index 0000000..80e0299 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.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.MesProdWorkCenter; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesProdWorkCenterRepository 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 275d38f..9a34660 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 @@ -3113,4 +3113,21 @@ public class MesHqlPack { } return packBean; } + + /** + * 产品工作中心配置 + * @param prodWorkCenter + * @param organizeCode + * @return + */ + public static DdlPackBean getMesProdWorkCenter(MesProdWorkCenter prodWorkCenter, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodWorkCenter, organizeCode); + if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } } From e42ea19f37c0d18eb72b2e752879c575ee7b288d Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 28 Jun 2020 10:54:35 +0800 Subject: [PATCH 118/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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/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 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 4 ---- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java | 6 ------ 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 +- 23 files changed, 21 insertions(+), 31 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 577686d..807bef5 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 f714b7d..b948580 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 b7991cc..e12eaee 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 0648e9f..c338f71 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 3b9e57a..7637865 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 b1911ec..d98b7d8 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 56d54cb..bf96e57 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 830caa5..a758a6a 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/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index 0b9d661..63a9ad3 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 @@ -32,10 +32,6 @@ import java.io.Serializable; public class MesCellFeed extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369479107782L; - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - @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/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java index b2de6c4..aa1dc88 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 @@ -71,12 +71,6 @@ public class MesCellFeedRecord extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - - - public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index fb51da0..efacfd2 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 78bbdef..dba12cc 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 fb44d00..81670b2 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 dc4ea86..26a7311 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 8571a5f..eaf2544 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 e36258d..0f615b6 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 9915420..9e5f745 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 61027b2..0fea52b 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 c2104bf..cc8fce6 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 55e4e84..932bdd9 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 0626d6f969a65b4093ec466ed13f73044e3db1a8 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 28 Jun 2020 11:01:16 +0800 Subject: [PATCH 119/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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/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 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 4 ---- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java | 6 ------ 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 +- 22 files changed, 20 insertions(+), 30 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..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-PROD-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 8ef99a3..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-PROD-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 577686d..9f9717e 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index f714b7d..a9e288f 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index b7991cc..a44418c 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 0648e9f..2de88b5 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index f10cf39..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-PROD-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 3b9e57a..50ab2c2 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index b1911ec..7f94617 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-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 56d54cb..d800ecf 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 830caa5..60fc467 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 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 0b9d661..63a9ad3 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 @@ -32,10 +32,6 @@ import java.io.Serializable; public class MesCellFeed extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369479107782L; - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - @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/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java index b2de6c4..aa1dc88 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 @@ -71,12 +71,6 @@ public class MesCellFeedRecord extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - - - public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index fb51da0..d65e031 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 78bbdef..a785f21 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index fb44d00..d6d2f8e 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index dc4ea86..0fbfb69 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 8571a5f..76739f9 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index e36258d..0368700 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9915420..b2eedd4 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 61027b2..5fcd08a 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c2104bf..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 6cd70eb6953e8fedb74500b3515c9a0016ed48e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 28 Jun 2020 14:02:21 +0800 Subject: [PATCH 120/156] =?UTF-8?q?3D=E4=BB=93=E5=BA=93=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsLocateListModel.java | 23 +++++ .../pojo/model/wms/engine/domain/LocateAssign.java | 61 +++++++++++ .../engine/domain/LocateStrengthComparator.java | 11 ++ .../engine/domain/LocationStrengthComparator.java | 11 ++ .../engine/domain/WmsThreeDimenLocateModel.java | 114 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +- 6 files changed, 221 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateListModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateAssign.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateStrengthComparator.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocationStrengthComparator.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/WmsThreeDimenLocateModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateListModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateListModel.java new file mode 100644 index 0000000..00439af --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateListModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.model.wms.engine.domain.WmsThreeDimenLocateModel; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 3D仓库-库位优化模型 + * @Reference + * @Author dragon + * @CreateDate 2020/6/1 14:22 + * @Modify + */ +@Data +public class WmsLocateListModel implements Serializable { + private static final long serialVersionUID = -2672721389336190491L; + + List unsolvedLocates; + + String organizeCode; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateAssign.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateAssign.java new file mode 100644 index 0000000..32d4268 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateAssign.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.model.wms.engine.domain; + +import lombok.Getter; +import org.optaplanner.core.api.domain.solution.PlanningEntityCollectionProperty; +import org.optaplanner.core.api.domain.solution.PlanningScore; +import org.optaplanner.core.api.domain.solution.PlanningSolution; +import org.optaplanner.core.api.domain.solution.drools.ProblemFactCollectionProperty; +import org.optaplanner.core.api.domain.valuerange.ValueRangeProvider; +import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore; + +import java.util.List; + +@PlanningSolution +public class LocateAssign { + + private List wmsThreeDimenLocateModelList; + private List locationList; + /** + * 平均进出库次数，用于分数计算 + */ + @Getter + private int avgLocateFrequence; + + private HardSoftScore score; + + @ValueRangeProvider(id = "locationRange") + @ProblemFactCollectionProperty + public List getLocationList() { + return this.locationList; + } + + public void setLocationList(List locationList) { + this.locationList = locationList; + } + + @PlanningEntityCollectionProperty + public List getWmsThreeDimenLocateModelList() { + return this.wmsThreeDimenLocateModelList; + } + + public void setWmsThreeDimenLocateModelList(List wmsThreeDimenLocateModelList) { + this.wmsThreeDimenLocateModelList = wmsThreeDimenLocateModelList; + + long totalFrequence = 0; + + for (WmsThreeDimenLocateModel wmsThreeDimenLocateModel : wmsThreeDimenLocateModelList) { + totalFrequence += wmsThreeDimenLocateModel.getFrequency(); + } + // 计算平均进出库次数 + this.avgLocateFrequence = (int)(totalFrequence / wmsThreeDimenLocateModelList.size()); + } + + @PlanningScore + public HardSoftScore getScore() { + return this.score; + } + + public void setScore(HardSoftScore score) { + this.score = score; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateStrengthComparator.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateStrengthComparator.java new file mode 100644 index 0000000..c1d191f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateStrengthComparator.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.model.wms.engine.domain; + + +import java.util.Comparator; + +public class LocateStrengthComparator implements Comparator { + @Override + public int compare(WmsThreeDimenLocateModel o1, WmsThreeDimenLocateModel o2) { + return o1.getFrequency() - o2.getFrequency(); + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocationStrengthComparator.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocationStrengthComparator.java new file mode 100644 index 0000000..d097975 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocationStrengthComparator.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.model.wms.engine.domain; + + +import java.util.Comparator; + +public class LocationStrengthComparator implements Comparator { + @Override + public int compare(Integer seq1, Integer seq2) { + return seq1 - seq2; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/WmsThreeDimenLocateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/WmsThreeDimenLocateModel.java new file mode 100644 index 0000000..8167e1f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/WmsThreeDimenLocateModel.java @@ -0,0 +1,114 @@ +package cn.estsh.i3plus.pojo.model.wms.engine.domain; + +import lombok.Getter; +import lombok.Setter; +import org.optaplanner.core.api.domain.entity.PlanningEntity; +import org.optaplanner.core.api.domain.lookup.PlanningId; +import org.optaplanner.core.api.domain.variable.PlanningVariable; + + +/** + * 库位 + */ +@PlanningEntity(difficultyComparatorClass = LocateStrengthComparator.class) +public class WmsThreeDimenLocateModel { + /** + * 工厂代码 + */ + @Getter + @Setter + private String organizeCode; + /** + * 仓库编码 + */ + @Getter + @Setter + private String whNo; + /** + * 存储区编码 + */ + @Getter + @Setter + private String zoneNo; + /** + * 家具编码 + */ + @Getter + @Setter + private String furnitureNo; + /** + * 库位代码 + */ + @Getter + @Setter + @PlanningId + private String locateNo; + /** + * X + */ + @Getter + @Setter + private int x; + + /** + * X + */ + @Getter + @Setter + private int y; + + /** + * X + */ + @Getter + @Setter + private int z; + /* + 库位在指定时间内的移动频率 + */ + @Getter + @Setter + private int frequency; + /** + * 库位的原始坐标 + */ + @Getter + @Setter + private int originSeq; + /** + * 库位当前的坐标，此处只用了一纬坐标，二维坐标需要映射到一纬空间内 + */ + private int destSeq; + + + public WmsThreeDimenLocateModel() { + } + + //3D仓库-库位移动频率热力图 + public WmsThreeDimenLocateModel(String organizeCode, String whNo, String zoneNo, + String locateNo, Integer seq, Long frequency, String furnitureNo, + Integer x, Integer y, Integer z) { + this.organizeCode = organizeCode; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.originSeq = seq; + this.destSeq = seq; + this.frequency = Integer.parseInt(frequency.toString()); + this.furnitureNo = furnitureNo; + this.x = x; + this.y = y; + this.z = z; + } + + @PlanningVariable(valueRangeProviderRefs = {"locationRange"}, + strengthComparatorClass = LocationStrengthComparator.class) + public Integer getDestSeq() { + return this.destSeq; + } + + public void setDestSeq(Integer destSeq) { + this.destSeq = destSeq; + } + +} 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 bb526fb..4a0f756 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 @@ -564,9 +564,8 @@ public class WmsHqlPack { DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result); } if (wmsLocate.getLocateNoArr() != null) { - DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "locateNo", result); + DdlPreparedPack.getInPackArray(wmsLocate.getLocateNoArr(), "locateNo", result); } - // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); From 472b2f1ee60be95bec10e2f5953aaee4ad833ec7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 28 Jun 2020 14:48:56 +0800 Subject: [PATCH 121/156] bug 9149 --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 9 +++++++++ 1 file changed, 9 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 b5b8273..d21cdeb 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 @@ -5804,6 +5804,15 @@ public class MesEnumUtil { } return tmp; } + public static String codeOfValue(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** From 295860683a18776b61e8441401bcadca09e491da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sun, 28 Jun 2020 18:09:57 +0800 Subject: [PATCH 122/156] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=B7=A5=E4=BD=8D=E5=92=8C=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E3=80=81=E4=BA=8C=E6=AC=A1=E7=AE=B1=E6=9D=A1=E7=A0=81Un-Pack-?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=BC=80=E5=8F=91=E4=B8=9A=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 60 ++++++++++++++- .../estsh/i3plus/pojo/mes/bean/IfDefectData.java | 90 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 4 + .../i3plus/pojo/mes/bean/MesDefectRecord.java | 5 +- .../i3plus/pojo/mes/model/PackageSnModel.java | 36 +++++++++ .../i3plus/pojo/mes/model/PaintCheckModel.java | 60 +++++++++++++++ .../i3plus/pojo/mes/model/PaintOnLineModel.java | 3 + .../mes/repository/IfDefectDataRepository.java | 17 ++++ 9 files changed, 275 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.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 c91e8b0..321e7da 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 @@ -3650,7 +3650,8 @@ public class MesEnumUtil { QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), SCRAPED(30, "报废"), - DISMANTLED(40, "已拆解"); + DISMANTLED(40, "已拆解"), + PRE_CHECK(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 e92e50f..ccf6bc4 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 @@ -717,7 +717,8 @@ public class MesPcnEnumUtil { QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), SCRAPED(30, "报废"), - DISMANTLED(40, "已拆解"); + DISMANTLED(40, "已拆解"), + PRE_CHECK(50, "待检测"); private int value; private String description; @@ -4257,4 +4258,61 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 不良品处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BAD_HANDLE_TYPE { + BACK_SPRAY(10, "BACK_SPRAY", "返喷"), + SCRAPPED(20, "SCRAPPED", "报废"), + POLISH(30, "POLISH", "抛光"), + DETERMINED(40, "DETERMINED", "待定"); + + 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 String valueOfDescription(int val) { + return valueOf(val); + } + } } 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 new file mode 100644 index 0000000..d95ebc1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java @@ -0,0 +1,90 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :不良信息接口表 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_DEFECT_DATA") +@Api("不良信息接口数据") +public class IfDefectData extends BaseBean implements Serializable { + private static final long serialVersionUID = 4320604250440221049L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serailNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private Integer defectActionType; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Lob + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_TYPE") + @ApiParam("动作代码") + private String actionType; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index cb0f1b4..a4a2dca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("项目代码") private String prodCfgTypeCode; + @Column(name = "DEFECT_FLAG_VALUE") + @ApiParam("缺陷标识值") + private String defectFlagValue; + @Transient @ApiParam("缺陷类型名称") private String defectTypeName; 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 793563e..fbd81ad 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 @@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.Date; import java.util.List; /** @@ -81,6 +80,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("备注") private String memo; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private Integer defectActionType; + @Transient private List mesDefectList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java new file mode 100644 index 0000000..ae0de27 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 条码解绑实体 + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class PackageSnModel { + + @ApiParam("包装条码") + private String packageNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("批次") + private String lotNo; + + @ApiParam("创建人") + private String createUser; + + @ApiParam("创建时间") + private String createDateTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java new file mode 100644 index 0000000..80c483b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import java.util.List; + +/** + * @Author: siliter.yuan + * @CreateDate: 2020/6/28 8:06 PM + * @Description: + **/ +@Data +@Api("涂装检测MODEL") +public class PaintCheckModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色") + private String color; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("界面编号") + private String windowNo; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("缺陷描述") + private String defectDesc; + + @ApiParam("缺陷标识值") + private String defectFlagValue; + + @ApiParam("不良品处理类型") + private Integer defectActionType; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("界面组件参数数据") + List windowModuleParamList; +} 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 f1f7d53..9ab41c8 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 @@ -46,4 +46,7 @@ public class PaintOnLineModel { @ApiParam("圈数") private Integer rounds; + + @ApiParam("过程条码") + private String serialNumber; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.java new file mode 100644 index 0000000..6e3b966 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.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.IfDefectData; +import org.springframework.stereotype.Repository; + +/** + * @Description : if不良信息接口 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 16:49 + * @Modify: + **/ +@Repository +public interface IfDefectDataRepository extends BaseRepository { + +} From 9d79ed53764d4c149ebc48a2f2a18fc1f173b6c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 28 Jun 2020 20:33:38 +0800 Subject: [PATCH 123/156] =?UTF-8?q?3D=E4=BB=93=E5=BA=93=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 13 +++++++++++++ modules/i3plus-pojo-wms/pom.xml | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..215b102 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -59,6 +59,19 @@ i3plus-pojo-lac + + + org.optaplanner + optaplanner-core + 7.36.0.Final + + + + org.optaplanner + optaplanner-persistence-jpa + 7.36.0.Final + + diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9e5f745..183a03c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -22,6 +22,20 @@ + + + + org.optaplanner + optaplanner-core + 7.36.0.Final + + + + org.optaplanner + optaplanner-persistence-jpa + 7.36.0.Final + + From d44312c470b3a7c90c2b2c75d80bb948e4ee1f6f Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 28 Jun 2020 20:46:42 +0800 Subject: [PATCH 124/156] Fix Bug #9151 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 4 ++++ 2 files changed, 6 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 d21cdeb..51958b0 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 @@ -1919,7 +1919,8 @@ public class MesEnumUtil { NEW_SCATTER_BOM(460, "scatterBomCfgExcelService", "新散件BOM导入"), ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"), SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"), - MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"); + MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"), + MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"); private int value; private String service; 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 5dd8c97..752cdd2 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 @@ -55,6 +55,10 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("数据下限") private Double lowerLimit; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + @Column(name = "WORK_CELL_CODE") @ApiParam("工位") private String workCellCode; From aabd7b5d1d1dbdce6a8912d22aedd7427456e117 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 28 Jun 2020 21:02:23 +0800 Subject: [PATCH 125/156] Fix Bug #9112 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ 2 files changed, 8 insertions(+) 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 e02f6cf..280de6b 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 @@ -111,4 +111,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") private String custDeliveryLocation; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; } 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 141f713..2be9e5b 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 @@ -127,4 +127,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "CT_NO") @ApiParam("容器编号") private String ctNo; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; } From d2869dc31a26e658a0d72b166a7626c82954d373 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 28 Jun 2020 21:38:27 +0800 Subject: [PATCH 126/156] tmp --- .../i3plus/pojo/mes/bean/IfEdiInitialData.java | 2 + .../i3plus/pojo/mes/bean/IfQueueShipping.java | 24 +++++- .../i3plus/pojo/mes/bean/MesEdiParserConfig.java | 52 +++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 31 ++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 10 ++- .../pojo/mes/bean/MesQueueJitPlanDetail.java | 13 ++++ .../i3plus/pojo/mes/model/EdiRequestModel.java | 10 ++- .../pojo/mes/model/mgnbj/MgnBjJitPlanModel.java | 88 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 15 +++- .../repository/MesEdiParserConfigRepository.java | 16 ++++ 10 files changed, 252 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java index a735c3d..a41617f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java @@ -12,6 +12,7 @@ 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; @@ -42,6 +43,7 @@ public class IfEdiInitialData extends BaseBean implements Serializable { @ApiParam("文件名称") private String fileName; + @Lob @Column(name = "FILE_URL") @ApiParam("文件URL") private String fileUrl; 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 a4ba000..d65c83c 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 @@ -79,7 +79,6 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("产品位置") private String produceCategoryCode; - @Column(name = "QUEUE_GROUP_NO") @ApiParam("分组队列编号") private String queueGroupNo; @@ -109,6 +108,10 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("原材料物料号") private String itemPartNo; + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; + @Column(name = "ITEM_PART_NAME") @ApiParam("原材料物料名称") private String itemPartName; @@ -121,4 +124,23 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("原材料物料用量") private String itemUnit; + @Column(name = "JIT_SEQ") + @ApiParam("jit排序号") + private String jitSeq; + + @Column(name = "JIT_TYPE_FLAG") + @ApiParam("jit类型标识") + private String jitTypeFlag; + + @Column(name = "CUST_POINT_DATE") + @ApiParam("客户需求时间") + private String custPointDate; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantDate; + + @Column(name = "DOCK_NO") + @ApiParam("道口") + private String dockNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java new file mode 100644 index 0000000..5e4db8a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java @@ -0,0 +1,52 @@ +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/6/27 21:39 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EDI_PARSER_CONFIG") +@Api("EDI解析配置表") +public class MesEdiParserConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = 7225381299744633270L; + + @Column(name = "PARSER_CODE") + @ApiParam("解析配置代码") + private String parserCode; + + @Column(name = "PARSER_NAME") + @ApiParam("解析配置名称") + private String parserName; + + @Column(name = "PARSER_TYPE") + @ApiParam("解析程序集") + private String parserType; + + @Column(name = "GETTING_CODE") + @ApiParam("edi抓取程序代码") + private String gettingCode; + + @Column(name = "CURRENT_ORDER") + @ApiParam("当前订单号") + private String currentOrder; + + +} 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 d982dab..e51b3f0 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 @@ -10,6 +10,7 @@ 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; @@ -74,4 +75,34 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "VERSION") @ApiParam("版本号") private String version; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Lob + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SUPPLIER_NAME") + @ApiParam("供应商名称") + private String supplierName; + + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("文件url") + private String fileUrl; + } 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 1d9faad..5177ba9 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 @@ -35,13 +35,17 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @ApiParam("队列编号") private String jisPlanNo; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name = "ITEM_PART_NO") - @ApiParam("原材料物料号") - private String itemPartNo; + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; @Column(name = "DOCK_NO") @ApiParam("道口") 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 7111b75..ed527ce 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 @@ -46,4 +46,17 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { @Column(name = "PART_NAME") @ApiParam("产品名称") private String partName; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java index 81f7156..e1361c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java @@ -19,15 +19,23 @@ public class EdiRequestModel implements Serializable { private String sourcePath; - private List files; + private String fileName; + + private String fileUrl; + + private String content; private Integer ediType; + private String ediCode; + private String host; private String config; private String programCode; + private String messageType; + private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); } 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 new file mode 100644 index 0000000..c62cdd3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java @@ -0,0 +1,88 @@ +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.stream.Collectors; + +/** + * @author Wynne.Lu + * @date 2020/6/27 15:39 + * @desc + */ +@Data +@NoArgsConstructor +public class MgnBjJitPlanModel { + + private String org; + + private String userInfo; + + private List scatterBomCfgOptions; + + private List scatterBomCfgBaseModules; + + private List messageCustPartNos; + + private List messageCodeRules; + + private List flPnParts; + + private String flPnRecipe; + + private List frPnParts; + + private String frPnRecipe; + + private List rlPnParts; + + private String rlPnRecipe; + + private List rrPnParts; + + private String rrPnRecipe; + + private Map> groupPartsMap = new HashMap<>(); + + private Map> recipePartsMap = new HashMap<>(); + + public void setFlPnParts(List flPnParts) { + this.groupPartsMap.put("FL", flPnParts); + this.flPnRecipe = getGroupRecipe(flPnParts); + this.flPnParts = flPnParts; + } + + public void setFrPnParts(List frPnParts) { + this.groupPartsMap.put("FR", frPnParts); + this.frPnRecipe = getGroupRecipe(frPnParts); + this.frPnParts = frPnParts; + } + + public void setRlPnParts(List rlPnParts) { + this.groupPartsMap.put("RL", rlPnParts); + this.rlPnRecipe = getGroupRecipe(rlPnParts); + this.rlPnParts = rlPnParts; + } + + public void setRrPnParts(List rrPnParts) { + this.groupPartsMap.put("RR", rrPnParts); + this.rrPnRecipe = getGroupRecipe(rrPnParts); + this.rrPnParts = rrPnParts; + } + + public MgnBjJitPlanModel(String org, String userInfo) { + this.org = org; + this.userInfo = userInfo; + } + + private String getGroupRecipe(List groupParts) { + List groupPartsRecipe = groupParts.stream().filter(d -> StringUtils.isNotBlank(d.getRecipeSeq())) + .sorted(Comparator.comparing(Part::getRecipeSeq)) + .map(Part::getRecipeItem) + .collect(Collectors.toList()); + return String.join("", groupPartsRecipe); + } +} 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 09dd62f..f6024e5 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 @@ -29,16 +29,19 @@ public class Part implements Serializable { private boolean isBaseModule; @ApiParam("前左数量") - private String flQty = "0"; + private String flQty; @ApiParam("前右数量") - private String frQty = "0"; + private String frQty; @ApiParam("后左数量") - private String rlQty = "0"; + private String rlQty; @ApiParam("后右数量") - private String rrQty = "0"; + private String rrQty; + + @ApiParam("产品位置") + private String produceCtgyCode; @ApiParam("配方") private String recipeItem; @@ -46,4 +49,8 @@ public class Part implements Serializable { @ApiParam("配方顺序") private String recipeSeq; + + @ApiParam("Mes物料号") + private String partNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java new file mode 100644 index 0000000..031775b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.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.MesEdiParserConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesEdiParserConfigRepository extends BaseRepository { +} From aa09a31957c41861d14754b1b8406ca57fee8add Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 29 Jun 2020 11:22:44 +0800 Subject: [PATCH 127/156] =?UTF-8?q?=E3=80=90=E6=99=BA=E8=83=BD=E5=8C=96?= =?UTF-8?q?=E5=BC=80=E5=8F=91-=E9=94=81=E5=AE=9A=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java index 9ace250..13204cf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java @@ -47,8 +47,20 @@ public class WmsAutoTaskModel { private String lockCar; @ApiParam("物料对应的明细集合") - Map partNoDetailsList; + private Map partNoDetailsList; + + @ApiParam("锁定物料对应的条码") + private Map> stringListHashMap; @ApiParam("锁定条码") - HashMap> stringListHashMap; + private List lockStockSnList; + + @ApiParam("单据更新状态") + private Integer updateOrderStatus; + + @ApiParam("任务生成数量") + private Double taskQty; + + @ApiParam("返回错误信息") + public String errorMsg; } From 31d7b71872a5ebf8ba5245120d07a0c6cb60f884 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 29 Jun 2020 11:37:03 +0800 Subject: [PATCH 128/156] mes enum order type --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 ++++++++++ 1 file changed, 10 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 b5b8273..3696fa3 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 @@ -3290,6 +3290,16 @@ public class MesEnumUtil { } 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; + } } /** From 473ebd5ec80e822c9dce9bdbc67a6d38b615c395 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 29 Jun 2020 15:17:47 +0800 Subject: [PATCH 129/156] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2219]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 3 +++ 1 file changed, 3 insertions(+) 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 63a9ad3..30574fe 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 @@ -72,6 +72,9 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("工单号") private String orderNo; + @Transient + @ApiParam(value = "原料类型名称") + private String rawTypeName; public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; From b1dddb62d3c2c1072fada122cc8e35e70a8fdb76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 29 Jun 2020 15:22:53 +0800 Subject: [PATCH 130/156] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=B7=A5=E4=BD=8D=E5=92=8C=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E3=80=81=E4=BA=8C=E6=AC=A1=E7=AE=B1=E6=9D=A1=E7=A0=81Un-Pack-?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=BC=80=E5=8F=91=E4=B8=9A=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 60c7e68..ce8737a 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 @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.sqlpack; 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.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; @@ -358,7 +357,7 @@ public class MesPcnHqlPack { } if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) { - DdlPreparedPack.getNumEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } // 时间段查询 From 9475667e74a8a15ca42b01a897a6fb13656db2e2 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 29 Jun 2020 16:31:34 +0800 Subject: [PATCH 131/156] Finish Task #2134 Cost: 8h --- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 4 +- .../i3plus/pojo/aps/model/DelaySalesOrder.java | 14 +++++++ .../i3plus/pojo/aps/model/LargeSpanOrder.java | 13 +++++++ .../pojo/aps/model/MaterialDeliveryAnalyze.java | 26 ++++++++++++- .../i3plus/pojo/aps/model/PrematureProduct.java | 13 +++++++ .../i3plus/pojo/aps/model/ScheduleAnalyze.java | 43 ++++++++++++++++++++++ 6 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 0cd8116..a440ae8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -388,7 +388,9 @@ public class BeanRelation { List relaBeans = list(bean, holders[index]); for (BaseBean relaBean : relaBeans) { - recursionImpl(relaBean, fun, holders, index + 1); + if (relaBean.getId() != bean.getId()) { + recursionImpl(relaBean, fun, holders, index + 1); + } } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java index 9d24208..540a328 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java @@ -1,5 +1,9 @@ package cn.estsh.i3plus.pojo.aps.model; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -14,6 +18,10 @@ import java.util.Date; **/ @Data public class DelaySalesOrder { + + @ApiParam(value ="订单ID") + private Long orderId; + @ApiParam(value ="订单编码") private String orderCode; @@ -30,12 +38,18 @@ public class DelaySalesOrder { private Double count; @ApiParam(value ="最晚结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date let; @ApiParam(value ="计划开始时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date planStart; @ApiParam(value ="计划结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date planEnd; @ApiParam(value ="总跨度时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java index 134243a..5ddc2dd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java @@ -1,5 +1,9 @@ package cn.estsh.i3plus.pojo.aps.model; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -14,6 +18,9 @@ import java.util.Date; **/ @Data public class LargeSpanOrder { + @ApiParam(value ="订单ID") + private Long orderId; + @ApiParam(value ="订单编码") private String orderCode; @@ -30,12 +37,18 @@ public class LargeSpanOrder { private Double count; @ApiParam(value ="最晚结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date let; @ApiParam(value ="计划开始时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date planStart; @ApiParam(value ="计划结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date planEnd; @ApiParam(value ="总跨度时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java index 5e6421d..c7a0500 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java @@ -1,5 +1,10 @@ package cn.estsh.i3plus.pojo.aps.model; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.Date; @@ -13,24 +18,43 @@ import java.util.Date; **/ @Data public class MaterialDeliveryAnalyze { + @ApiParam(value ="订单ID") + private Long orderId; + @ApiParam(value ="订单编码") private String orderCode; + @ApiParam(value ="订单名称") private String orderName; + @ApiParam(value ="物料编码") private String materialCode; + @ApiParam(value ="物料名称") private String materialName; + @ApiParam(value ="标签名称") private String labelName; + @ApiParam(value ="标签颜色") private String labelColor; + @ApiParam(value ="需求数量") + private Double requireCount; + + @ApiParam(value ="需求日期") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date requireDate; + @ApiParam(value ="最早到货日期") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date arrivalDate; - private Double requireCount; + // 0正常显示，1显示红色 + @ApiParam(value ="背景显示颜色") + private Integer backgroundColor; private Double count; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java index bd33577..4080aa9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java @@ -1,5 +1,9 @@ package cn.estsh.i3plus.pojo.aps.model; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -14,6 +18,9 @@ import java.util.Date; **/ @Data public class PrematureProduct { + @ApiParam(value ="订单ID") + private Long orderId; + @ApiParam(value ="订单编码") private String orderCode; @@ -30,12 +37,18 @@ public class PrematureProduct { private Double count; @ApiParam(value ="最晚结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date let; @ApiParam(value ="计划开始时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date planStart; @ApiParam(value ="计划结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date planEnd; @ApiParam(value ="提前完成时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java new file mode 100644 index 0000000..7692b3d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 排程结果分析及建议 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class ScheduleAnalyze { + + @ApiParam(value ="工作编码") + private String workCode; + + @ApiParam(value ="数量") + private Double count; + + @ApiParam(value ="计划开始时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date planStart; + + @ApiParam(value ="计划结束时间") + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date planEnd; + + @ApiParam(value ="问题描述") + private String describe; + + @ApiParam(value ="解决方案") + private String solution; +} From 1fb2f07ca37a20cfd0ba4fe7a5fedb43038c2603 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 29 Jun 2020 20:30:07 +0800 Subject: [PATCH 132/156] =?UTF-8?q?edi=20=E6=B7=BB=E5=8A=A0=E9=98=9F?= =?UTF-8?q?=E5=88=97=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 8 +++++ .../i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 4 +++ .../pojo/mes/bean/MesQueueJitActualDetail.java | 4 +++ .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 2 +- .../estsh/i3plus/pojo/mes/model/mgnbj/Message.java | 34 +++++++++++++++++++++- 5 files changed, 50 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 b4d21c1..30cffcc 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 @@ -118,6 +118,14 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("客户产线代码") private String custProdLineCode; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "IS_LOCK") + @ApiParam("锁定标识") + private Integer isLock; + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; 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 b6663bd..cde084a 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 @@ -56,6 +56,10 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @ApiParam("用量") private Double qty = 0d; + @Column(name = "DOCK_NO") + @ApiParam("道口") + private String dockNo; + @Column(name = "PART_COLOR_VALUE") @ApiParam("零件色值") private String partColorValue; 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 133b159..9fc4b52 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 @@ -89,6 +89,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("选项代码") private String optionCode; + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + @Column(name = "ASSY_NO") @ApiParam("组件编号") private String assyNo; 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 e51b3f0..b9483a5 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 @@ -54,7 +54,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("计划排序号") - private String seq; + private Double seq; @Column(name = "STATUS") @ApiParam("状态") 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/mgnbj/Message.java index 6c530e1..ef61c84 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/mgnbj/Message.java @@ -18,5 +18,37 @@ public class Message implements Serializable { private static final long serialVersionUID = 8628748312808962449L; @XStreamImplicit - List pns; + private List pns; + + @XStreamAlias("customerno") + private String customerNo; + + @XStreamAlias("customername") + private String customerName; + + @XStreamAlias("plantcode") + private String plantCode; + + @XStreamAlias("plantname") + private String plantName; + + @XStreamAlias("suppliernumber") + private String supplierNumber; + + @XStreamAlias("suppliername") + private String supplierName; + + @XStreamAlias("status") + private String status; + + @XStreamAlias("sequenceno") + private String sequenceNo; + + @XStreamAlias("vin") + private String vin; + + @XStreamAlias("date") + private String date; + + } From aaf9f8a21b0a24f7bd9027a247bd5c46fe3381ba Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 29 Jun 2020 22:43:45 +0800 Subject: [PATCH 133/156] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B9=90=E8=A7=82?= =?UTF-8?q?=E9=94=81=20=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 09296ef..add5b48 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 @@ -177,7 +177,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型名称") private String snTypeName; - + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; public MesProduceSn() { } From 7dddac511318a92f40933bcb7929c17c6cd9d635 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 29 Jun 2020 23:03:59 +0800 Subject: [PATCH 134/156] =?UTF-8?q?=E3=80=90=E6=99=BA=E8=83=BD=E5=8C=96?= =?UTF-8?q?=E5=BC=80=E5=8F=91-=E9=94=81=E5=AE=9A=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java | 8 ++++++++ .../pojo/wms/modelbean/WmsAutoTaskModel.java | 22 +++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java index 10ccc90..153e954 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java @@ -37,6 +37,14 @@ public class WmsAutoTaskLog extends BaseBean { @ApiParam("业务类型") public String busiType; + @Column(name = "STRATEGY_NO") + @ApiParam("策略代码") + public String strategyNo; + + @Column(name = "STRATEGY_ACTION") + @ApiParam("策略动作") + public String strategyAction; + @Column(name = "ERROR_MSG") @ApiParam("错误信息") public String errorMsg; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java index 13204cf..bbfaa61 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java @@ -25,6 +25,9 @@ public class WmsAutoTaskModel { @ApiParam("存储区") private String zoneNo; + @ApiParam("单据号") + private String orderNo; + @ApiParam("物料集合") private List partList; @@ -37,6 +40,9 @@ public class WmsAutoTaskModel { @ApiParam("锁定库位") private String lockLocacte; + @ApiParam("锁定源库位") + private String srcLockLocacte; + @ApiParam("方向") private Integer direction; @@ -46,21 +52,27 @@ public class WmsAutoTaskModel { @ApiParam("锁定料车") private String lockCar; - @ApiParam("物料对应的明细集合") + @ApiParam("预存锁定料车") + private String prestoreLockCar; + + @ApiParam("物料对应的单据明细集合") private Map partNoDetailsList; @ApiParam("锁定物料对应的条码") - private Map> stringListHashMap; + private Map> partNoGroupListMap; @ApiParam("锁定条码") private List lockStockSnList; - @ApiParam("单据更新状态") - private Integer updateOrderStatus; - @ApiParam("任务生成数量") private Double taskQty; @ApiParam("返回错误信息") public String errorMsg; + + @ApiParam("策略代码") + public String strategyNo; + + @ApiParam("策略动作") + public String strategyAction; } From 614582ce36c7036b575fdb0d6312d726874d3965 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 29 Jun 2020 23:10:02 +0800 Subject: [PATCH 135/156] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=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/mes/bean/MesProduceSn.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/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index add5b48..6120f9d 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 @@ -180,7 +180,7 @@ public class MesProduceSn extends BaseBean implements Serializable { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; + public Integer lockVersion; public MesProduceSn() { } From 5ccf659c941f5d841e7dfc46c8628425d8eba29a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 30 Jun 2020 10:21:36 +0800 Subject: [PATCH 136/156] [bug:9149] --- .../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 51958b0..32044db 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 @@ -5808,7 +5808,7 @@ public class MesEnumUtil { public static String codeOfValue(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(code)) { + if (values()[i].code.equals(code)) { tmp = values()[i].value; } } From 37fb285aa91c4a57c3002707d7a4ca26e4f6ba9d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 30 Jun 2020 11:19:58 +0800 Subject: [PATCH 137/156] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 52 ++++++++++- .../pojo/wms/bean/WmsAutoForkCallBackDetails.java | 103 +++++++++++++++++++++ .../WmsAutoForkCallBackDetailsRepository.java | 17 ++++ 3 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoForkCallBackDetailsRepository.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 c801a52..b911540 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 @@ -8274,11 +8274,12 @@ public class WmsEnumUtil { /** - * 自动入库任务类型 + * 自动入库任务 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AUTO_FORK_TASK_TYPE { - MOVE(10, "W05", "W05"); + START(10, "start", "start"), + END(20, "end", "end"); private int value; private String code; @@ -8326,4 +8327,51 @@ public class WmsEnumUtil { return valueOf(val); } } + + + /** + * 发运看板状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTO_FORK_TASK_STATUS { + CREATE(10, "新建"), + PROCESSING(20, "处理中"), + COMPLETE(30, "已完成"), + ERROR(40, "处理异常"); + + private int value; + private String description; + + AUTO_FORK_TASK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static AUTO_FORK_TASK_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java new file mode 100644 index 0000000..062d2eb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java @@ -0,0 +1,103 @@ +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.Index; +import javax.persistence.Table; + + +/** + * @Description : 北京海纳川任务明细 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2018-11-17 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_AUTO_FORK_CALL_BACK_DETAILS", indexes = { + @Index(columnList = "TASK_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "无人叉车任务明细", description = "喜德无人叉车任务明细") +public class WmsAutoForkCallBackDetails extends BaseBean { + private static final long serialVersionUID = -8103992000562208799L; + + @Column(name = "REQ_CODE") + @ApiParam(value = "请求编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String reqCode; + + + @Column(name = "REQ_TIME") + @ApiParam(value = "请求时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String reqTime; + + @Column(name = "CLIENT_CODE") + @ApiParam(value = "客服端编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String clientCode; + + @Column(name = "TOKEN_CODE") + @ApiParam(value = "令牌号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String tokenCode; + + @Column(name = "INTERFACE_NAME") + @ApiParam(value = "接口名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String interfaceName; + + @Column(name = "METHOD") + @ApiParam(value = "方法名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String method; + + @Column(name = "TASK_CODE") + @ApiParam(value = "任务单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String taskCode; + + @Column(name = "WB_CODE") + @ApiParam(value = "工作为") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String wbCode; + + @Column(name = "POD_CODE") + @ApiParam(value = "货架编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String podCode; + + @Column(name = "CURRENT_POSITION_CODE") + @ApiParam(value = "子任务的位置编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String currentPositionCode; + + @Column(name = "ROBOT_CODE") + @ApiParam(value = "执行任务的VGA编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String robotCode; + + //10=新建,20=已处理,30=处理出错 + @Column(name = "STATUS", nullable = false) + @ApiParam("处理标准") + public Integer status; + + @Column(name = "REMARK", nullable = false) + @ApiParam("备注") + public String remark; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoForkCallBackDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoForkCallBackDetailsRepository.java new file mode 100644 index 0000000..0123583 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoForkCallBackDetailsRepository.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.WmsAutoForkCallBackDetails; +import org.springframework.stereotype.Repository; + + +/** + * @Description :北京海纳川回调任务明细 + * @Reference : + * @Author : puxiao.lioa + * @CreateDate : 2018-11-13 10:19 + * @Modify: + **/ +@Repository +public interface WmsAutoForkCallBackDetailsRepository extends BaseRepository { +} From fff94902f7ad7d99b8fc24d6c748c15a7b324914 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 30 Jun 2020 15:03:19 +0800 Subject: [PATCH 138/156] Fix Bug #9203 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.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/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 76ee1d5..8cbe1c3 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 @@ -65,7 +65,7 @@ public class MesPartCheck extends BaseBean implements Serializable { @ApiParam("对象名称") private String objectCodeName; - @Transient + @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; } From 629817ddef1043d43cd0d3b750d36dbba83ce67d Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jun 2020 16:26:10 +0800 Subject: [PATCH 139/156] =?UTF-8?q?=E4=B8=89=E5=8A=9B=E5=A3=AB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=92=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java | 10 +++++----- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 7710c55..0b1ec28 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -65,10 +65,10 @@ public class Material extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String purchaseLeadTime; - @Column(name="MANUF_LEAD_TIME") + @Column(name="PRODUCT_LEAD_TIME") @ApiParam(value ="生产提前期") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private String manufLeadTime; + private String productLeadTime; @Column(name="SHIPMENT_LEAD_TIME") @ApiParam(value ="配送提前期") @@ -79,9 +79,9 @@ public class Material extends BaseAPS { @ApiParam(value ="单位采购量") private Integer unitPurchase; - @Column(name="UNIT_MANUF") + @Column(name="UNIT_PRODUCT") @ApiParam(value ="单位生产量") - private Integer unitManuf; + private Integer unitProduct; @Column(name="UNIT_SHIPMENT") @ApiParam(value ="单位配送量") @@ -109,7 +109,7 @@ public class Material extends BaseAPS { @Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="生产批量单位") - private Double UnitProductBatch; + private Double unitProductBatch; @Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大采购批量") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 9b898b5..619bbf8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -84,7 +84,7 @@ public class Work extends BaseAPS { private Long specifyResourceId; @Column(name="SPECIFY_PRODUCE_TIME") - @ApiParam(value ="指定制造时间") + @ApiParam(value ="指定生产时间") private String specifyProduceTime; @Column(name="SPECIFY_PREV_TIME") From 32eb9dc7970671ad90d209d7fc514f74c83dca71 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jun 2020 17:00:14 +0800 Subject: [PATCH 140/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= 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/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 +- 20 files changed, 20 insertions(+), 20 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/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 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 a9e288f..b948580 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 a44418c..e12eaee 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 2de88b5..c338f71 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 50ab2c2..7637865 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 7f94617..d98b7d8 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 d800ecf..bf96e57 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 60fc467..a758a6a 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 8171a4d..215b102 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 a785f21..dba12cc 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 d6d2f8e..81670b2 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 0fbfb69..26a7311 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 76739f9..eaf2544 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 0368700..0f615b6 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 d221913..183a03c 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 5fcd08a..0fea52b 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 2eddf76..cc8fce6 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 bc76711a8443902f12b080e6a92c6f23689b8275 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jun 2020 17:29:33 +0800 Subject: [PATCH 141/156] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= 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 932bdd9..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-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 69562594962b403eb9cbe4ec56759a4108339141 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 30 Jun 2020 18:19:51 +0800 Subject: [PATCH 142/156] EDI Finish Task #2215 Cost:48h Left:0h --- .../pojo/mes/model/mgnbj/MgnBjJitPlanModel.java | 10 ---------- .../pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java 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 c62cdd3..a493487 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 @@ -21,14 +21,6 @@ public class MgnBjJitPlanModel { private String userInfo; - private List scatterBomCfgOptions; - - private List scatterBomCfgBaseModules; - - private List messageCustPartNos; - - private List messageCodeRules; - private List flPnParts; private String flPnRecipe; @@ -47,8 +39,6 @@ public class MgnBjJitPlanModel { private Map> groupPartsMap = new HashMap<>(); - private Map> recipePartsMap = new HashMap<>(); - public void setFlPnParts(List flPnParts) { this.groupPartsMap.put("FL", flPnParts); this.flPnRecipe = getGroupRecipe(flPnParts); 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/mgnbj/MgnBjRecipePartsModel.java new file mode 100644 index 0000000..e61fa14 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/30 15:24 + * @desc + */ +@Data +public class MgnBjRecipePartsModel { + + private String location; + + private String recipe; + + private List parts; +} From c73ef2b93b8296134def865de7354610b1517389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 30 Jun 2020 18:34:39 +0800 Subject: [PATCH 143/156] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=B7=A5=E4=BD=8D=E5=92=8C=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E3=80=81=E4=BA=8C=E6=AC=A1=E7=AE=B1=E6=9D=A1=E7=A0=81Un-Pack-?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=BC=80=E5=8F=91=E4=B8=9A=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java | 12 ++++-------- 2 files changed, 6 insertions(+), 10 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 0ff1771..19f6de5 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 @@ -4266,8 +4266,8 @@ public class MesPcnEnumUtil { public enum BAD_HANDLE_TYPE { BACK_SPRAY(10, "BACK_SPRAY", "返喷"), SCRAPPED(20, "SCRAPPED", "报废"), - POLISH(30, "POLISH", "抛光"), - DETERMINED(40, "DETERMINED", "待定"); + POLISHING(30, "POLISHING", "抛光"), + DETERMIND(40, "DETERMIND", "待定"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java index 80c483b..8dfadf4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java @@ -1,12 +1,12 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.util.List; /** @@ -39,22 +39,18 @@ public class PaintCheckModel { @ApiParam("界面编号") private String windowNo; - @ApiParam("缺陷类型") - private String defectType; - - @ApiParam("缺陷描述") - private String defectDesc; - @ApiParam("缺陷标识值") private String defectFlagValue; @ApiParam("不良品处理类型") private Integer defectActionType; - @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") private String prodCfgTypeCode; + @ApiParam("缺陷列表") + private List defectList; + @ApiParam("界面组件参数数据") List windowModuleParamList; } From 59c79b5134610cf76a7b1990b03b1fb49409319a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 30 Jun 2020 18:46:59 +0800 Subject: [PATCH 144/156] =?UTF-8?q?TASK=202205,=20=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B6=82=E8=A3=85=E4=BA=8C=E6=AC=A1=E7=AE=B1?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E3=80=82Finish=20Task=20#2?= =?UTF-8?q?205=20Cost:24h?= 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 | 5 +++++ 1 file changed, 5 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 541d461..a46c53d 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 @@ -123,6 +123,11 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("包装标签模板") private String packageLabelTemplate; + // 二维码 + @Column(name = "QR_CODE") + @ApiParam("包装二维码") + private String qrCode; + public MesPackage() { } From 559fc003c8da83f0feb60728e55ec40cf62b27fe Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 1 Jul 2020 09:50:36 +0800 Subject: [PATCH 145/156] =?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 --- .../pojo/wms/bean/WmsAutoForkCallBackDetails.java | 7 +++++-- .../estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 6 ++++-- .../modelbean/WmsAutoFilterRoutingRuleModel.java | 24 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java index 062d2eb..3086942 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; 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 cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -91,9 +93,10 @@ public class WmsAutoForkCallBackDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String robotCode; - //10=新建,20=已处理,30=处理出错 - @Column(name = "STATUS", nullable = false) + @Column(name = "STATUS", nullable = false, columnDefinition = "default 10") @ApiParam("处理标准") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "AUTO_FORK_TASK_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) public Integer status; @Column(name = "REMARK", nullable = false) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index 892ea6e..4bf40f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -13,8 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; /** * @Description :物流线路规则表 @@ -123,6 +121,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目的单据条码状态") private Integer destMoveSnStatus; + @Column(name = "FILTER_SCRIPT_NO", length = 50) + @ApiParam(value = "过滤条件") + private String filterScriptNo; + public WmsRoutingRule(){} } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java new file mode 100644 index 0000000..9fcf1fc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 自动过滤物流路线 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-07-01 + * @Modify: + **/ +@Data +@Api("自动过滤物流路线") +public class WmsAutoFilterRoutingRuleModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("料架车") + private String parentSpec; +} From ab0ae20d40543cb639d0121cfeb5562938968134 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 1 Jul 2020 14:59:17 +0800 Subject: [PATCH 146/156] =?UTF-8?q?Finish=20Task=20#2234=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7JIT=E9=A2=84=E8=A3=85=E9=98=9F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 37 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 ++ .../pojo/mes/bean/MesQueueJitPlanDetail.java | 12 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 68 ++++++++++++++++++++++ 5 files changed, 157 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 161c474..998da89 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 @@ -6438,4 +6438,40 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT预装队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_PLAN_STATUS { + CREATE(10, "创建"), + RELEASED(20, "已释放"), + ERROR(999, "异常"); + + private Integer value; + private String description; + + QUEUE_JIT_PLAN_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.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 d982dab..dee2d14 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 @@ -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; /** @@ -74,4 +75,40 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "VERSION") @ApiParam("版本号") private String version; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商编号") + private String supplierCode; + + @Column(name = "SUPPLIER_NAME") + @ApiParam("供应商名称") + private String supplierName; + + @Column(name = "FILE_NAME") + @ApiParam("解析文件名") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("解析文件路径") + private String fileUrl; + + @Transient + @ApiParam("计划上线开始时间") + private String planStartDate; + + @Transient + @ApiParam("计划上线结束时间") + private String planEndDate; } 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 1d9faad..bba33d4 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 @@ -50,4 +50,8 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("用量") private Double qty; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; } 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 7111b75..402d4c6 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 @@ -46,4 +46,16 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { @Column(name = "PART_NAME") @ApiParam("产品名称") private String partName; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; } 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 3178eee..767ad06 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 @@ -3130,4 +3130,72 @@ public class MesHqlPack { } return packBean; } + + /** + * 客户JIT预装队列 + * @param queueJitPlan + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitPlan(MesQueueJitPlan queueJitPlan, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlan, organizeCode); + if (!StringUtils.isEmpty(queueJitPlan.getJisPlanNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getJisPlanNo(), "jisPlanNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getCustPlantCode())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustPlantCode(), "custPlantCode", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getCustFlagNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustFlagNo(), "custFlagNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getVinCode())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getVinCode(), "vinCode", packBean); + } + if (queueJitPlan.getStatus() != null) { + DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean); + } + if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } + + /** + * 客户JIT预装队列明细 + * @param queueJitPlanDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitPlanDetail(MesQueueJitPlanDetail queueJitPlanDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanDetail, organizeCode); + if (!StringUtils.isEmpty(queueJitPlanDetail.getJisPlanNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getJisPlanNo(), "jisPlanNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlanDetail.getPartNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getPartNo(), "partNo", packBean); + } + return packBean; + } + + /** + * 客户JIT预装队列BOM + * @param queueJitPlanBom + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitPlanBom(MesQueueJitPlanBom queueJitPlanBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanBom, organizeCode); + if (!StringUtils.isEmpty(queueJitPlanBom.getJisPlanNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getJisPlanNo(), "jisPlanNo", packBean); + } + if (!StringUtils.isEmpty(queueJitPlanBom.getPartNo())) { + DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getPartNo(), "partNo", packBean); + } + return packBean; + } } From 0c0eea561d30a599d3d79c4e8c96cf58bc9fb823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 1 Jul 2020 19:33:49 +0800 Subject: [PATCH 147/156] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 578 +++++++++++---------- 1 file changed, 317 insertions(+), 261 deletions(-) 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 43a6f9d..a489f69 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 @@ -26,13 +26,14 @@ public class CoreHqlPack { /** * In 参数封装 + * * @param columnName * @return */ - public static String packHqlIds(String columnName, String[] params){ - StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + public static String packHqlIds(String columnName, String[] params) { + StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getInPack(String.join(",", params), columnName, result); return result.toString(); } @@ -40,42 +41,45 @@ public class CoreHqlPack { /** * In 参数封装 + * * @param columnName * @return */ - public static String packHqlIds(String columnName, Long[] params){ - StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + public static String packHqlIds(String columnName, Long[] params) { + StringBuffer result = new StringBuffer(); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(StringUtils.join(params,","),columnName,result); + HqlPack.getInPack(StringUtils.join(params, ","), columnName, result); return result.toString(); } /** * In 参数封装 + * * @param columnName * @return */ - public static DdlPackBean packHqlInStr(String columnName, String[] params){ + public static DdlPackBean packHqlInStr(String columnName, String[] params) { DdlPackBean ddlPackBean = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); DdlPreparedPack.getInPack(params, columnName, ddlPackBean); return ddlPackBean; } /** * In 参数封装 + * * @param columnName * @return */ - public static DdlPackBean packHqlIn(String columnName, List params){ + public static DdlPackBean packHqlIn(String columnName, List params) { DdlPackBean ddlPackBean = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); DdlPreparedPack.getInPack(params, columnName, ddlPackBean); return ddlPackBean; } @@ -83,24 +87,25 @@ public class CoreHqlPack { /** * 资源查询 + * * @param resource * @return */ - public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource){ + public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource) { DdlPackBean result = DdlPackBean.getDdlPackBean(); - if(resource != null){ - DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + if (resource != null) { + DdlPreparedPack.getNumEqualPack(resource.getResourceType(), "resourceType", result); // 是否多类型查询 - if(StringUtils.isNotBlank(resource.getResourceTypes())){ + if (StringUtils.isNotBlank(resource.getResourceTypes())) { DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); } - DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result); - DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); - DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); - DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result); - DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result); + DdlPreparedPack.getNumEqualPack(resource.getSoftType(), "softType", result); + DdlPreparedPack.getNumEqualPack(resource.getIsSystem(), "isSystem", result); + DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(), "languageCode", result); + DdlPreparedPack.getStringLikerPack(resource.getResourceKey(), "resourceKey", result); + DdlPreparedPack.getStringLikerPack(resource.getResourceValue(), "resourceValue", result); } return result; @@ -108,6 +113,7 @@ public class CoreHqlPack { /** * 语言 + * * @param localeLanguage * @return */ @@ -118,9 +124,9 @@ public class CoreHqlPack { // HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(), // "createDateTime", result, false); //字符串类型封装 - HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(),"languageCode",result); + HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(), "languageCode", result); //字符串类型封装 - HqlPack.getStringLikerPack(localeLanguage.getLanguageName(),"languageName",result); + HqlPack.getStringLikerPack(localeLanguage.getLanguageName(), "languageName", result); // 添加默认排序 HqlPack.getOrderDefault(localeLanguage); @@ -130,37 +136,39 @@ public class CoreHqlPack { /** * 岗位复杂查询 + * * @param position * @return */ - public static DdlPackBean packHqlSysPosition(SysPosition position){ - return packHqlSysPosition(position,null); + public static DdlPackBean packHqlSysPosition(SysPosition position) { + return packHqlSysPosition(position, null); } - public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){ + public static DdlPackBean packHqlSysPosition(SysPosition position, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode()); // 查询参数封装 - DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(position.getParentId(), "parentId", result); // String Like - DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); + DdlPreparedPack.getStringLikerPack(position.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(position.getPositionCode(), "positionCode", result); // In - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); return result; } /** * 岗位复杂查询 + * * @param position * @return */ - public static DdlPackBean packHqlSysPositionList(SysPosition position){ + public static DdlPackBean packHqlSysPositionList(SysPosition position) { DdlPackBean result = DdlPackBean.getDdlPackBean(position); // 查询参数封装 - DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(), "organizeCode", result); return result; } @@ -168,14 +176,15 @@ public class CoreHqlPack { /** * 岗位复杂查询 + * * @param bean * @return */ - public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean){ + public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean) { DdlPackBean result = DdlPackBean.getDdlPackBean(bean); // 查询参数封装 - DdlPreparedPack.getNumEqualPack(bean.getUserId(),"userId",result); + DdlPreparedPack.getNumEqualPack(bean.getUserId(), "userId", result); return result; } @@ -183,19 +192,20 @@ public class CoreHqlPack { /** * 组织复杂查询 + * * @param organize * @return */ - public static String packHqlSysOrganize(SysOrganize organize){ + public static String packHqlSysOrganize(SysOrganize organize) { StringBuffer result = new StringBuffer(); // 查询参数封装 - if(organize.getChildIdList() != null){ - HqlPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result); + if (organize.getChildIdList() != null) { + HqlPack.getInPack(StringUtils.join(organize.getChildIdList(), ","), "parentId", result); } - HqlPack.getStringLikerPack(organize.getName(),"name",result); - HqlPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringLikerPack(organize.getName(), "name", result); + HqlPack.getStringLikerPack(organize.getOrganizeCode(), "organizeCode", result); // 添加默认排序 HqlPack.getOrderDefault(organize); @@ -203,53 +213,54 @@ public class CoreHqlPack { return result.toString(); } - public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){ + public static DdlPackBean packHqlSysOrganize(SysOrganize organize, List idList) { HqlPack.getOrderDefault(organize); DdlPackBean result = DdlPackBean.getDdlPackBean(organize); - DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getNumEqualPack(organize.getParentId(),"parentId",result); + DdlPreparedPack.getStringLikerPack(organize.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(organize.getParentId(), "parentId", result); // 查询参数封装 - if(organize.getChildIdList() != null){ - DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result); + if (organize.getChildIdList() != null) { + DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(), ","), "parentId", result); } // Number In - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); return result; } - public static String packHqlSysOrganize(Long[] ids, Integer typeId){ + public static String packHqlSysOrganize(Long[] ids, Integer typeId) { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getInPack(StringUtils.join(ids,","),"id",result); - HqlPack.getNumEqualPack(typeId,"organizeType",result); + HqlPack.getInPack(StringUtils.join(ids, ","), "id", result); + HqlPack.getNumEqualPack(typeId, "organizeType", result); return result.toString(); } /** * 部门复杂查询 + * * @param department * @return */ @Deprecated - public static String packHqlSysDepartment(SysDepartment department){ + public static String packHqlSysDepartment(SysDepartment department) { StringBuffer result = new StringBuffer(); // if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ // department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); // } - HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); + HqlPack.getNumEqualPack(department.getParentId(), "parentId", result); // HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); - HqlPack.getStringLikerPack(department.getName(),"name",result); - HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); + HqlPack.getStringLikerPack(department.getName(), "name", result); + HqlPack.getStringLikerPack(department.getDepartmentCode(), "departmentCode", result); // 添加默认排序 HqlPack.getOrderDefault(department); @@ -257,36 +268,36 @@ public class CoreHqlPack { return result.toString(); } - public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List idList){ + public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(department); - DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); - DdlPreparedPack.getNumEqualPack(department.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); - DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getStringLikerPack(department.getName(), "name", result); + DdlPreparedPack.getNumEqualPack(department.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(department.getOrganizeId(), "organizeId", result); + DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(), "departmentCode", result); + DdlPreparedPack.getInPackList(idList, "id", result); result.setOrderByStr(department.orderBy()); return result; } - public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ + public static DdlPackBean packDdlBeanSysMenu(SysMenu menu, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(menu); - DdlPreparedPack.getInPackList(idList,"id",result); - if(menu != null){ - DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result); - DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); + DdlPreparedPack.getInPackList(idList, "id", result); + if (menu != null) { + DdlPreparedPack.getNumEqualPack(menu.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(menu.getMenuType(), "menuType", result); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(), "menuStatus", result); + DdlPreparedPack.getStringLikerPack(menu.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(menu.getMenuCode(), "menuCode", result); result.setOrderByStr(menu.orderBy()); - }else { + } else { menu = new SysMenu(); } - if(!StringUtils.isNotBlank(menu.getOrderByParam())){ + if (!StringUtils.isNotBlank(menu.getOrderByParam())) { menu.setOrderByParam("menuSort"); menu.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); result.setOrderByStr(menu.orderBy()); @@ -297,16 +308,17 @@ public class CoreHqlPack { /** * 系统角色复杂查询 + * * @param role * @return */ @Deprecated - public static String packHqlSysRole(SysRole role){ + public static String packHqlSysRole(SysRole role) { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); - HqlPack.getStringLikerPack(role.getName(),"name",result); + HqlPack.getNumEqualPack(role.getRoleStatus(), "roleStatus", result); + HqlPack.getStringLikerPack(role.getName(), "name", result); // 添加默认排序 HqlPack.getOrderDefault(role); @@ -316,37 +328,53 @@ public class CoreHqlPack { /** * 系统角色复杂查询 + * + * @param role + * @return + */ + public static DdlPackBean packDdlBeanSysRole(SysRole role) { + return packDdlBeanSysRole(role, null); + } + + /** + * 唯一校验 + * * @param role * @return */ - public static DdlPackBean packDdlBeanSysRole(SysRole role){ - return packDdlBeanSysRole(role,null); + public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringEqualPack(role.getName(), "name", result); + DdlPreparedPack.getNumEqualPack(role.getId(), "id", result); + return result; } - public static DdlPackBean packDdlBeanSysRole(SysRole role,List idList){ + public static DdlPackBean packDdlBeanSysRole(SysRole role, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(role); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); - DdlPreparedPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); - DdlPreparedPack.getStringLikerPack(role.getName(),"name",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(role.getRoleStatus(), "roleStatus", result); + DdlPreparedPack.getStringLikerPack(role.getName(), "name", result); + DdlPreparedPack.getInPackList(idList, "id", result); - return result; + return result; } /** * 系统参数复杂查询 + * * @param config * @return */ - public static DdlPackBean packHqlSysConfig(SysConfig config) { + public static DdlPackBean packHqlSysConfig(SysConfig config) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getStringLikerPack(config.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result); - DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result); + DdlPreparedPack.getStringLikerPack(config.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(config.getConfigCode(), "configCode", result); + DdlPreparedPack.getNumEqualPack(config.getConfigType(), "configType", result); DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result); // 添加默认排序 @@ -357,6 +385,7 @@ public class CoreHqlPack { /** * 字典信息复杂查询 + * * @param dictionary * @return */ @@ -368,7 +397,7 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result); DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 默认查询非顶级字典 - if (dictionary.getParentId() == null || dictionary.getParentId() < 1){ + if (dictionary.getParentId() == null || dictionary.getParentId() < 1) { DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); @@ -385,6 +414,7 @@ public class CoreHqlPack { /** * 硬件类型复杂查询 + * * @param toolType * @return */ @@ -392,7 +422,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(toolType.getName(),"name", result); + HqlPack.getStringLikerPack(toolType.getName(), "name", result); // 添加默认排序 HqlPack.getOrderDefault(toolType); @@ -402,6 +432,7 @@ public class CoreHqlPack { /** * 硬件复杂查询 + * * @param tool * @return */ @@ -409,13 +440,13 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(tool.getName(),"name",result); - HqlPack.getNumEqualPack(tool.getToolTypeId(),"toolTypeId",result); - HqlPack.getNumEqualPack(tool.getToolStatus(),"toolStatus",result); - HqlPack.getNumEqualPack(tool.getToolDataType(),"toolDataType",result); - HqlPack.getNumEqualPack(tool.getToolConnType(),"toolConnType",result); - HqlPack.getStringLikerPack(tool.getToolIp(),"toolIp",result); - HqlPack.getNumLikerPack(tool.getToolPort(),"toolPort",result); + HqlPack.getStringLikerPack(tool.getName(), "name", result); + HqlPack.getNumEqualPack(tool.getToolTypeId(), "toolTypeId", result); + HqlPack.getNumEqualPack(tool.getToolStatus(), "toolStatus", result); + HqlPack.getNumEqualPack(tool.getToolDataType(), "toolDataType", result); + HqlPack.getNumEqualPack(tool.getToolConnType(), "toolConnType", result); + HqlPack.getStringLikerPack(tool.getToolIp(), "toolIp", result); + HqlPack.getNumLikerPack(tool.getToolPort(), "toolPort", result); // 添加默认排序 HqlPack.getOrderDefault(tool); @@ -425,10 +456,11 @@ public class CoreHqlPack { /** * 消息复杂查询 + * * @param message * @return */ - public static DdlPackBean packHqlSysMessage(SysMessage message){ + public static DdlPackBean packHqlSysMessage(SysMessage message) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(message); // hql拼接 @@ -447,11 +479,12 @@ public class CoreHqlPack { DdlPreparedPack.getOrderDefault(message); - return ddlPackBean; + return ddlPackBean; } /** * 文件资源复杂查询 + * * @param file * @return */ @@ -466,11 +499,12 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result); DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false); - return result; + return result; } /** * 任务周期复杂查询 + * * @param sysTaskCycle * @return */ @@ -484,22 +518,23 @@ public class CoreHqlPack { // 添加默认排序 HqlPack.getOrderDefault(sysTaskCycle); - return result.toString(); + return result.toString(); } /** * 定时任务复杂查询 + * * @param sysTaskPlan * @return */ - public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ + public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(), "groupName", result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(), "taskPlanStatus", result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(), "taskCycleId", result); DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result); DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true); @@ -507,57 +542,58 @@ public class CoreHqlPack { // 添加默认排序 DdlPreparedPack.getOrderDefault(sysTaskPlan); - return result; + return result; } /** * 账号复杂查询 + * * @param user * @return */ - public static String packHqlSysUser(SysUser user){ + public static String packHqlSysUser(SysUser user) { StringBuffer result = new StringBuffer(); // And X = X - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); - HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); - - if(user.getRoleIdList() != null){ - HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(user.getDepartmentId(), "departmentId", result); + HqlPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); + HqlPack.getStringEqualPack(user.getOrganizeCode(), "organizeCode", result); + + if (user.getRoleIdList() != null) { + HqlPack.getInPack(StringUtils.join(user.getRoleIdList(), ","), "id", result); } - if(user.getDepartmentIdList() != null){ - HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(),","),"id",result); + if (user.getDepartmentIdList() != null) { + HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(), ","), "id", result); } // And Like % % - HqlPack.getStringLikerPack(user.getUserName(),"userName",result); - HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + HqlPack.getStringLikerPack(user.getUserName(), "userName", result); + HqlPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + HqlPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + HqlPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); // 添加默认排序 HqlPack.getOrderDefault(user); - return result.toString(); + return result.toString(); } - public static DdlPackBean packDdlBeanSysUser(SysUser user,List idList){ + public static DdlPackBean packDdlBeanSysUser(SysUser user, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(user); - DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); // DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); // DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getInPackList(idList, "id", result); result.setOrderByStr(user.orderBy()); return result; @@ -565,52 +601,54 @@ public class CoreHqlPack { /** * 账号复杂查询 + * * @param user * @return */ - public static DdlPackBean packDdlSysUser(SysUser user){ + public static DdlPackBean packDdlSysUser(SysUser user) { DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(user); // And X = X - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack); - DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",ddlPack); - DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",ddlPack); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPack); + DdlPreparedPack.getNumEqualPack(user.getDepartmentId(), "departmentId", ddlPack); + DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", ddlPack); - if(user.getRoleIdList() != null){ - DdlPreparedPack.getInPack(user.getRoleIdList(),"id",ddlPack); + if (user.getRoleIdList() != null) { + DdlPreparedPack.getInPack(user.getRoleIdList(), "id", ddlPack); } - if(user.getDepartmentIdList() != null){ - DdlPreparedPack.getInPack(user.getDepartmentIdList(),"id",ddlPack); + if (user.getDepartmentIdList() != null) { + DdlPreparedPack.getInPack(user.getDepartmentIdList(), "id", ddlPack); } // And Like % % - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",ddlPack); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", ddlPack); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", ddlPack); // 添加默认排序 DdlPreparedPack.getOrderDefault(user); DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, ddlPack); - return ddlPack; + return ddlPack; } /** * 查询字典代码是否重复 + * * @param dictionary * @return */ - public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary){ + public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary) { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); - DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(), "dictionaryCode", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not - DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(), "id", result); // 添加默认排序 DdlPreparedPack.getOrderDefault(dictionary); @@ -620,18 +658,19 @@ public class CoreHqlPack { /** * 查询字典值是否重复 + * * @param dictionary * @return */ - public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary){ + public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary) { DdlPackBean result = new DdlPackBean(); // and - DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); - DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(), "dictionaryValue", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // not - DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(), "id", result); // 添加默认排序 DdlPreparedPack.getOrderDefault(dictionary); @@ -641,92 +680,95 @@ public class CoreHqlPack { /** * 用户信息 复杂查询拼接 + * * @param userInfo * @return */ - public static String packHqlSysUserInfo(SysUserInfo userInfo){ + public static String packHqlSysUserInfo(SysUserInfo userInfo) { StringBuffer result = new StringBuffer(); // And - HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result); // HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); - HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); - HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); + HqlPack.getNumEqualPack(userInfo.getPositionId(), "positionId", result); + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + HqlPack.getStringEqualPack(userInfo.getOrganizeCode(), "organizeCode", result); - if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){ + if (userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()) { HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result); } // Like - HqlPack.getStringLikerPack(userInfo.getName(),"name",result); - HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + HqlPack.getStringLikerPack(userInfo.getName(), "name", result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 HqlPack.getOrderDefault(userInfo); - return result.toString(); + return result.toString(); } - public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List idList){ + public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo, List idList) { DdlPackBean result = DdlPackBean.getDdlPackBean(userInfo); // And - DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); - DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getInPackList(idList,"id",result); + DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(), "positionId", result); + DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getInPackList(idList, "id", result); - if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){ - DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result); + if (userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()) { + DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(), "departmentId", result); } // Like - DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + DdlPreparedPack.getStringLikerPack(userInfo.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 result.setOrderByStr(userInfo.orderBy()); - return result; + return result; } /** * 用户信息 复杂查询拼接 + * * @param userInfo * @return */ - public static String packHqlSysUserInfo(SysUserInfo userInfo,List idList){ + public static String packHqlSysUserInfo(SysUserInfo userInfo, List idList) { StringBuffer result = new StringBuffer(); // And - HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - if(idList != null && !idList.isEmpty()){ + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result); + if (idList != null && !idList.isEmpty()) { HqlPack.getInPack(StringUtils.join(idList, ","), "id", result); } // Like - HqlPack.getStringLikerPack(userInfo.getName(),"name",result); - HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + HqlPack.getStringLikerPack(userInfo.getName(), "name", result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result); // 添加默认排序 HqlPack.getOrderDefault(userInfo); - return result.toString(); + return result.toString(); } /** * 查询语言代码是否重复 + * * @param localeLanguage * @return */ - public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage){ + public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(),"languageCode",result); - HqlPack.getNumNOEqualPack(localeLanguage.getId(),"id",result); + HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(), "languageCode", result); + HqlPack.getNumNOEqualPack(localeLanguage.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(localeLanguage); @@ -736,16 +778,17 @@ public class CoreHqlPack { /** * 检查系统资源是否重复 + * * @param localeResource * @return */ - public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource){ + public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result); - HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result); - HqlPack.getNumEqualPack(localeResource.getSoftType(),"softType",result); - HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result); + HqlPack.getStringEqualPack(localeResource.getLanguageCode(), "languageCode", result); + HqlPack.getStringEqualPack(localeResource.getResourceKey(), "resourceKey", result); + HqlPack.getNumEqualPack(localeResource.getSoftType(), "softType", result); + HqlPack.getNumNOEqualPack(localeResource.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(localeResource); @@ -755,16 +798,17 @@ public class CoreHqlPack { /** * 查询规则代码是否重复 + * * @param orderNoRule * @return */ - public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule){ + public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule) { StringBuffer result = new StringBuffer(); // and - HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); // not - HqlPack.getNumNOEqualPack(orderNoRule.getId(),"id",result); + HqlPack.getNumNOEqualPack(orderNoRule.getId(), "id", result); // 添加默认排序 HqlPack.getOrderDefault(orderNoRule); @@ -773,19 +817,20 @@ public class CoreHqlPack { } /** - * 单号规则复杂查询，分页，排序 + * 单号规则复杂查询，分页，排序 + * * @param orderNoRule * @return */ - public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){ + public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule) { DdlPackBean result = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); - DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); - DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); - DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(), "orderNoRuleStatus", result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(), "orderNo", result); if (orderNoRule.getSerialNo() != null) { DdlPreparedPack.getNumEqualPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result); } @@ -798,19 +843,20 @@ public class CoreHqlPack { /** * 用户消息关系表负责查询 + * * @param sysRefUserMessage * @return */ - public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage) { + StringBuffer result = new StringBuffer(); - HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(),"messageSoftType",result); - HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); - HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result); - HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(), "messageTypeRdd", result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(), "messageSoftType", result); + HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(), "messageTitleRdd", result); + HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(), "messageSenderNameRdd", result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(), "messageStatus", result); + HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(), "receiverTime", result); + HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(), "receiverId", result); // 添加默认排序 HqlPack.getOrderDefault(sysRefUserMessage); @@ -820,44 +866,46 @@ public class CoreHqlPack { /** * 任务复杂查询 + * * @param sysTask * @return */ - public static DdlPackBean packHqlSysTask(SysTask sysTask){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + public static DdlPackBean packHqlSysTask(SysTask sysTask) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result); - DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); - DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result); - DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result); - DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result); + DdlPreparedPack.getStringLikerPack(sysTask.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(), "taskSoftType", result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(), "taskPackage", result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(), "taskClass", result); DdlPreparedPack.getOrderDefault(sysTask); return result; } - public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids) { + StringBuffer result = new StringBuffer(); - HqlPack.getInPack(StringUtils.join(ids,","),"id",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + HqlPack.getInPack(StringUtils.join(ids, ","), "id", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDefault", result); return result.toString(); } /** * 大小区间比较 + * * @param columnName * @param min * @param max * @return */ - public static String packHqlByInterval(String columnName,Object min,Object max){ - StringBuffer result = new StringBuffer(); + public static String packHqlByInterval(String columnName, Object min, Object max) { + StringBuffer result = new StringBuffer(); - HqlPack.getNumSmallerPack(max,columnName,result); - HqlPack.getNumBiggerPack(min,columnName,result); + HqlPack.getNumSmallerPack(max, columnName, result); + HqlPack.getNumBiggerPack(min, columnName, result); return result.toString(); } @@ -865,6 +913,7 @@ public class CoreHqlPack { /** * 字典信息查询id集合中是否存在默认数据 + * * @param ids * @return */ @@ -872,44 +921,47 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - DdlPreparedPack.getInPack(StringUtils.join(ids,","),"id",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + DdlPreparedPack.getInPack(StringUtils.join(ids, ","), "id", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDefault", result); return result; } /** * 条码规则代码是否存在 + * * @param sysBarcodeRule * @return */ - public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule) { + StringBuffer result = new StringBuffer(); // and - HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result); + HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(), "barcodeRuleCode", result); // not - HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(),"id",result); + HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(), "id", result); return result.toString(); } /** * 条码规则复杂查询 + * * @param sysBarcodeRule * @return */ - public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule){ - StringBuffer result = new StringBuffer(); + public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule) { + StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(sysBarcodeRule.getName(),"name",result); - HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result); + HqlPack.getStringLikerPack(sysBarcodeRule.getName(), "name", result); + HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(), "barcodeRuleCode", result); return result.toString(); } /** * 打印模板复杂查询 + * * @param sysLabelTemplate * @return */ @@ -932,9 +984,9 @@ public class CoreHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate); // hql拼接 - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(),"templateName",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(),"organizeCode",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(), "organizeCode", ddlPackBean); DdlPreparedPack.timeBuilder(sysLabelTemplate.getModifyDateTimeStart(), sysLabelTemplate.getModifyDateTimeEnd(), "modifyDatetime", ddlPackBean, true); @@ -946,6 +998,7 @@ public class CoreHqlPack { /** * 打印模板参数复杂查询 + * * @param sysLabelTemplateParam * @return */ @@ -965,99 +1018,102 @@ public class CoreHqlPack { } - /** * 文件代码是否存在 + * * @param sysFile 查询条件 * @return DdlPackBean */ - public static DdlPackBean packHqlSysFileCode(SysFile sysFile){ + public static DdlPackBean packHqlSysFileCode(SysFile sysFile) { DdlPackBean result = DdlPackBean.getDdlPackBean(sysFile); // and - DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",result); + DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(), "fileCode", result); // not - DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(sysFile.getId(), "id", result); return result; } - public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){ + public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref) { DdlPackBean result = DdlPackBean.getDdlPackBean(ref); // Number Eq - DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result); + DdlPreparedPack.getNumEqualPack(ref.getUserId(), "userId", result); // String Eq - DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(), "organizeCode", result); return result; } - public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){ + public static DdlPackBean packDdlBeanSysRefUserRole(Long userId, Long roleId, String organizeCode) { DdlPackBean result = DdlPackBean.getDdlPackBean(); // Number Eq - DdlPreparedPack.getNumEqualPack(userId,"userId",result); - DdlPreparedPack.getNumEqualPack(roleId,"roleId",result); + DdlPreparedPack.getNumEqualPack(userId, "userId", result); + DdlPreparedPack.getNumEqualPack(roleId, "roleId", result); // String Eq - DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); return result; } /** * 查询当前用户所有组织数据 + * * @param sysRefUserDepartments * @return */ - public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ + public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean); + DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()), "id", packBean); return packBean; } /** * 按条件查询字典 + * * @param sysDictionary * @return */ - public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){ + public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(sysDictionary); DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean); DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean); DdlPreparedPack.getStringEqualPack(sysDictionary.getParentNameRdd(), "parentNameRdd", packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(), "parentId", packBean); DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean); - DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(),"dictionaryValue",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(), "dictionaryGroup", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(), "dictionaryValue", packBean); return packBean; } /** * 按条件查询字典 + * * @param bean * @return */ - public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean){ + public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean); - DdlPreparedPack.getNumEqualPack(bean.getRefId(),"refId",packBean); - DdlPreparedPack.getNumEqualPack(bean.getPlanId(),"planId",packBean); - DdlPreparedPack.getNumEqualPack(bean.getOperateType(),"operateType",packBean); - DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean); - DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean); - DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean); - DdlPreparedPack.timeBuilder(bean.getModifyDatetime(),"modifyDatetime",packBean,false,true); + DdlPreparedPack.getNumEqualPack(bean.getRefId(), "refId", packBean); + DdlPreparedPack.getNumEqualPack(bean.getPlanId(), "planId", packBean); + DdlPreparedPack.getNumEqualPack(bean.getOperateType(), "operateType", packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(), "refClass", packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(), "versionMethodName", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(), "pojoCompare", packBean); + DdlPreparedPack.timeBuilder(bean.getModifyDatetime(), "modifyDatetime", packBean, false, true); return packBean; } - public static DdlPackBean packSysDataSource(SysDataSource bean){ + public static DdlPackBean packSysDataSource(SysDataSource bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); DdlPreparedPack.getStringLikerPack(bean.getSourceHost(), "sourceHost", ddlPackBean); From 1d2c2b7be2b4f8c417d8be3fa0c908d7054bb5a1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 1 Jul 2020 22:23:20 +0800 Subject: [PATCH 148/156] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E5=8C=96?= 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 b911540..d3df613 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 @@ -8330,7 +8330,7 @@ public class WmsEnumUtil { /** - * 发运看板状态 + * AUTO 命令状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AUTO_FORK_TASK_STATUS { From 3d826c5edcecefb26cc9ed5784aae249bc53ea46 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 1 Jul 2020 22:24:11 +0800 Subject: [PATCH 149/156] =?UTF-8?q?=E3=80=90=E6=99=BA=E8=83=BD=E5=8C=96?= =?UTF-8?q?=E5=BC=80=E5=8F=91-=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=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/base/enumutil/WmsEnumUtil.java | 91 ++++++++++++++++++++-- .../estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java | 7 ++ .../pojo/wms/modelbean/WmsAutoTaskModel.java | 4 + 3 files changed, 96 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 b911540..a24096c 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 @@ -8146,16 +8146,16 @@ public class WmsEnumUtil { /** * 动作类型 - * 10-锁定库存，20-解锁库存、30-锁定库位、40-解锁库位、50-锁定料车、60-解锁料车、70-生成任务、 + * 10-锁定库位，20-锁定库存、30-锁定料车、40-解锁库存、50-解锁库位、60-解锁料车、70-生成任务、 * 80-取消任务、90-递进交换 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STRATEGY_ACTION_TYPE { - LOCKING_IN_STOCK(10, "LOCKING_IN_STOCK", "锁定库存"), - UNLOCK_IN_STOCK(20, "UNLOCK_IN_STOCK", "解锁库存"), - LOCKING_LOCATE(30, "LOCKING_LOCATE", "锁定库位"), - UNLOCK_LOCATE(40, "UNLOCK_LOCATE", "解锁库位"), - LOCKING_FEED_CAR(50, "LOCKING_FEED_CAR", "锁定料车"), + LOCKING_LOCATE(10, "LOCKING_LOCATE", "锁定库位"), + LOCKING_IN_STOCK(20, "LOCKING_IN_STOCK", "锁定库存"), + LOCKING_FEED_CAR(30, "LOCKING_FEED_CAR", "锁定料车"), + UNLOCK_IN_STOCK(40, "UNLOCK_IN_STOCK", "解锁库存"), + UNLOCK_LOCATE(50, "UNLOCK_LOCATE", "解锁库位"), UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"), GENERATE_TASK(70, "GENERATE_TASK", "生成任务"), CANCEL_TASK(80, "CANCEL_TASK", "取消任务"), @@ -8374,4 +8374,83 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 自动化日志记录-操作类型 + * 10-单据生成，20-策略动作、30-任务生成、40-START、50-END、60-其它 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPERATE_TYPE { + ORDER_GENERATE(10, "ORDER_GENERATE", "单据生成"), + STRATEGIC_ACTION(20, "STRATEGIC_ACTION", "策略动作"), + TASK_GENERATE(30, "TASK_GENERATE", "任务生成"), + START(40, "START", "START"), + END(50, "END", "END"), + OTHER(60, "OTHER", "其它"); + + private int value; + private String code; + private String description; + + OPERATE_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); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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 OPERATE_TYPE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java index 153e954..640c0d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,6 +47,11 @@ public class WmsAutoTaskLog extends BaseBean { @ApiParam("策略动作") public String strategyAction; + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OPERATE_TYPE.class) + public String operateType; + @Column(name = "ERROR_MSG") @ApiParam("错误信息") public String errorMsg; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java index bbfaa61..6b5d6b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.wms.bean.WmsAutoTaskLog; import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; @@ -64,6 +65,9 @@ public class WmsAutoTaskModel { @ApiParam("锁定条码") private List lockStockSnList; + @ApiParam("动作日志记录") + private WmsAutoTaskLog wmsAutoTaskLog; + @ApiParam("任务生成数量") private Double taskQty; From 7517a11a904d2acd0d5de7747312bc1b32587ab1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 3 Jul 2020 13:47:25 +0800 Subject: [PATCH 150/156] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2223]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 20 +---------- .../pojo/mes/model/ButtonComponentReqModel.java | 3 ++ .../mes/model/InjectionProductionControlModel.java | 42 ++++++++++++++++++++++ .../pojo/mes/model/MesWorkOrderExtendModel.java | 42 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationResultBean.java | 4 +++ 5 files changed, 92 insertions(+), 19 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java 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 0a67fe0..9cccc86 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 @@ -2,19 +2,16 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; -import com.alibaba.fastjson.JSONObject; 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 org.springframework.util.StringUtils; import javax.persistence.*; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description: @@ -159,7 +156,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Lob @Column(name = "EXTEND") @ApiParam("扩展数据") - private String extend; + public String extend; @Column(name = "RESERVED1") @ApiParam("预留字段1") @@ -273,10 +270,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { public String comButtonCode; @Transient - @ApiParam(value = "扩展数据MAP") - public Map extendMap; - - @Transient @ApiParam("工单源序号") private Double srcSeq; @@ -320,15 +313,4 @@ public class MesWorkOrder extends BaseBean implements Serializable { return this.approvalStatus == null ? 0 : this.approvalStatus; } - public Map getExtendMap() { - try { - if (!StringUtils.isEmpty(this.extend)) { - return JSONObject.parseObject(this.extend, Map.class); - } else { - return null; - } - } catch (Exception e) { - return null; - } - } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java index 93e598e..979d50d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java @@ -55,4 +55,7 @@ public class ButtonComponentReqModel { @ApiParam("用户信息") private String userInfo; + @ApiParam("json数据") + private String data; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java new file mode 100644 index 0000000..5c9d2e3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("注塑生产控制MODEL") +public class InjectionProductionControlModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("当前合格数量") + private String standardQtyCur; + + @ApiParam("当前合格数量") + private String completeQty; + + @ApiParam("总不合格数量") + private String scrapQty; + + @ApiParam("包装编号") + private String packageNo; + + @ApiParam("数量") + private String qty; + + @ApiParam("包装时间") + private String createDatetime; + + @ApiParam("箱条码状态") + private String printStatusName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java new file mode 100644 index 0000000..cf9c3a1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.springframework.beans.BeanUtils; +import org.springframework.util.StringUtils; + +import javax.persistence.Transient; +import java.util.HashMap; +import java.util.Map; + +/** + * @Description : 生产工单扩展 + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-03-30 13:42 + * @Modify: + **/ +@Data +@Api(value="生产工单扩展",description = "生产工单扩展") +public class MesWorkOrderExtendModel extends MesWorkOrder { + + @Transient + @ApiParam(value = "扩展数据MAP") + public Map extendMap; + + public Map getExtendMap() { + try { + if (!StringUtils.isEmpty(super.extend)) { + return JSONObject.parseObject(super.extend, Map.class); + } else { + return new HashMap<>(); + } + } catch (Exception e) { + return new HashMap<>(); + } + } + +} 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 46db502..f039ece 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 @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -58,4 +59,7 @@ public class StationResultBean implements Serializable { @ApiParam("特殊展示数据") private Object specialDisplayData; + + @ApiParam("工位参数") + private Map wcpcMap = new HashMap<>(); } From ad6249f412bb39236034f67df031b0ab6aeea633 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 3 Jul 2020 14:09:34 +0800 Subject: [PATCH 151/156] Finish Task #2235 Cost:8h --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/IfQueueShipping.java | 6 ++-- .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 6 +++- .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 --- .../pojo/mes/bean/MesQueueJitPlanDetail.java | 2 +- 5 files changed, 45 insertions(+), 9 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 998da89..dfa6734 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 @@ -6474,4 +6474,40 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT预装队列 工单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE { + SPARE_PART_PRODUCTION(10, "备件生产"), + REPRODUCTION_RMS(20, "重新生产-报功"), + REPRODUCTION_NOT_RMS(30, "重新生产-不报功"); + + private Integer value; + private String description; + + QUEUE_JIT_PLAN_WORK_ORDER_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.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 d65c83c..3088e6b 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 @@ -126,10 +126,10 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "JIT_SEQ") @ApiParam("jit排序号") - private String jitSeq; + private Double jitSeq; @Column(name = "JIT_TYPE_FLAG") - @ApiParam("jit类型标识") + @ApiParam("JIT类型标识") private String jitTypeFlag; @Column(name = "CUST_POINT_DATE") @@ -138,7 +138,7 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "CUST_PLANT_CODE") @ApiParam("客户工厂代码") - private String custPlantDate; + private String custPlantCode; @Column(name = "DOCK_NO") @ApiParam("道口") 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 0f88155..db8ee80 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 @@ -79,7 +79,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "JIT_SEQ") @ApiParam("JIT排序号") - private String jitSeq; + private Double jitSeq; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") @@ -105,6 +105,10 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @ApiParam("解析文件路径") private String fileUrl; + @Column(name = "WORK_ORDER_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + @Transient @ApiParam("计划上线开始时间") private String planStartDate; 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 df5829a..5177ba9 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 @@ -54,8 +54,4 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("用量") private Double qty; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品位置代码") - private String produceCtgyCode; } 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 402d4c6..d290454 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 @@ -44,7 +44,7 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { private String partNo; @Column(name = "PART_NAME") - @ApiParam("产品名称") + @ApiParam("物料名称") private String partName; @Column(name = "PRODUCE_CTGY_CODE") From 7f4c173105e34b30e98dfa62bb162f8f24611866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 3 Jul 2020 16:47:40 +0800 Subject: [PATCH 152/156] =?UTF-8?q?=E3=80=902250=20=E6=80=BB=E8=A3=85?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0,2228=2006=201.2.4.6.1.7=20?= =?UTF-8?q?=E6=80=BB=E8=A3=85=E4=B8=8A=E7=BA=BF=E5=B7=A5=E4=BD=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 3 files changed, 17 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 19f6de5..358e5d0 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 @@ -2407,6 +2407,16 @@ public class MesPcnEnumUtil { } return tmp; } + + 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; + } } 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 a943c4a..83396d1 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 @@ -45,4 +45,8 @@ public class MesCustomerPart extends BaseBean implements Serializable { @Column(name = "CUSTOMER_PART_NAME") @ApiParam("客户零件描述") private String customerPartName; + + @Column(name = "CUSTOMER_CFG_CODE") + @ApiParam("客戶配置代碼") + private String customerCfgCode; } 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 a480700..07cadf3 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 @@ -156,6 +156,9 @@ public class StationRequestBean implements Serializable { @ApiParam("状态机代码") private String smCode; + @ApiParam("区域代码") + private String areaCode; + @Override public String toString() { return "StationRequestBean{" + From 2d392825217537037126dfe1a4a7bcb7f3ec94bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 3 Jul 2020 17:14:08 +0800 Subject: [PATCH 153/156] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E9=80=BB=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/PaintWorkOrderSnModel.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/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java index 16a9bfe..b6c5a7f 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 @@ -29,7 +29,7 @@ public class PaintWorkOrderSnModel extends BaseBean { private String partNo; @ApiParam("物料名称") - private String partNameRdd; + private String partName; @ApiParam("颜色代码") private String colorCode; From 04eaa0201fb1e53d2ab6a921d58e229fc713736c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Jul 2020 19:26:19 +0800 Subject: [PATCH 154/156] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=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/MesQueueJitPlanBom.java | 4 ---- 1 file changed, 4 deletions(-) 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 df5829a..5177ba9 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 @@ -54,8 +54,4 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("用量") private Double qty; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品位置代码") - private String produceCtgyCode; } From b48d38ee62589a35235ddad07fd4448c44f0ca15 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 3 Jul 2020 19:43:43 +0800 Subject: [PATCH 155/156] Finish Task #2080 Cost:8h --- .../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 211be8f..d298220 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 @@ -1367,7 +1367,8 @@ public class WmsEnumUtil { PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), ZORE_STOCK(130, "零库存"), - MATERIAL_COVERAGE(140, "物料覆盖"); + MATERIAL_COVERAGE(140, "物料覆盖"), + CHECK(150, "点检"); private int value; private String description; From 98849d3131859eeafedb5d7dc3b34fbc17ff9443 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Jul 2020 21:15:42 +0800 Subject: [PATCH 156/156] =?UTF-8?q?=E8=B0=83=E6=95=B4jitseq=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/mes/bean/MesQueueJitPlan.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/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index db8ee80..b55af50 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 @@ -79,7 +79,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "JIT_SEQ") @ApiParam("JIT排序号") - private Double jitSeq; + private String jitSeq; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码")