diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 32e0d77..05c9462 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -126,6 +126,8 @@ public class AndonHqlPack { public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){ DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result); + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result); DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); getStringBuilderPack(andonAlarmCause, result); @@ -425,4 +427,33 @@ public class AndonHqlPack { return result; } + + /** + * ANDON通知方式查询条件封装 + * @param andonResponse + * @return + */ + public static DdlPackBean packAndonResponse(AndonResponse andonResponse){ + DdlPackBean result = new DdlPackBean(); + + getStringBuilderPack(andonResponse, result); + + return result; + } + + /** + * ANDON通知对象查询条件封装 + * @param andonResponseObject + * @return + */ + public static DdlPackBean packAndonResponseObject(AndonResponseObject andonResponseObject){ + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result); + DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result); + DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result); + + getStringBuilderPack(andonResponseObject, result); + + return result; + } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 895d0e0..3e8eb11 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -92,7 +92,7 @@ public class SwebPurchaseOrderSn extends BaseBean { private String checkCode; @Column(name = "STOVE_NO") - @ApiParam(value = "炉批号") + @ApiParam(value = "特殊批号") private String stoveNo; @Column(name = "BATCH_NO") @@ -117,6 +117,10 @@ public class SwebPurchaseOrderSn extends BaseBean { private Double weight; @Transient + @ApiParam(value = "合同号") + private String refNo; + + @Transient @ApiParam(value = "是否可编辑(前端使用)") private boolean isSet = false; }