From b05113f63c62b838e85e98d2a6685828623c63ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 27 May 2020 13:26:46 +0800 Subject: [PATCH] Finish Task #1887 Cost:16h --- .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 61 ++++++++++++++++++++++ 1 file changed, 61 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 0b2ef65..6c67531 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 @@ -480,4 +480,65 @@ public class MesPcnHqlPack { } return packBean; } + + public static DdlPackBean getProdBindRecord(MesProdBindRecord prodBindRecord) { + DdlPackBean packBean = getAllBaseData(prodBindRecord.getOrganizeCode()); + if (!StringUtils.isEmpty(prodBindRecord.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(prodBindRecord.getSerialNumber(), "serialNumber", packBean); + } + return packBean; + } + + public static DdlPackBean getProductData(MesProductData productData) { + DdlPackBean packBean = getAllBaseData(productData.getOrganizeCode()); + if (!StringUtils.isEmpty(productData.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(productData.getSerialNumber(), "serialNumber", packBean); + } + return packBean; + } + + /** + * MES工作中心信息查询条件封装 + * + * @param mesWorkCenter + * @return + */ + public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); + if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) { + DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); + } + if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + } + return packBean; + } + + /** + * MES工作单元信息查询条件封装 + * + * @param mesWorkCell + * @return + */ + public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); + if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCell.getWorkCellName())) { + DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellName(), "workCellName", packBean); + } + + return packBean; + } + }