From 58ab257424d7e8bb6d7c0e827cf649d7671bf220 Mon Sep 17 00:00:00 2001 From: backo880607 Date: Fri, 10 Jun 2022 11:20:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 26fabac..9e7c5d9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -204,6 +204,8 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @Transient @ApiParam("库存地代码") private String areaNo; + @ApiParam("单号") + private String orderNo; public WmsTransQuan(){} From d070ed170c02a206324f21dec75e9285f5b36145 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 10 Jun 2022 16:30:40 +0800 Subject: [PATCH 2/2] andon --- .../model/AndonManageRouteErrorRecordModel.java | 6 ++++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java index bf54e47..57a4c56 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java @@ -33,4 +33,10 @@ public class AndonManageRouteErrorRecordModel extends AndonManageRouteErrorRecor @ApiParam(value = "处理状态") private String handleStatusName; + @ApiParam("安灯异常时间开始") + public String alarmErrorTimeStart; + + @ApiParam("安灯异常时间截止") + public String alarmErrorTimeEnd; + } 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 2113e64..437272a 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; import cn.estsh.i3plus.pojo.andon.bean.*; +import cn.estsh.i3plus.pojo.andon.model.AndonManageRouteErrorRecordModel; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -1268,6 +1269,26 @@ public class AndonHqlPack { return packBean; } + /** + * 安灯异常记录 + * @param record + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonManageRouteErrorRecordModel(AndonManageRouteErrorRecordModel record, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(record.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(record.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(record.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getNumEqualPack(record.getHandleStatus(), "handleStatus", packBean); + DdlPreparedPack.getStringEqualPack(record.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getStringEqualPack(record.getAlarmDetailCode(), "alarmDetailCode", packBean); + if (!StringUtils.isEmpty(record.getAlarmErrorTimeStart()) || !StringUtils.isEmpty(record.getAlarmErrorTimeEnd())) { + DdlPreparedPack.timeBuilder(record.getAlarmErrorTimeStart(), record.getAlarmErrorTimeEnd(), "alarmErrorTime", packBean, true); + } + return packBean; + } + public static DdlPackBean getConfig(AndonConfig config) { DdlPackBean packBean = getAllBaseDataByNormalPro(config, config.getOrganizeCode()); DdlPreparedPack.getStringLikerPack(config.getConfigCode(), "configCode", packBean);