From 33ef135392dfc0c192c416460a596f365c912b33 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 3 Jun 2019 09:37:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=A8-=E6=9D=A1=E7=A0=81=E6=98=8E=E7=BB=86=E8=A1=A8=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=20=20=E7=82=89=E6=89=B9?= =?UTF-8?q?=E5=8F=B7=20=20=E6=94=B9=E4=B8=BA=20=20=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=89=B9=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; } From 3d3e7eaf0dbbf073a566d73d0abf4d5c82ac60cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 3 Jun 2019 13:44:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ANDON=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) 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; + } }