From 52c35877d81e180cd2ee6e3638bc877ef5c70631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 2 Nov 2020 18:02:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/TJMgnBoardModel.java | 12 ++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 8ded48c..b55ccd2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -47,10 +47,22 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("反喷标识") private String reverseSprayMark; + @ApiParam("班次") + private String shiftName; + + @ApiParam("车间配置代码") + private String areaConfigCode; + @ApiParam("列名") private List> headModelList; @ApiParam("列值") private List> headValueModelList; + @ApiParam("不良汇总列名") + private List defectNameList; + + @ApiParam("不良汇总列值") + private List defectValueList; + } 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 08e4739..bd6bf3d 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 @@ -3501,4 +3501,25 @@ public class MesHqlPack { } return packBean; } + + /** + * MES下线报工查询条件封装 + * + * @param productOffLine + * @return + */ + public static DdlPackBean getIfProductOffLine(IfProductOffLine productOffLine) { + DdlPackBean packBean = getAllBaseDataByNormalPro(productOffLine, productOffLine.getOrganizeCode()); + if (!StringUtils.isEmpty(productOffLine.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(productOffLine.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(productOffLine.getPartNo())) { + DdlPreparedPack.getStringLikerPack(productOffLine.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(productOffLine.getCreateDateTimeStart()) || !StringUtils.isEmpty(productOffLine.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(productOffLine.getCreateDateTimeStart(), productOffLine.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } } From f38e41f1ec4b7382390c9e962d9d9d11f68636c5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 2 Nov 2020 18:54:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index d328625..7188498 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 @@ -5347,7 +5347,9 @@ public class MesEnumUtil { BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"), - BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"); + BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"), + BOARD_MGN_BJ_MAIN_SCREEN("BOARD_MGN_BJ_MAIN_SCREEN", "北京麦格纳总屏幕看板"), + BOARD_MGN_BJ_EQU_REPAIR("BOARD_MGN_BJ_EQU_REPAIR", "北京麦格纳设备维修看板"); private String code; private String description; From fb5df5aedf7e269b009b26da5a9f7fbcec77f98f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 2 Nov 2020 20:48:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=85=A7=E7=89=87=E9=87=87=E9=9B=86?= =?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/MesPcnEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ++++++++++++++++++ 2 files changed, 20 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 27b6637..95ed07f 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 @@ -355,7 +355,8 @@ public class MesPcnEnumUtil { UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), - PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"); + PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"), + SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes"); private int value; private String code; 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 08e4739..a2de9c8 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 @@ -729,6 +729,24 @@ public class MesHqlPack { } /** + * 产线看板矩阵 + * @param boardLineMatrix + * @param organizeCode + * @return + */ + public static DdlPackBean getBoardLineMatrix(MesBoardLineMatrix boardLineMatrix, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(boardLineMatrix, organizeCode); + if (!StringUtils.isEmpty(boardLineMatrix.getAreaCode())) { + DdlPreparedPack.getStringLikerPack(boardLineMatrix.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(boardLineMatrix.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(boardLineMatrix.getWorkCenterCode(), "workCenterCode", packBean); + } + + return packBean; + } + + /** * MES工步参数信息查询条件封装 * * @param stepParam From a844a4d59b3e1f83041bc9972d1ea2cb05358c46 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 2 Nov 2020 22:07:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 5f0f6bb..d34360f 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 @@ -359,6 +359,42 @@ public class WmsMoveSn extends BaseBean { this.modifyUser = modifyUser; } + public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, + String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, + Integer destSnStatus, String lotNo, String dateCode, String leftCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn, + String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcQty = srcQty; + this.srcQty = srcQty; + this.destQty = destQty; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.refSrc = refSrc; + this.destZoneNo = destZoneNo; + this.destWhNo = destWhNo; + this.busiTypeCode = busiTypeCode; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + public WmsMoveSn(Long id,String organizeCode,String vendorNo,String rcPartNo,String outPartNo, Double destQty) { this.id = id; this.organizeCode = organizeCode;