From 58c29f5aee23b8631346dbcbee849b08d9b299cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 8 May 2019 21:44:14 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3+=E4=BD=9C=E4=B8=9A=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 56 +++++++++++----------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 310e5fa..eef67a2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -49,33 +49,33 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "初始化组件编号", example = "0") private Long initAmId; - @Transient - @ApiParam(value = "初始化组件名称") - private String initAmName; +// @Transient +// @ApiParam(value = "初始化组件名称") +// private String initAmName; @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") private Long detailsAmId; - @Transient - @ApiParam(value = "明细处理组件名称") - private String detailsAmName; +// @Transient +// @ApiParam(value = "明细处理组件名称") +// private String detailsAmName; @Column(name = "SUBMIT_AM_ID") @ApiParam(value = "提交组件编号", example = "0") private Long submitAmId; - @Transient - @ApiParam(value = "提交组件名称") - private String submitAmName; +// @Transient +// @ApiParam(value = "提交组件名称") +// private String submitAmName; @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") private Long endAmId; - - @Transient - @ApiParam(value = "结束组件名称") - private String endAmName; +// +// @Transient +// @ApiParam(value = "结束组件名称") +// private String endAmName; // 1=true, 2 = false @Column(name = "AUTO_INIT") @@ -109,19 +109,19 @@ public class WmsActionGroup extends BaseBean { public WmsActionGroup() { } - public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) { - this.agNameE = agNameE; - this.agDescE = agDescE; - this.agNameC = agNameC; - this.agDescC = agDescC; - this.autoInit = autoInit; - this.initAmId = initAmId; - this.initAmName = initAmName; - this.detailsAmId = detailsAmId; - this.detailsAmName = detailsAmName; - this.submitAmId = submitAmId; - this.submitAmName = submitAmName; - this.endAmId = endAmId; - this.endAmName = endAmName; - } +// public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) { +// this.agNameE = agNameE; +// this.agDescE = agDescE; +// this.agNameC = agNameC; +// this.agDescC = agDescC; +// this.autoInit = autoInit; +// this.initAmId = initAmId; +// this.initAmName = initAmName; +// this.detailsAmId = detailsAmId; +// this.detailsAmName = detailsAmName; +// this.submitAmId = submitAmId; +// this.submitAmName = submitAmName; +// this.endAmId = endAmId; +// this.endAmName = endAmName; +// } } 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 f53fe7d..ec7c7fc 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 @@ -1291,7 +1291,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); - DdlPreparedPack.getNumEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); getStringBuilderPack(wmsActionModule, result); From e93605135c22d05b5825c6b4b3be2b2dc496afbd Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Thu, 9 May 2019 16:17:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?sweb=20=E5=8F=91=E5=B8=83=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modelbean/SwebPOForPubListResultModelV2.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java new file mode 100644 index 0000000..ee15a2a --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Collections; +import java.util.List; + +/** + * @Description : 待发布订单列表输出模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-02 13:13 + * @Modify: + **/ +@Data +public class SwebPOForPubListResultModelV2 extends BaseBean { + + @ApiParam(value = "拆分请求时间数量列表", example = "1") + private List reqTimeList = Collections.EMPTY_LIST; + + @ApiParam(value = "列表", example = "1") + private List list = Collections.EMPTY_LIST; +} From 58bc54f3c6b50ce4ec164c419e4e15367770a0e1 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Thu, 9 May 2019 17:28:21 +0800 Subject: [PATCH 03/10] =?UTF-8?q?sweb=20=E8=AE=A2=E5=8D=95=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 1 - 1 file changed, 1 deletion(-) 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 2996182..93f65f4 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 @@ -121,7 +121,6 @@ public class SwebHqlPack { public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); From 10844622a765ab43dfe2ff69b3775cb8b1bc9944 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 10 May 2019 14:58:01 +0800 Subject: [PATCH 04/10] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=202.=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8A=A0=E4=B8=8A=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 181 ++++----------------- 1 file changed, 33 insertions(+), 148 deletions(-) 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 f53fe7d..30e113f 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 @@ -25,13 +25,6 @@ import java.util.stream.Collectors; **/ public class WmsHqlPack { - public static String packInParams(String colnumName, String[] params) { - StringBuffer sb = new StringBuffer(); - HqlPack.getInPackString(String.join(",", params), colnumName, sb); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_PART.IS_ADJUST.getValue(), "snControl", sb); - return sb.toString(); - } - /** * 封装公用查询参数 * @@ -54,27 +47,6 @@ public class WmsHqlPack { } /** - * 封装公用查询参数 - * - * @param bean 实体对象 - * @param hqlStr 查询语句 - * @return 封装完成的查询语句 - */ - public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { - - // 判断工厂代码是否为空 - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - HqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); - } - - // 封装有效状态和删除状态 - HqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); - - return hqlStr.toString(); - } - - /** * PO订单明细表 分页查询 * * @param wmsPOMasterDetails @@ -202,14 +174,14 @@ public class WmsHqlPack { * @param routingCode * @return */ - public static String packHqlWmsRoutingChildren(String routingCode) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(routingCode, "routingCode", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + DdlPreparedPack.getStringEqualPack(routingCode, "routingCode", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - return result.toString(); + return result; } @@ -219,14 +191,14 @@ public class WmsHqlPack { * @param wmsRoutingMaster * @return */ - public static String packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); - HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); + public static DdlPackBean packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); getStringBuilderPack(wmsRoutingMaster, result); - return result.toString(); + return result; } /** @@ -235,18 +207,18 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static String packHqlWmsPart(WmsPart wmsPart) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); - HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); - HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); - HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); getStringBuilderPack(wmsPart, result); - return result.toString(); + return result; } /** @@ -293,26 +265,6 @@ public class WmsHqlPack { } /** - * 库存交易记录信息 分页查询 - * - * @param wmsTrans - * @return - */ - public static String packHqlWmsTrans(WmsTrans wmsTrans) { - StringBuffer result = new StringBuffer(); - - //查询参数封装 - HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); - HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); - HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); - - getStringBuilderPack(wmsTrans, result); - - return result.toString(); - } - - - /** * 供应商分页查询 * * @param basVendor @@ -467,25 +419,6 @@ public class WmsHqlPack { return result; } - /** - * 供应商唯一性校验查询条件【用于添加和修改】 - * - * @param basVendor - * @return - */ - public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) { - DdlPackBean result = new DdlPackBean(); - - DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); - - getStringBuilderPack(basVendor, result); - - return result; - } - public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { DdlPackBean result = new DdlPackBean(); @@ -498,38 +431,6 @@ public class WmsHqlPack { } /** - * 查询满足处理周期的作业类型 查询条件封装 - * - * @param wmsOpType - * @return - */ - public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) { - StringBuffer result = new StringBuffer(); - - getStringBuilderPack(wmsOpType, result); - result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins"); - return result.toString(); - } - - /** - * 作业任务数据来源 查询条件封装 - * - * @param wmsTaskSrc - * @return - */ - public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) { - StringBuffer result = new StringBuffer(); - - //作业类型代码 - HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result); - - getStringBuilderPack(wmsTaskSrc, result); - - return result.toString(); - } - - - /** * 客户信息 查询条件封装 * * @param basCustomer @@ -805,25 +706,25 @@ public class WmsHqlPack { * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ - public static String packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) { + DdlPackBean result = new DdlPackBean(); // 仓库代码 - HqlPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result); // 来源单据号 - HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); // 供应商编码 - HqlPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result); // 物料编码 - HqlPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result); // 负责人 - HqlPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result); // 是否预分配 - HqlPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result); + DdlPreparedPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result); getStringBuilderPack(wmsAreaOwner, result); - return result.toString(); + return result; } /** @@ -1373,22 +1274,6 @@ public class WmsHqlPack { } /** - * 按moveNo 取最后一笔插入的数据 - * - * @param wmsMoveSn - * @return - */ - public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); - getStringBuilderPack(wmsMoveSn, result); - HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); - - return result.toString(); - } - - /** * 根据条件查询库存条码信息 * * @param wmsStockSn @@ -1590,19 +1475,19 @@ public class WmsHqlPack { * @param wmsTransModule * @return */ - public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) { + DdlPackBean result = new DdlPackBean(); if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { - HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); } if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { - HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); } if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { - HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); } getStringBuilderPack(wmsTransModule, result); - return result.toString(); + return result; } /** From 24af646ad8beca66118c8a16889603a16a5f32ab Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 10 May 2019 16:36:58 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 6 ++++ .../bean/AndonAlarmType.java | 38 ++++++++++++++++++++++ .../repository/IAndonAlarmTypeRepository.java | 16 +++++++++ .../sqlpack/AndonHqlPack.java | 11 +++++++ 4 files changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index c31090b..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -13,5 +13,11 @@ i3plus-pojo-andon jar + + + i3plus.pojo + i3plus-pojo-base + + \ No newline at end of file diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java new file mode 100644 index 0000000..2fcbd73 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java @@ -0,0 +1,38 @@ +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 : 安灯类型 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ALARM_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="安灯类型",description = "安灯类型") +public class AndonAlarmType extends BaseBean { + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "ALARM_NAME") + @ApiParam(value = "安灯类型名称") + private String alarmName; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java new file mode 100644 index 0000000..31afb4f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯类型信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonAlarmTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java new file mode 100644 index 0000000..12b3098 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.andon.sqlpack; + +/** + * @Description : 安灯对象查询封装 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 10:45 + * @Modify: + **/ +public class AndonHqlPack { +} From 4cf5fbc2b70a93ca9f844e23ff9def23a1ed6895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 10 May 2019 16:57:08 +0800 Subject: [PATCH 06/10] =?UTF-8?q?#4091+=E6=B5=81=E7=A8=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=A4=8D=E5=88=B6=E6=B5=81=E7=A8=8B+=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=AD=A5=E9=AA=A4=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BD=9C=E4=B8=9A=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BD=9C=E4=B8=9A=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 76 +++++++++++++++++----- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 16 ----- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +- 3 files changed, 62 insertions(+), 33 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a7949c1..e8a6b83 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -139,17 +139,17 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { - CREATE(10, "CREATE","新建"), - RECEIPT(20, "RECEIPT","处理中"), - RECEIPT_FINISH(30, "RECEIPT_FINISH","已完成"), - CLOSED(40, "CLOSED","已关闭"), - CANCELLED(50, "CANCELLED","已取消"); + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "处理中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), + CLOSED(40, "CLOSED", "已关闭"), + CANCELLED(50, "CANCELLED", "已取消"); private int value; private String code; private String description; - MASTER_ORDER_STATUS(int value,String code, String description) { + MASTER_ORDER_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -670,6 +670,40 @@ public class WmsEnumUtil { } } + /** + * 作业组件参数：组件执行方法名称 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MODULE_METHOD_NAME { + EXECUTE("execute", "执行方法"), + GETOPTIONS("getOptions", "流程初始化方法"), + PROMPT("prompt", "初始化方法"), + GETLIST("getList", "获取列表数据"), + DOCOMPLETE("doComplete", "执行完成方法"), + SHOWINFORMATION("showInformation", "回显方法"), + INSTALL("install", "安装组件"), + UNINSTALL("unInstall", "卸载组件"); + private String value; + private String description; + + MODULE_METHOD_NAME(String value, String description) { + this.value = value; + this.description = description; + } + + public String getCode() { + return value; + } + + public String getDescription() { + return description; + } + + public String getValue() { + return value; + } + } + /** * 作业任务状态、移库单条码操作状态 @@ -1456,6 +1490,16 @@ public class WmsEnumUtil { } return tmp; } + + public static COMPONENT_TYPE switchGetValue(int val) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } } /** @@ -2109,11 +2153,11 @@ public class WmsEnumUtil { * 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 */ public enum SCRIPT_TYPE { - MODUAL(10,"Modual","组件脚本"), - FORM(20,"Form","表单脚本"), - REPORT(30,"Report","报表脚本"), - JOB(40,"Job","JOB脚本"), - OTHER(50,"Other","其他脚本"); + MODUAL(10, "Modual", "组件脚本"), + FORM(20, "Form", "表单脚本"), + REPORT(30, "Report", "报表脚本"), + JOB(40, "Job", "JOB脚本"), + OTHER(50, "Other", "其他脚本"); private String description; private int value; @@ -2147,9 +2191,9 @@ public class WmsEnumUtil { * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby */ public enum LANGUAGE_TYPE { - GROOVY(1,"Groovy", 10), - PYTHON(2,"Python", 20), - JS(3,"JavaScript", 30); + GROOVY(1, "Groovy", 10), + PYTHON(2, "Python", 20), + JS(3, "JavaScript", 30); // 下面这2种语言没人会写，暂不支持 //SCALA(40,"scala"), //JRUBY(50,"jruby"); @@ -2194,9 +2238,9 @@ public class WmsEnumUtil { * 2.BUSI：业务参数 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WMS_CONFIG_TYPE{ + public enum WMS_CONFIG_TYPE { - SYSTEM(10,"系统参数","系统参数"), + SYSTEM(10, "系统参数", "系统参数"), BUSI(20, "业务参数", "业务参数"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index eef67a2..c858ba4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -108,20 +108,4 @@ public class WmsActionGroup extends BaseBean { public WmsActionGroup() { } - -// public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) { -// this.agNameE = agNameE; -// this.agDescE = agDescE; -// this.agNameC = agNameC; -// this.agDescC = agDescC; -// this.autoInit = autoInit; -// this.initAmId = initAmId; -// this.initAmName = initAmName; -// this.detailsAmId = detailsAmId; -// this.detailsAmName = detailsAmName; -// this.submitAmId = submitAmId; -// this.submitAmName = submitAmName; -// this.endAmId = endAmId; -// this.endAmName = endAmName; -// } } 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 ec7c7fc..90f18cd 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 @@ -1238,7 +1238,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result); getStringBuilderPack(wmsActionStepType, result); From c5093b073cf4be4b2842f7e4ac0f58800bf36e4c Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 10 May 2019 17:08:18 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java index 2fcbd73..821efb7 100644 --- a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="安灯类型",description = "安灯类型") +@Api("安灯类型") public class AndonAlarmType extends BaseBean { @Column(name = "ALARM_CODE") From 30db0904a4577fd26c668152d8f572e44d83ccd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 10 May 2019 18:08:48 +0800 Subject: [PATCH 08/10] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 74 +++++++++++++++++++ .../bean/AndonPLCRecord.java | 82 ++++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java new file mode 100644 index 0000000..ae88bf0 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -0,0 +1,74 @@ +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_PLC控制 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-10 17:32 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_PLC") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯PLC控制") +public class AndonPLC extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam(value = "工作单元名称") + private String workCellName; + + @Column(name = "NODE_CODE") + @ApiParam(value = "控制节点代码") + private String nodeCode; + + @Column(name = "NODE_IP") + @ApiParam(value = "IP地址") + private String nodeIP; + + @Column(name = "CHANNEL_NAME") + @ApiParam(value = "通道名称") + private String channelName; + + @Column(name = "TAG_NAME") + @ApiParam(value = "标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam(value = "标签地址") + private String tagAddress; + + @Column(name = "TAG_TYPE") + @ApiParam(value = "标签类型") + private String tagType; + + @Column(name = "GROUP_NO") + @ApiParam(value = "分组号") + private String groupNo; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java new file mode 100644 index 0000000..daf03f5 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java @@ -0,0 +1,82 @@ +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_PLC监控记录 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-10 17:58 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_PLC_RECORD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯PLC控制") +public class AndonPLCRecord extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam(value = "工作单元名称") + private String workCellName; + + @Column(name = "NODE_CODE") + @ApiParam(value = "控制节点代码") + private String nodeCode; + + @Column(name = "NODE_IP") + @ApiParam(value = "IP地址") + private String nodeIP; + + @Column(name = "CHANNEL_NAME") + @ApiParam(value = "通道名称") + private String channelName; + + @Column(name = "TAG_NAME") + @ApiParam(value = "标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam(value = "标签地址") + private String tagAddress; + + @Column(name = "TAG_TYPE") + @ApiParam(value = "标签类型") + private String tagType; + + @Column(name = "GROUP_NO") + @ApiParam(value = "分组号") + private String groupNo; + + @Column(name = "TAG_VALUE") + @ApiParam(value = "标签数值") + private String tagValue; + + @Column(name = "TAG_POINT") + @ApiParam(value = "传递方向") + private String tagPoint; +} From 5ef8089c02ff48646eec7cac25e9918e960ae0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 10 May 2019 18:09:20 +0800 Subject: [PATCH 09/10] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java index daf03f5..4390a91 100644 --- a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("安灯PLC控制") +@Api("安灯PLC监控记录") public class AndonPLCRecord extends BaseBean { @Column(name = "WORK_CENTER_CODE") From 81821c70a8aad2c0a83acb16f8c2588b42061abe Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 10 May 2019 19:51:29 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=20=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=9D=A1=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index adbb369..2108003 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -170,6 +170,18 @@ public class WmsDocMovementDetails extends BaseBean { @Transient public Double inputMoveQty; + @Transient + @ApiParam(value ="标准包装",example = "1") + private Double snp; + + @Transient + @ApiParam(value ="条码总数量",example = "1") + private Double detailsSnCount; + + @Transient + @ApiParam(value ="余数",example = "1") + private Double restQty; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; }