From 8227353cbdc523775777da07b6ea3a09ccf984cf Mon Sep 17 00:00:00 2001 From: jiajack Date: Thu, 25 Apr 2019 09:56:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java | 10 ++++++ .../pojo/mes/pcn/model/StationRequestBean.java | 6 ++++ .../pojo/mes/pcn/model/StationResultBean.java | 37 ++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java index 1917e34..d9bd177 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :工步 @@ -46,4 +47,13 @@ public class MesStep extends BaseBean { @Column(name = "STEP_OBJECT") @ApiParam("工步对象") private String stepObject; + + @Transient + @ApiParam("工步执行完毕") + private boolean isComplete; + + @Transient + @ApiParam("工步是否跳过") + private boolean isJump; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java index f91da45..e214056 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java @@ -16,12 +16,18 @@ import java.io.Serializable; @Data public class StationRequestBean implements Serializable { + @ApiParam("扫描信息") + private String scanInfo; + @ApiParam("产品条码") private String serialNumber; @ApiParam("物料号") private String partNo; + @ApiParam("组织代码") + private String organizeCode; + @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java new file mode 100644 index 0000000..66909dd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStep; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 工位结果bean + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-24 + * @Modify: + **/ +@Data +public class StationResultBean implements Serializable { + + /** + * 根据客户端所需数据结构，约定不同数据类型 + */ + @ApiParam("数据类型") + private String flagType; + + @ApiParam("是否错误信息") + private boolean fail; + + @ApiParam("执行结果信息") + private String message; + + @ApiParam("工步展示信息") + private String stepHtml; + + @ApiParam("工步清单") + private List stepList; +} From 6ea6b3d54b416c7ad2336807d1ff680e9311a070 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Thu, 25 Apr 2019 16:40:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index dfa8162..2996182 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -63,6 +63,14 @@ public class SwebHqlPack { return buildHql(swebPackage, result); } + public static DdlPackBean getConfigWhereHql(SwebConfig swebConfig) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result); + DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(swebConfig, result); + } + public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); From afac75bb2b5c9839432f4c7fde5c4dcb6a4cd3ef Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 25 Apr 2019 17:25:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=8D=A1=E6=96=B0=E7=9A=84moveno=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=97=AE=E9=A2=98=20=E4=BB=BB=E5=8A=A1=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E9=97=AE=E9=A2=98=20=E6=A0=A1=E9=AA=8C=E5=BA=93?= =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 +++++---- 2 files changed, 7 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 1359294..0e72b17 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 @@ -23,8 +23,8 @@ public class WmsTaskInfoModel implements Serializable { /** * 状态:1=创建,10=待处理,20=已处理 */ - @ApiParam(value = "任务状态", example = "1") - public Integer taskStatus; + @ApiParam(value = "任务状态") + public String taskStatus; @ApiParam("作业类型名称") public String opTypeName; 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 5cd3bf9..472580e 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 @@ -1019,6 +1019,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result); HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); @@ -1429,7 +1430,7 @@ public class WmsHqlPack { public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); - getStringBuilderPack(wmsStockSn, result); + HqlPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); return result.toString(); } @@ -1514,12 +1515,12 @@ public class WmsHqlPack { * 给定字段动态in sql * * @param columnName - * @param orderNo + * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , String orderNo) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , List orderList) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getInPack(orderNo, columnName, packBean); + DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);