From b3a04911b6ce91cb8787621da97a371cadc5dbcc Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 13 Dec 2019 13:59:46 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=20task=20`1300`=205=20BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 ++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 38 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 5 +++ 3 files changed, 47 insertions(+), 3 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 4ba381d..2d6168e 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 @@ -276,7 +276,8 @@ public class MesEnumUtil { DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), - QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"); + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), + WC_CHECK("WC_CHECK", "开线检查项"); private String value; private String description; @@ -1462,8 +1463,8 @@ public class MesEnumUtil { MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), MES_DATASOURCE(360, "DB地址清单"), MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), - MES_PLC(390,"PLC地址清单"); + MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"), + MES_PLC(390, "PLC地址清单"); 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 cf5ea6e..8f6f9c2 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 @@ -214,7 +214,45 @@ public class MesPcnEnumUtil { } } + /** + * MES_TYPE_CFG 类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_TYPE_CFG { + + DEFECT("DEFECT", "缺陷"), + DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), + REPAIR("REPAIR", "处理措施"), + SCRAP("SCRAP", "报废原因"), + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), + WC_CHECK("WC_CHECK", "开线检查项"); + + private String value; + private String description; + + MES_TYPE_CFG(String value, String description) { + this.value = value; + this.description = description; + } + + public String 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.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } /** * MesProdBindRecord 是否是关键件 */ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java index 6dc2133..43f7f49 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -36,6 +36,8 @@ public class WcCheckModel { private List materials; @ApiParam("物料 列") private Map materialsColumn; + @ApiParam("普通列") + private Map commonColumn; @ApiParam("法") private List routes; @@ -66,6 +68,9 @@ public class WcCheckModel { @ApiParam("需要展示的数据") private Map need2ShowMap; + @ApiParam("重构map") + private Map> showMap; + public WcCheckModel initialWcCheckModel() { WcCheckModel wcCheckModel = new WcCheckModel(); From 7bc434ed15eb0a9168dff1565a53cd3f421faf6c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 13 Dec 2019 14:47:51 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=BC=98=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/andon/bean/MesWorkCell.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java index 30d3683..0533141 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java @@ -67,6 +67,6 @@ public class MesWorkCell extends BaseBean { private String workCellType; public String getName(){ - return this.workCellName; + return this.workCellCode; } } From 59e7704f679fac135d6a1914893f48ea30125e90 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 13 Dec 2019 17:36:55 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E8=A3=85=E8=BD=A6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index cdcb0cb..8cdd6a1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -34,4 +34,8 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("工厂代码") protected String organizeCode; + + private String dockNo; + + private Long id; } From da4f32f0b4310274db47c6cc82157e1dbcf4b1a6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 13 Dec 2019 17:42:52 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E3=80=90=E5=9C=A8=E9=85=8D=E6=96=99?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=B3=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E6=94=BE=E5=A4=A7=E9=95=9C=EF=BC=8C=E8=BE=93=E5=85=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E6=98=BE=E7=A4=BA=E7=9A=84=E5=86=85=E5=AE=B9=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9C=89=E6=9D=A5=E6=BA=90=EF=BC=8C=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E7=B4=A7=E6=80=A5=20=E3=80=916978?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 83788f2..99eb8af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -99,6 +99,7 @@ public class WmsDocMovementMaster extends BaseBean { public Integer isTask; @Column(name = "PRIORITY") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRIORITY.class, refForeignKey = "value", value = "description") @ApiParam(value = "优先级", example = "1") public Integer priority; From b9b30cf19c8353c7523dc68107469cf64343ae0f Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 13 Dec 2019 18:07:30 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1306?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A0=87=E5=87=86=E9=85=8D=E7=BD=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/util/StringUtil.java | 22 +++++++ .../estsh/i3plus/pojo/mes/bean/MesPartObject.java | 8 +-- .../i3plus/pojo/mes/model/MesPartObjectModel.java | 67 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 ++++++++ 4 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java index 46af027..95bfee7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java @@ -3,7 +3,11 @@ package cn.estsh.i3plus.pojo.base.util; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class StringUtil { @@ -65,4 +69,22 @@ public class StringUtil { return null; } } + + private static Pattern linePattern = Pattern.compile("_(\\w)"); + + /** 驼峰转下划线 */ + public static Map humpToLine(Map map) { + Map resultMap = new HashMap<>(); + for (String str : map.keySet()) { + str = str.toLowerCase(); + Matcher matcher = linePattern.matcher(str); + StringBuffer sb = new StringBuffer(); + while (matcher.find()) { + matcher.appendReplacement(sb, matcher.group(1).toUpperCase()); + } + matcher.appendTail(sb); + resultMap.put(sb.toString(), map.get(str)); + } + return resultMap; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index 0dc5011..0bac54e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -37,10 +37,6 @@ public class MesPartObject extends BaseBean { @ApiParam("对象代码") private String objectCode; - @Column(name = "OBJECT_NAME") - @ApiParam("物料名称") - private String objectName; - @Column(name = "WORK_CENTER_CODE") @ApiParam("生产线") private String workCenterCode; @@ -60,4 +56,8 @@ public class MesPartObject extends BaseBean { @Transient @ApiParam("数据组号") private String groupNo; + + @Transient + @ApiParam("对象名称") + private String objectName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java new file mode 100644 index 0000000..0e1a398 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\13 14:33 + * @Modify: + **/ +@Data +public class MesPartObjectModel { + + private Long id; + + @ApiParam(value ="组织代码") + private String organizeCode; + + @ApiParam(value = "创建用户") + private String createUser; + + @ApiParam(value = "创建日期") + private String createDatetime; + + @ApiParam(value = "修改人") + private String modifyUser; + + @ApiParam(value = "修改日期") + private String modifyDatetime; + + @ApiParam(value = "有效性",example = "1") + private Integer isValid; + + @ApiParam(value = "是否已删除",example = "2") + private Integer isDeleted; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("对象名称") + private String objectName; + + public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.partNo = partNo; + this.objectCode = objectCode; + this.workCenterCode = workCenterCode; + this.objectName = objectName; + } +} 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 c96c3ce..6b938ee 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 @@ -2057,4 +2057,28 @@ public class MesHqlPack { } return packBean; } + + /** + * 质量标准配置 + * + * @param qualityStandardCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQualityStandardCfg(MesQualityStandardCfg qualityStandardCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qualityStandardCfg, organizeCode); + if (!StringUtils.isEmpty(qualityStandardCfg.getStandardType())) { + DdlPreparedPack.getNumEqualPack(qualityStandardCfg.getStandardType(), "standardType", packBean); + } + if (!StringUtils.isEmpty(qualityStandardCfg.getObjectKey())) { + DdlPreparedPack.getStringLikerPack(qualityStandardCfg.getObjectKey(), "objectKey", packBean); + } + if (!StringUtils.isEmpty(qualityStandardCfg.getObjectType())) { + DdlPreparedPack.getNumEqualPack(qualityStandardCfg.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(qualityStandardCfg.getObjectKeyValue())) { + DdlPreparedPack.getStringLikerPack(qualityStandardCfg.getObjectKeyValue(), "objectKeyValue", packBean); + } + return packBean; + } } From 2c63820f984c519f11d45436d61bfc2f31e68d74 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 13 Dec 2019 19:57:47 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 28 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index 8cdd6a1..b20a52b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -20,9 +20,6 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("物料号") private String partNo; - @ApiParam("运输状态") - private String orderStatus; - @ApiParam("单据号") private String moveNo; @@ -35,7 +32,30 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("工厂代码") protected String organizeCode; + @ApiParam("ID") + private Long id; + + @ApiParam(value ="道口") private String dockNo; - private Long id; + @ApiParam(value ="承运商编号") + private String vendorNo; + + @ApiParam(value ="承运商名称RDD") + private String vendorName; + + @ApiParam(value ="驾驶员编号") + private String driverNo; + + @ApiParam(value ="驾驶员名称RDD") + private String driverName; + + @ApiParam(value ="驾驶员联系方式RDD") + private String phone; + + @ApiParam(value ="单据状态") + private Integer orderStatus; + + @ApiParam(value ="车牌号RDD") + private String carNo; } From e0f81a73d7bdd2b38588aa28af4d70b8c0625733 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 14 Dec 2019 09:46:32 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E6=97=A5=E5=8E=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 393ee0e..c86230f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -18,4 +18,8 @@ public class GanttCalendarModel { @JsonDeserialize(using = CustomDateDeserializer.class) private Date endDate; private String cls; + //private String timeRangeColor; + private String eventColor; + private String name; + private Long workId; } From 99fd4221e21d2cd5ad1a223a4e94dd66f61c8d72 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Sat, 14 Dec 2019 17:19:32 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=20task=20`1304`=201=20=E6=B4=BB=E5=8C=96?= =?UTF-8?q?=E5=BC=80=E7=BA=BF=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 9 +-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 +--- .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 68 +++++----------------- 3 files changed, 20 insertions(+), 67 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 2d6168e..a847aa6 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 @@ -3726,13 +3726,8 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - - PERSON(10, "person", "人员"), - EQUIPMENT(20, "equipment", "设备"), - MATERIAL(30, "material", "物料"), - ROUTE(40, "route", "工艺"), - ONLINE_SIGNAL(50, "onlineSignal", "开线信号"), - MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号"); + MATERIAL(10, "MATERIAL", "物料"), + ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"); private int value; private String code; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 8f6f9c2..653955c 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 @@ -1213,14 +1213,8 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - - PERSON(10, "people", "人员"), - EQUIPMENT(20, "equipments", "设备"), - MATERIAL(30, "materials", "物料"), - ROUTE(40, "routes", "工艺"), - ONLINE_SIGNAL(50, "onlineSignal", "开线信号"), - ENVIRONMENT(60, "environment", "环境"); - + MATERIAL(10, "MATERIAL", "物料"), + ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java index 43f7f49..e1e1c93 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -22,30 +22,17 @@ import java.util.*; @Api("开线管控model") public class WcCheckModel { - @ApiParam("人") - private List people; - @ApiParam("人 列") - private Map peopleColumn; - - @ApiParam("机") - private List equipments; - @ApiParam("机 列") - private Map equipmentsColumn; + @ApiParam("工作中心") + private String workCenterCode; - @ApiParam("物料") - private List materials; - @ApiParam("物料 列") - private Map materialsColumn; - @ApiParam("普通列") - private Map commonColumn; + @ApiParam("工单") + private String workOrder; - @ApiParam("法") - private List routes; - @ApiParam("法 列") - private Map routesColumn; + @ApiParam("产品号") + private String partNo; - @ApiParam("对象list和列关系") - private Map dataColumnRelation; + @ApiParam("是否通过") + private Integer isPass; @ApiParam("开线信号") private Integer onlineSignal; @@ -53,46 +40,23 @@ public class WcCheckModel { @ApiParam("开线对象") MesWcCheckRecord onlineSignalEqu; - @ApiParam("是否通过") - private Integer isPass; - - @ApiParam("工作中心") - private String workCenterCode; - - @ApiParam("工单") - private String workOrder; - - @ApiParam("产品号") - private String partNo; - @ApiParam("需要展示的数据") - private Map need2ShowMap; + private Map titleMap; - @ApiParam("重构map") - private Map> showMap; + @ApiParam("对象list和列关系") + private Map> dataColumnRelation; + @ApiParam("重构map") + private Map> dataMap; public WcCheckModel initialWcCheckModel() { WcCheckModel wcCheckModel = new WcCheckModel(); - wcCheckModel.setPeople(new ArrayList<>()); - wcCheckModel.setEquipments(new ArrayList<>()); - wcCheckModel.setMaterials(new ArrayList<>()); - wcCheckModel.setRoutes(new ArrayList<>()); - wcCheckModel.setPeopleColumn(new HashMap<>()); - wcCheckModel.setEquipmentsColumn(new HashMap<>()); - wcCheckModel.setMaterialsColumn(new HashMap<>()); - wcCheckModel.setRoutesColumn(new HashMap<>()); wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); onlineSignalEqu = new MesWcCheckRecord(); - wcCheckModel.setNeed2ShowMap(new HashMap<>()); - - Map dataColumnRelationMap = new HashMap<>(); - dataColumnRelationMap.put("people", "peopleColumn"); - dataColumnRelationMap.put("equipments", "equipmentsColumn"); - dataColumnRelationMap.put("materials", "materialsColumn"); - dataColumnRelationMap.put("routes", "routesColumn"); - wcCheckModel.setDataColumnRelation(dataColumnRelationMap); + wcCheckModel.setTitleMap(new LinkedHashMap<>()); + wcCheckModel.setDataMap(new LinkedHashMap<>()); + wcCheckModel.setDataColumnRelation(new LinkedHashMap<>()); return wcCheckModel; } From f23b0f7bfed0e43f0866f9499fad2a97d7a7c032 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 16 Dec 2019 09:49:21 +0800 Subject: [PATCH 09/12] =?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 --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 ++++-- 1 file changed, 4 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 a847aa6..efd4ce1 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 @@ -1463,8 +1463,10 @@ public class MesEnumUtil { MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), MES_DATASOURCE(360, "DB地址清单"), MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"), - MES_PLC(390, "PLC地址清单"); + MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), + MES_PLC(390,"PLC地址清单"), + MES_PROCESS(400,"工序信息"), + MES_KPSN_RULE(410,"关键件条码校验规则"); private int value; private String description; From 6d357abe9fad40419ca85da966f9dce1d35f3251 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 16 Dec 2019 13:31:38 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=20task=20`1304`=202=20=E6=B4=BB=E5=8C=96?= =?UTF-8?q?=E5=BC=80=E7=BA=BF=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index 2c1d0f7..46134cc 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -40,6 +40,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("工作单元名称") + private String workCellName; + @ApiParam("流程代码") private String routeCode; From 258c1ccbe8dfc2390bb17edc223e20f1755132f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Dec 2019 14:24:15 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=9A=E4=BC=98=E5=8C=96=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?CELL=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C+=E6=9C=89=E4=BA=9BSHEET=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E6=97=B6=E6=97=A0=E9=9C=80=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C+=E5=BF=AB=E9=80=9F=E7=A7=BB=E5=BA=93=EF=BC=9A?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E7=A7=BB=E5=85=A5=E5=BA=93=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E7=A0=81=EF=BC=9B=E4=B8=8D=E5=8F=AF=E5=A4=9A?= =?UTF-8?q?=E4=BA=BA=E6=93=8D=E4=BD=9C=E5=90=8C=E4=B8=80=E4=B8=AA=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E8=BF=9B=E8=A1=8C=E6=95=B4=E5=BA=93=E7=A7=BB=E5=BA=93?= 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 -- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 1 + 2 files changed, 1 insertion(+), 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 d6d917c..68528f9 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 @@ -981,7 +981,6 @@ public class WmsEnumUtil { /** * 业务表：库存条码状态 - * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_STATUS { @@ -991,7 +990,6 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), - //SCRAP(70, "报废"), COMMING(80, "在途"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 5878561..2926428 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -112,6 +112,7 @@ public class WmsActionGroupDetails extends BaseBean { @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false) @ApiParam(value = "是否自动开窗") + @AnnoOutputColumn private Integer isAutoOpenWindow; @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''") From c5ae91b41e46559300db58f509a5c5767575db81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 16 Dec 2019 17:25:57 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E3=80=90KT-1286=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E8=AE=A1=E5=88=92=E6=8B=89=E5=8A=A8JOB?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +++++++++++++-- 3 files changed, 16 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 d6d917c..de1b164 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 @@ -4656,7 +4656,7 @@ public class WmsEnumUtil { } /** - * 计划拉动明细表状态创建 + * 计划拉动主表状态创建 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index b2e4e34..0a41d3e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") - private String wrokorderNo; + private String woekorderNo; @Column(name="ITEM") @ApiParam(value = "行号", example = "0") @@ -107,7 +107,7 @@ public class WmsPullTaskDetails extends BaseBean{ private Double bootLotNo = 0d; @Column(name="ORDER_STATUS") - @ApiParam(value = "单据状态", example = "0") + @ApiParam(value = "明细状态", example = "0") private Integer orderStatus = 0; public Integer getOrderStatus() { 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 17c8805..1f4fc92 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 @@ -2618,7 +2618,18 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getInPack(statusList, "orderStatus", result); + List stringList = null; + List integerList = null; + //List integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList()); + if(StringUtils.isNotBlank(statusList)){ + stringList = Arrays.asList(statusList.split(",")); + integerList = new ArrayList<>(); + for(String sl : stringList){ + integerList.add(Integer.valueOf(sl)); + } + } + + DdlPreparedPack.getInPackList(integerList, "orderStatus", result); DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result); DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result); DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result); @@ -2637,7 +2648,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result); DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result); getStringBuilderPack(wmsPullTaskDetails, result);