From cff90316a55929fa0a1715a61d24a0b0519dbb54 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 11 Jul 2020 23:26:28 +0800 Subject: [PATCH] ptl --- .../estsh/i3plus/pojo/mes/bean/MesProdCfgType.java | 6 +++--- .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 24 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java index 42b3801..419799b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java @@ -27,14 +27,14 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG_TYPE") -@Api("产品配置类型") +@Api("项目") public class MesProdCfgType extends BaseBean implements Serializable { private static final long serialVersionUID = -1726288926948811617L; @Column(name = "PROD_CFG_TYPE_CODE") - @ApiParam("产品配置类型代码") + @ApiParam("项目代码") private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") - @ApiParam("产品配置类型名称") + @ApiParam("项目名称") private String prodCfgTypeName; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index c40e78d..4d24640 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -335,6 +335,12 @@ public class PtlHqlPack { return packBean; } + /** + * 区域 + * @param area + * @param organizeCode + * @return + */ public static DdlPackBean getPtlArea(PtlArea area, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(area, organizeCode); DdlPreparedPack.getStringLikerPack(area.getAreaNo(), "areaNo", packBean); @@ -342,6 +348,12 @@ public class PtlHqlPack { return packBean; } + /** + * 流程状态异常记录 + * @param routeStatusErrorRecord + * @param organizeCode + * @return + */ public static DdlPackBean getPtlRouteStatusErrorRecord(PtlRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode); DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean); @@ -351,4 +363,16 @@ public class PtlHqlPack { DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean); return packBean; } + + /** + * IF_拣货数据 + * @param pickData + * @param organizeCode + * @return + */ + public static DdlPackBean getIfPickData(IfPickData pickData, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(pickData.getSyncFlag(), "syncFlag", packBean); + return packBean; + } }