From ffb6f8a17cede3a7dbfd2918869a7ccb70ddd448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 22 Aug 2019 10:00:45 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=8D=E5=88=86=E9=A1=B5=EF=BC=8C=E4=B8=BB=E8=A6=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 7d034c6..e1ede6a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -18,7 +18,6 @@ public class WmsTaskInfoModel implements Serializable { private static final long serialVersionUID = 8755413052807531167L; @ApiParam("任务单号") public String orderNo; - @Column(name = "TRANS_TYPE_CODE") /** * 状态:1=创建,10=待处理,20=已处理 */ @@ -28,6 +27,7 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("作业类型名称") public String opTypeName; + @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型代码") private String transTypeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index e33b3b1..a01642f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -8,10 +8,7 @@ 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 javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_TASK") +@Table(name = "WMS_TASK",indexes = { + @Index(columnList = "TASK_STATUS"), + @Index(columnList = "TRANS_TYPE_CODE") +}) @Api("作业任务表") public class WmsTaskInfo extends BaseBean { From 2bc04b407e7da5f3e75f84939c0be9468f9bac70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 22 Aug 2019 16:02:33 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E3=80=81=E6=97=B6=E9=97=B4=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java index 2b345d4..3cc6419 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java @@ -47,4 +47,14 @@ public class WmsPickingMovement extends BaseBean { @ApiParam(value = "工厂") @AnnoOutputColumn private String factory; + + @ApiParam(value = "计划日期") + @AnnoOutputColumn + private String planDate; + + @ApiParam(value = "计划时间") + @AnnoOutputColumn + private String planTime; + + } From 60eadfac7a62c07c11295ff10e95eaa11a645ae1 Mon Sep 17 00:00:00 2001 From: wangjie Date: Thu, 22 Aug 2019 14:39:37 -0700 Subject: [PATCH 3/8] =?UTF-8?q?mes=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8A=A0=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 8 +-- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 74 +++++++++++----------- 2 files changed, 41 insertions(+), 41 deletions(-) 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 b3eaebc..973555a 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 @@ -147,23 +147,23 @@ public class MesWorkOrder extends BaseBean { public String prodCfgName; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") public String startTimeStart; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") public String startTimeEnd; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") public String endTimeStart; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") public String endTimeEnd; 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 02349f5..648be8b 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 @@ -75,7 +75,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean); } if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) { - DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean); + DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean); } // 时间段查询 @@ -161,7 +161,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean); } if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) { - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); } if (mesWorkOrder.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); @@ -345,7 +345,7 @@ public class MesHqlPack { public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); if (StringUtils.isNotEmpty(shift.getShiftCode())) { - DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); + DdlPreparedPack.getStringLikerPack(shift.getShiftCode(), "shiftCode", packBean); } if (StringUtils.isNotEmpty(shift.getShiftName())) { DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); @@ -451,7 +451,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); } if (StringUtils.isNotEmpty(mesESOP.getPartNo())) { - DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean); } return packBean; @@ -603,7 +603,7 @@ public class MesHqlPack { public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode); if (StringUtils.isNotEmpty(process.getProcessCode())) { - DdlPreparedPack.getStringEqualPack(process.getProcessCode(), "processCode", packBean); + DdlPreparedPack.getStringLikerPack(process.getProcessCode(), "processCode", packBean); } if (StringUtils.isNotEmpty(process.getProcessName())) { DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean); @@ -621,7 +621,7 @@ public class MesHqlPack { public static DdlPackBean getMesStep(MesStep step, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode); if (StringUtils.isNotEmpty(step.getStepCode())) { - DdlPreparedPack.getStringEqualPack(step.getStepCode(), "stepCode", packBean); + DdlPreparedPack.getStringLikerPack(step.getStepCode(), "stepCode", packBean); } if (StringUtils.isNotEmpty(step.getStepName())) { DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean); @@ -645,7 +645,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean); } if (StringUtils.isNotEmpty(stepParam.getParamCode())) { - DdlPreparedPack.getStringEqualPack(stepParam.getParamCode(), "paramCode", packBean); + DdlPreparedPack.getStringLikerPack(stepParam.getParamCode(), "paramCode", packBean); } if (StringUtils.isNotEmpty(stepParam.getParamName())) { DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean); @@ -687,13 +687,13 @@ public class MesHqlPack { public static DdlPackBean getMesBom(MesBom bom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode); if (StringUtils.isNotEmpty(bom.getPartNo())) { - DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bom.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(bom.getItemPartNo())) { - DdlPreparedPack.getStringEqualPack(bom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringLikerPack(bom.getItemPartNo(), "itemPartNo", packBean); } if (StringUtils.isNotEmpty(bom.getBomVersion())) { - DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean); + DdlPreparedPack.getStringLikerPack(bom.getBomVersion(), "bomVersion", packBean); } return packBean; @@ -708,13 +708,13 @@ public class MesHqlPack { public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode); if (StringUtils.isNotEmpty(processBom.getPartNo())) { - DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(processBom.getItemPartNo())) { - DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean); } if (StringUtils.isNotEmpty(processBom.getProcessCode())) { - DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean); + DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean); } return packBean; @@ -729,7 +729,7 @@ public class MesHqlPack { public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); if (StringUtils.isNotEmpty(customer.getCustomerCode())) { - DdlPreparedPack.getStringEqualPack(customer.getCustomerCode(), "customerCode", packBean); + DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); } if (StringUtils.isNotEmpty(customer.getCustomerName())) { DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); @@ -747,7 +747,7 @@ public class MesHqlPack { public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode); if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())) { - DdlPreparedPack.getStringEqualPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean); + DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean); } if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())) { DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean); @@ -768,10 +768,10 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean); } if (StringUtils.isNotEmpty(customerPart.getPartNo())) { - DdlPreparedPack.getStringEqualPack(customerPart.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(customerPart.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())) { - DdlPreparedPack.getStringEqualPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); + DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); } return packBean; @@ -786,10 +786,10 @@ public class MesHqlPack { public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) { - DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean); + DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean); } if (StringUtils.isNotEmpty(keyData.getKeyDataName())) { - DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean); + DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean); } return packBean; @@ -804,10 +804,10 @@ public class MesHqlPack { public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode); if (StringUtils.isNotEmpty(kpData.getPartNo())) { - DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "partNo", packBean); } if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) { - DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean); + DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean); } return packBean; @@ -822,10 +822,10 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode); if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())) { - DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); } if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())) { - DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean); + DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean); } return packBean; @@ -840,7 +840,7 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode); if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) { - DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean); + DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean); } if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())) { DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean); @@ -864,7 +864,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean); } if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())) { - DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(prodCfgDetail.getPartNo(), "partNo", packBean); } return packBean; @@ -879,7 +879,7 @@ public class MesHqlPack { public static DdlPackBean getMesPart(MesPart part, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode); if (StringUtils.isNotEmpty(part.getPartNo())) { - DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(part.getPartName())) { DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean); @@ -906,7 +906,7 @@ public class MesHqlPack { public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode); if (StringUtils.isNotEmpty(partCategory.getCategoryCode())) { - DdlPreparedPack.getStringEqualPack(partCategory.getCategoryCode(), "categoryCode", packBean); + DdlPreparedPack.getStringLikerPack(partCategory.getCategoryCode(), "categoryCode", packBean); } if (StringUtils.isNotEmpty(partCategory.getCategoryName())) { DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean); @@ -924,7 +924,7 @@ public class MesHqlPack { public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode); if (StringUtils.isNotEmpty(packSpec.getSpecCode())) { - DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "specCode", packBean); + DdlPreparedPack.getStringLikerPack(packSpec.getSpecCode(), "specCode", packBean); } if (StringUtils.isNotEmpty(packSpec.getSpecName())) { DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); @@ -945,7 +945,7 @@ public class MesHqlPack { public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode); if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())) { - DdlPreparedPack.getStringEqualPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); + DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); } if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())) { DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean); @@ -963,7 +963,7 @@ public class MesHqlPack { public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode); if (StringUtils.isNotEmpty(kpsnRule.getPartNo())) { - DdlPreparedPack.getStringEqualPack(kpsnRule.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(kpsnRule.getPartNo(), "partNo", packBean); } return packBean; @@ -978,7 +978,7 @@ public class MesHqlPack { public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode); if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())) { - DdlPreparedPack.getStringEqualPack(partScheduleBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(partScheduleBom.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())) { DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean); @@ -996,10 +996,10 @@ public class MesHqlPack { public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode); if (StringUtils.isNotEmpty(objectDao.getObjectCode())) { - DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(objectDao.getObjectCode(), "objectCode", packBean); } if (StringUtils.isNotEmpty(objectDao.getDaoClass())) { - DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean); + DdlPreparedPack.getStringLikerPack(objectDao.getDaoClass(), "daoClass", packBean); } return packBean; @@ -1014,10 +1014,10 @@ public class MesHqlPack { public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode); if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())) { - DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); } if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())) { - DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); } if (null != pcnSyncCfg.getSyncType()) { DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); @@ -1035,10 +1035,10 @@ public class MesHqlPack { public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode); if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); } if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())) { - DdlPreparedPack.getStringEqualPack(workCellParamCfg.getParamCode(), "paramCode", packBean); + DdlPreparedPack.getStringLikerPack(workCellParamCfg.getParamCode(), "paramCode", packBean); } return packBean; From 617bb73dada6e0e359a0e2847a84d8313138b469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 22 Aug 2019 16:09:44 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=8F=98=E9=87=8F=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=20=E4=BF=AE=E6=94=B9hql=E6=9F=A5=E8=AF=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 8 +++++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 8 +++---- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 26 +++++----------------- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 55c1a73..9c929a5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -121,7 +121,7 @@ public class WmsCSOrderDetails extends BaseBean { */ @Transient @ApiParam("差异类型") - public String differenceType; + public Integer differenceType; 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/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 3c493d7..d3a23e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -145,6 +145,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; + @Transient + @ApiParam("业务类型编码") + private Integer busiTypeCode; + public WmsMoveDetails(){} public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ @@ -173,7 +177,7 @@ public class WmsMoveDetails extends BaseBean { public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo, String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo, - Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){ + Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode){ this.organizeCode = organizeCode; this.partNo = partNo; this.orderNo = orderNo; @@ -194,6 +198,6 @@ public class WmsMoveDetails extends BaseBean { this.refSrc = refSrc; this.vendorNo = vendorNo; this.custNo = custNo; - + this.busiTypeCode = busiTypeCode; } } 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 f8d9e0e..7453a8c 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 @@ -155,7 +155,7 @@ public class WmsMoveSn extends BaseBean { @Transient @ApiParam("业务类型编码") - private String busiTypeCode; + private Integer busiTypeCode; @Transient @@ -194,7 +194,7 @@ public class WmsMoveSn extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } - public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String busiTypeCode, String transTypeCode, String refSrc) { + public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; this.destQty = destQty; @@ -211,7 +211,7 @@ public class WmsMoveSn extends BaseBean { } 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 refSrc,String destZoneNo,String destWhNo){ + Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode){ this.organizeCode=organizeCode; this.orderNo=orderNo; this.item=item; @@ -235,6 +235,6 @@ public class WmsMoveSn extends BaseBean { this.refSrc = refSrc; this.destZoneNo = destZoneNo; this.destWhNo =destWhNo; - + this.busiTypeCode = busiTypeCode; } } 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 eecd5fc..4dffc39 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 @@ -40,10 +40,13 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } - // 封装有效状态和删除状态 + // 封装有效状态、删除状态、创建人和创建时间 DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr); + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); + return hqlStr; } @@ -124,9 +127,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); - DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getCreateUser(), "createUser", result); - DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(), - wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true); getStringBuilderPack(wmsDocMovementDetails, result); return result; @@ -165,7 +165,6 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); - DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCreateUser(),"createUser",packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); @@ -206,8 +205,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); - DdlPreparedPack.getStringLikerPack(wmsPOMaster.getCreateUser(), "createUser", result); - DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),wmsPOMaster.getCreateDateTimeEnd(),"createDatetime",result,true); getStringBuilderPack(wmsPOMaster, result); return result; @@ -592,8 +589,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); - DdlPreparedPack.getStringLikerPack(wmsASNMaster.getCreateUser(), "createUser", result); - DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(),wmsASNMaster.getCreateDateTimeEnd(),"createDatetime",result,true); getStringBuilderPack(wmsASNMaster, result); @@ -623,9 +618,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result); //单据来源 DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result); - - DdlPreparedPack.getStringLikerPack(wmsShipping.getCreateUser(), "createUser", result); - DdlPreparedPack.timeBuilder(wmsShipping.getCreateDateTimeStart(),wmsShipping.getCreateDateTimeEnd(),"createDatetime",result,true); getStringBuilderPack(wmsShipping, result); getStringBuilderPack(wmsShipping, result); @@ -713,8 +705,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); - DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCreateUser(), "createUser", result); - DdlPreparedPack.timeBuilder(wmsFGInStock.getCreateDateTimeStart(),wmsFGInStock.getCreateDateTimeEnd(),"createDatetime",result,true); getStringBuilderPack(wmsFGInStock, result); @@ -912,7 +902,6 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); - getStringBuilderPack(wmsStockQuan, result); return result; @@ -1059,11 +1048,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getBusiTypeCode(), "busiTypeCode", result); - DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result); DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); - - DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), - wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true); DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(), wmsMoveMaster.getModifyDateTimeEnd(), "modifyDatetime", result, true); getStringBuilderPack(wmsMoveMaster, result); @@ -1300,7 +1285,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); - + DdlPreparedPack.timeBuilder(wmsCSOrderMaster.getCreateDateTimeStart(), + wmsCSOrderMaster.getCreateDateTimeEnd(), "createDatetime", result, true); getStringBuilderPack(wmsCSOrderMaster, result); return result; From d7b0f30d91f7b0378f4dd2dc6c0bd76339753991 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 22 Aug 2019 18:11:22 +0800 Subject: [PATCH 5/8] =?UTF-8?q?IMPP=20=E5=B9=B3=E5=8F=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=20.=20=E8=BD=AF=E9=80=82?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java | 1 + .../java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java | 2 ++ .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java | 3 ++- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java index d15f322..7879a8e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java @@ -10,6 +10,7 @@ import java.sql.SQLException; * @CreateDate : 2019-06-11 16:12 * @Modify: **/ +@FunctionalInterface public interface IResultSetCall { /** diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java index b7c9f19..ee14fce 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java @@ -62,6 +62,8 @@ public class SuitCoreModel { */ private BsSuitCase bsSuitCase; + private Object bsSuitCaseDetail; + /** * 认证结果 */ diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java index 417a872..e480cbd 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java @@ -10,6 +10,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 : socket套件 @@ -34,6 +36,5 @@ public class BsSocketSuitCase extends BaseBean { @Column(name = "SOCKET_MODE_ID") @ApiParam(value = "socket模式(枚举,服务端，客户端)") private Integer socketModeId; - } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 3c08750..148494f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -51,9 +51,9 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数值类型") private Integer paramValTypeId; - @Column(name = "PARAM_DEFAULT_VAL") + @Column(name = "PARAM_DEFAULT_VALUE") @ApiParam(value = "参数默认值") - private String paramDefaultVal; + private String paramDefaultValue; @Column(name = "PARAM_DESCRIPTION") @ApiParam(value = "参数描述") From aebe7422801a906ce637c718ce13bc7431aac0b2 Mon Sep 17 00:00:00 2001 From: wangjie Date: Thu, 22 Aug 2019 17:04:23 -0700 Subject: [PATCH 6/8] =?UTF-8?q?mes=E6=9E=9A=E4=B8=BE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BB=B6=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97=E7=9A=84=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++++++++ 1 file changed, 36 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 08f41a9..0c9da50 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 @@ -12,6 +12,42 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * 关键件条码规则信息绑定规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BIND_RULE { + + COOPERATION_PART(0, "外协件"), + SELF_CONTROL_PART(1, "自制件"); + + private int value; + private String description; + + BIND_RULE(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; + } + } + + /** * 质量状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From fe65067ca2eacb9e10970bd80a6d73033b07e387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 22 Aug 2019 20:37:38 +0800 Subject: [PATCH 7/8] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=20IOT=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=85=8D=E7=BD=AE=E8=A1=A8=E7=9A=84=20POJO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/iotio/SysIotConfig.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SysIotConfig.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SysIotConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SysIotConfig.java new file mode 100644 index 0000000..a0349e9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SysIotConfig.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.wms.bean.iotio; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : IOT 配置表 + * @Reference : + * @Author : Rock.Yu + * @CreateDate : 2019-08-21 18:04 + * @Modify: + **/ +@Data +public class SysIotConfig implements Serializable { + + private static final long serialVersionUID = 2228817197928571545L; + + private Integer ruid; + private String fsbUrl; + private String fsbType; + private String requesterSystem; + private String topicName; + private String publishCode; + private String interfaceCode; + private String tableName; + private String columnName; + private String seq; + private String guid; + private String groupColumn; + private String uniqueColumn; + private String orderColumn; + private String organizeCode; +} From bfd682cb27d2953d491fb94b30716d6a5e6c9076 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 22 Aug 2019 21:10:04 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E8=BF=87=E6=BB=A4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../bean/AndonAlarmCause.java | 9 ++++ .../bean/AndonCellAlarmCause.java | 50 ++++++++++++++++++++++ .../bean/AndonCellEventCause.java | 48 +++++++++++++++++++++ .../bean/AndonCellEventMethod.java | 50 ++++++++++++++++++++++ .../bean/AndonCellEventPhenomenon.java | 48 +++++++++++++++++++++ .../bean/AndonEventCause.java | 9 ++++ .../bean/AndonEventMethod.java | 9 ++++ .../bean/AndonEventPhenoMenon.java | 9 ++++ .../repository/IAndonCellAlarmCauseRepository.java | 17 ++++++++ .../repository/IAndonCellEventCauseRepository.java | 16 +++++++ .../IAndonCellEventMethodRetository.java | 17 ++++++++ .../IAndonCellEventPhenomenonRepository.java | 17 ++++++++ 12 files changed, 299 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellAlarmCause.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventCause.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventMethod.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventPhenomenon.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellAlarmCauseRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventCauseRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventMethodRetository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventPhenomenonRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java index e674f07..0f46e3b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_呼叫原因 @@ -47,5 +48,13 @@ public class AndonAlarmCause extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acName; + @Transient + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Transient + @ApiParam(value = "工作单元") + private String workCellCode; + } 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 new file mode 100644 index 0000000..87b497a --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellAlarmCause.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +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 : ANDON_工作单元呼叫原因配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:20 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_CELL_ALARM_CAUSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_工作单元呼叫原因配置") +public class AndonCellAlarmCause extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventCause.java new file mode 100644 index 0000000..afef3d0 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventCause.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_工作单元事件原因配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:20 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_CELL_EVENT_CAUSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_工作单元事件原因配置") +public class AndonCellEventCause extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "EC_CODE") + @ApiParam(value = "事件原因代码") + private String ecCode; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventMethod.java new file mode 100644 index 0000000..2553c7c --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventMethod.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +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 : ANDON_工作单元处理方法配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:20 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_CELL_EVENT_METHOD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_工作单元处理方法配置") +public class AndonCellEventMethod extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + private String emCode; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventPhenomenon.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventPhenomenon.java new file mode 100644 index 0000000..8cfd0b7 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonCellEventPhenomenon.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_工作单元事件现象 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:20 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_CELL_EVENT_PHENOMENON") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_工作单元事件现象") +public class AndonCellEventPhenomenon extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "EPM_CODE") + @ApiParam(value = "事件现象代码") + private String epmCode; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java index 8e4a816..f5f0469 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_事件原因 @@ -46,4 +47,12 @@ public class AndonEventCause extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; + + @Transient + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Transient + @ApiParam(value = "工作单元") + private String workCellCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java index ad4611d..ccd2315 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_事件处理方法 @@ -46,4 +47,12 @@ public class AndonEventMethod extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; + + @Transient + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Transient + @ApiParam(value = "工作单元") + private String workCellCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java index c0d4d3a..0580ab0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_事件现象 @@ -42,4 +43,12 @@ public class AndonEventPhenoMenon extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; + + @Transient + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Transient + @ApiParam(value = "工作单元") + private String workCellCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellAlarmCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellAlarmCauseRepository.java new file mode 100644 index 0000000..08ab998 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellAlarmCauseRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : ANDON_工作单元呼叫原因配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:07 + * @Modify: + **/ +@Repository +public interface IAndonCellAlarmCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventCauseRepository.java new file mode 100644 index 0000000..c2ea20e --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventCauseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventCause; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : ANDON_工作单元事件原因配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:07 + * @Modify: + **/ +@Repository +public interface IAndonCellEventCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventMethodRetository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventMethodRetository.java new file mode 100644 index 0000000..720dcd5 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventMethodRetository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventMethod; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : ANDON_工作单元处理方法配置 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:07 + * @Modify: + **/ +@Repository +public interface IAndonCellEventMethodRetository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventPhenomenonRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventPhenomenonRepository.java new file mode 100644 index 0000000..1b0b018 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventPhenomenonRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventPhenomenon; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : ANDON_工作单元事件现象 + * @Reference : + * @Author : crish.li + * @CreateDate : 2019-08-22 11:07 + * @Modify: + **/ +@Repository +public interface IAndonCellEventPhenomenonRepository extends BaseRepository { +}