From 48f47956a236a34187cec9f4419001610ca14bf8 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 22 Nov 2018 12:45:35 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/bean/BaseModelBean.java | 41 +++++++++------------- .../i3plus/pojo/base/bean/BaseResultBean.java | 29 +++++++-------- 2 files changed, 32 insertions(+), 38 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java index 3937b15..f4d02c4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java @@ -1,7 +1,11 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; /** * @Description : @@ -10,6 +14,9 @@ import io.swagger.annotations.ApiParam; * @CreateDate : 2018-09-04 15:58 * @Modify: **/ +@Getter +@Setter +@ToString public class BaseModelBean { @ApiParam("操作对象") @@ -18,37 +25,23 @@ public class BaseModelBean { @ApiParam("翻页") private Pager pager; - private String OrdersString; + @ApiParam("排序SQL") + private String ordersString; - public BaseModelBean(Obj obj, Pager pager) { - this.obj = obj; - this.pager = pager; - } + @ApiParam("整型参数") + private long paramLong; - public BaseModelBean() { - } + @ApiParam("浮点数字参数") + private double paramDouble; - public Obj getObj() { - return obj; - } + @ApiParam("字符串参数") + private String paramString; - public void setObj(Obj obj) { + public BaseModelBean(Obj obj, Pager pager) { this.obj = obj; - } - - public Pager getPager() { - return pager; - } - - public void setPager(Pager pager) { this.pager = pager; } - public String getOrdersString() { - return OrdersString; - } - - public void setOrdersString(String ordersString) { - OrdersString = ordersString; + public BaseModelBean() { } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index 1bba8ce..ad47fee 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -18,20 +18,6 @@ import java.util.Map; **/ public class BaseResultBean { - public static BaseResultBean buildBaseResultBean(boolean success,String msg){ - BaseResultBean rs = new BaseResultBean(); - rs.success = success; - if(success) { - rs.msg = msg; - rs.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); - }else { - rs.code = ResourceEnumUtil.MESSAGE.FAIL.getCode(); - rs.errorMsg = msg; - } - - return rs; - } - @ApiParam("是否成功") public boolean success; @@ -108,4 +94,19 @@ public class BaseResultBean { public int getTotalCount() { return totalCount; } + + + public static BaseResultBean buildBaseResultBean(boolean success,String msg){ + BaseResultBean rs = new BaseResultBean(); + rs.success = success; + if(success) { + rs.msg = msg; + rs.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + }else { + rs.code = ResourceEnumUtil.MESSAGE.FAIL.getCode(); + rs.errorMsg = msg; + } + + return rs; + } } From 0400daa0f8936b5d874f7194d76a326fa422ab44 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 22 Nov 2018 14:45:51 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=98=9F=E5=88=97?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=95=B0=E6=8D=AE=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index ddaef4e..7bc50c5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -31,19 +31,19 @@ public class SysConfig extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称") private String name; - + @Column(name="CONFIG_TYPE") @ApiParam(value ="配置类型ID（枚举：1.系统配置...）" , example ="-1") private Integer configType; - + @Column(name="CONFIG_CODE") @ApiParam(value ="配置代码") private String configCode; - + @Column(name="CONFIG_VALUE") @ApiParam(value ="配置值") private String configValue; - + @Column(name="CONFIG_DESCRIPTION") @ApiParam(value ="配置描述") private String configDescription; From 43ebe4be721e3feb32c651fad6712cbba9ccac98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 22 Nov 2018 14:49:03 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 4609c69..9f306ed 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 @@ -385,11 +385,11 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //仓库代码 - HqlPack.getNumEqualPack(wmsZones.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getNumEqualPack(wmsZones.getAreaNo(), "areaNo", result); + HqlPack.getStringEqualPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getNumEqualPack(wmsZones.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsZones.getZoneNo(), "zoneNo", result); getStringBuilderPack(wmsZones, result); @@ -406,7 +406,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //客户编号 - HqlPack.getNumEqualPack(basCustomer.getCustNo(), "custNo", result); + HqlPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); //客户简称 HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称 From 4229601ddb45a42b5396b5315131f728927e9ceb Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 22 Nov 2018 15:34:54 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 12 ++++++------ .../java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index f71827c..cf31941 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -348,7 +348,7 @@ public class ImppEnumUtil { * 2.UNREAD：未读 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USER_MESSAGE_STATUS{ + public enum MESSAGE_STATUS { READ(1,"已读","fa cell-fa fa-file-text"), UNREAD(2,"未读","fa cell-fa fa-file-o"); @@ -357,10 +357,10 @@ public class ImppEnumUtil { private String name; private String description; - USER_MESSAGE_STATUS() { + MESSAGE_STATUS() { } - USER_MESSAGE_STATUS(int value, String name, String description) { + MESSAGE_STATUS(int value, String name, String description) { this.value = value; this.name = name; this.description = description; @@ -415,7 +415,7 @@ public class ImppEnumUtil { * 2.STATION_LETTER：站内信 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USER_MESSAGE_TYPE{ + public enum MESSAGE_TYPE { MAIL(1,"邮件","邮件"), LETTER(2,"站内信","站内信"); @@ -424,10 +424,10 @@ public class ImppEnumUtil { private String name; private String description; - USER_MESSAGE_TYPE() { + MESSAGE_TYPE() { } - USER_MESSAGE_TYPE(int value, String name, String description) { + MESSAGE_TYPE(int value, String name, String description) { this.value = value; this.name = name; this.description = description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 00aa85b..e805f03 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -35,11 +35,11 @@ public class SysMessage extends BaseBean { private String messageTitle; @Column(name="MESSAGE_TYPE") - @ApiParam(value ="消息类型(枚举：1.通知，2.站内信)" , example ="-1") + @ApiParam(value ="消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") private Integer messageType; @Column(name="MESSAGE_CONTENT_TYPE") - @ApiParam(value ="消息内容类型(枚举：1.HTML，2.TEXT)" , example ="-1") + @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_CONTENT_TYPE)" , example ="-1") private Integer messageContentType; @Column(name="MESSAGE_CONTENT") From 29c28271b306a2fab058fd022a59a404f2150948 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 22 Nov 2018 15:55:57 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 4609c69..d3e74f8 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 @@ -987,4 +987,22 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业步骤 查询 + * + * @param wmsActionStepCall + * @return + */ + public static String packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); + HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); + + getStringBuilderPack(wmsActionStepCall, result); + + return result.toString(); + } } From dc634e860f6f68022b1ddfbf139a0279cf7ce2be Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 22 Nov 2018 16:06:08 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsActionStepType.java | 50 ++++++++++++++++++++ .../wms/repository/WmsActionStepRepository.java | 16 +++++++ .../repository/WmsActionStepTypeRepository.java | 17 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 34 ++++++++++++++ 5 files changed, 171 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java new file mode 100644 index 0000000..b8c52a4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.wms.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 : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_STEP") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤信息",description = "作业步骤信息") +public class WmsActionStep extends BaseBean { + + @Column(name = "AS_NAME_E") + @ApiParam(value = "英文类型名称") + private String asNameE; + + @Column(name = "AS_DESC_E") + @ApiParam(value = "英文类型描述") + private String asDescE; + + @Column(name = "AS_NAME_C") + @ApiParam(value = "中文类型名称") + private String asNameC; + + @Column(name = "AS_DESC_C") + @ApiParam(value = "中文类型描述") + private String asDescC; + + @Column(name = "AT_NAME_C_RDD") + @ApiParam(value = "步骤类型名称") + private String atNameCRdd; + + @Column(name = "AT_ID") + @ApiParam(value = "步骤类型编号") + private String atId; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java new file mode 100644 index 0000000..cb08f18 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.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 : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤类型信息",description = "作业步骤类型信息") +public class WmsActionStepType extends BaseBean { + + @Column(name = "AT_NAME_E") + @ApiParam(value = "英文类型名称") + private String atNameE; + + @Column(name = "AT_DESC_E") + @ApiParam(value = "英文类型描述") + private String atDescE; + + @Column(name = "AT_NAME_C") + @ApiParam(value = "中文类型名称") + private String atNameC; + + @Column(name = "AT_DESC_C") + @ApiParam(value = "中文类型描述") + private String atDescC; + + @Column(name = "FUN_CALL_NAME") + @ApiParam(value = "方法调用名称") + private String funCallName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java new file mode 100644 index 0000000..91e4ff9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业步骤操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 11:25 + * @Modify: + **/ +@Repository +public interface WmsActionStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java new file mode 100644 index 0000000..793ad96 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepType; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业步骤类型操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 11:25 + * @Modify: + **/ +@Repository +public interface WmsActionStepTypeRepository extends BaseRepository { +} 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 4609c69..95fc35f 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 @@ -987,4 +987,38 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业步骤类型表信息查询 + * + * @param wmsActionStepType + * @return + */ + public static String packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + + getStringBuilderPack(wmsActionStepType, result); + + return result.toString(); + } + + /** + * 作业步骤信息查询 + * + * @param wmsActionStep + * @return + */ + public static String packHqlWmsActionStep(WmsActionStep wmsActionStep) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); + + getStringBuilderPack(wmsActionStep, result); + + return result.toString(); + } } From e5c5e80d4152e4bfc62c376b883c275ca844ab28 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 22 Nov 2018 16:09:47 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsActionStepCall.java | 42 ++++++++++++++++++++++ .../repository/WmsActionStepCallRepository.java | 14 ++++++++ 2 files changed, 56 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java new file mode 100644 index 0000000..7b9f906 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.wms.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 : jimmy.zeng + * @CreateDate : 2018-11-22 14:18 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_STEP_CALL") +@Api("作业步骤调用信息") +public class WmsActionStepCall extends BaseBean { + + @Column(name="AS_ID") + @ApiParam("作业步骤ID") + public Long asId; + + @Column(name="SEQ") + @ApiParam(value = "序号",example = "0") + public Integer seq; + + @Column(name="AM_ID") + @ApiParam("处理组件ID") + public Long amId; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java new file mode 100644 index 0000000..1a6a5c0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; + +/** + * @Description : 作业步骤调用信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-22 14:41 + * @Modify: + **/ +public interface WmsActionStepCallRepository extends BaseRepository { +} From da4665b0d7935b83868e2b1c4df537c1d2c0dfb4 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Thu, 22 Nov 2018 17:13:28 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=EF=BC=8Cdao,sqlPack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsActionModule.java | 50 ++++++++++++ .../i3plus/pojo/wms/bean/WmsActionModuleParam.java | 50 ++++++++++++ .../repository/WmsActionModuleParamRepository.java | 16 ++++ .../wms/repository/WmsActionModuleRepository.java | 15 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 94 ++++++++++++++++------ 5 files changed, 200 insertions(+), 25 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java new file mode 100644 index 0000000..a59768a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.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 : dragon.xu +* @CreateDate : 2018-11-22 16:53 +* @Modify: +**/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_MODULE") +@Api("作业步骤处理组") +public class WmsActionModule extends BaseBean { + + @Column(name="AM_NAME") + @ApiParam("组件名称") + public String amName; + + @Column(name="AM_DESC") + @ApiParam("组件描述") + public String amDesc; + + @Column(name="CALL_CLASS") + @ApiParam("实现类") + public String callClass; + + @Column(name="CALL_FUN") + @ApiParam("调用方法") + public String callFun; + + @Column(name="AM_TYPE") + @ApiParam(value = "组件类型", example = "0") + public Integer amType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java new file mode 100644 index 0000000..8910354 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.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 : dragon.xu +* @CreateDate : 2018-11-22 16:53 +* @Modify: +**/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_MODULE_PARAM") +@Api("作业步骤处理组参数") +public class WmsActionModuleParam extends BaseBean { + + @Column(name="AM_ID") + @ApiParam("组件ID") + public Long amID; + + @Column(name="PARAM_CODE") + @ApiParam("参数编码") + public String paramCode; + + @Column(name="PARAM_NAME") + @ApiParam("参数名称") + public String paramName; + + @Column(name="PARAM_VALUE_LIST") + @ApiParam("参数可选值列表") + public String paramValueList; + + @Column(name="PARAM_TYPE") + @ApiParam(value = "参数类型", example = "0") + public Integer paramType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java new file mode 100644 index 0000000..3aa2b6c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModuleParam; +import org.springframework.stereotype.Repository; + +/** +* @Description : 作业步骤处理组件参数 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-22 17:01 +* @Modify: +**/ +@Repository +public interface WmsActionModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java new file mode 100644 index 0000000..5fde9b3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule; +import org.springframework.stereotype.Repository; +/** +* @Description : 作业步骤处理组件 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-22 17:01 +* @Modify: +**/ +@Repository +public interface WmsActionModuleRepository extends BaseRepository { +} 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 1486a84..099c6e3 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 @@ -18,7 +18,8 @@ public class WmsHqlPack { /** * 封装公用查询参数 - * @param bean 实体对象 + * + * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ @@ -190,7 +191,7 @@ public class WmsHqlPack { HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true); HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -210,7 +211,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -233,7 +234,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result); HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -319,7 +320,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result); HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(),"organizeCode",result); + HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -614,7 +615,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); - getStringBuilderPack(wmsASNMasterDetails,result); + getStringBuilderPack(wmsASNMasterDetails, result); return result.toString(); } @@ -669,6 +670,7 @@ public class WmsHqlPack { /** * 根据条件查询打印机队列信息封装类 + * * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ @@ -691,10 +693,11 @@ public class WmsHqlPack { /** * 盘点库位 条件封装 + * * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){ + public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); @@ -706,15 +709,16 @@ public class WmsHqlPack { /** * 盘点物料 条件封装 + * * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){ + public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result); + HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsCSPart, result); return result.toString(); @@ -722,10 +726,11 @@ public class WmsHqlPack { /** * 盘点存储区 条件封装 + * * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){ + public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); @@ -737,6 +742,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ @@ -763,6 +769,7 @@ public class WmsHqlPack { /** * 根据条件查询责任区分配信息封装类 + * * @param wmsTempOrderLock 责任区分配信息 * @return 责任区分配信息 */ @@ -864,16 +871,18 @@ public class WmsHqlPack { return result.toString(); } + /** - *内部单据：库存移动单主表唯一性查询 + * 内部单据：库存移动单主表唯一性查询 + * * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){ + public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result); + HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); getStringBuilderPack(wmsMoveMaster, result); return result.toString(); @@ -881,14 +890,15 @@ public class WmsHqlPack { /** * 内部单据：库存移动单主表分页查询 + * * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){ + public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); getStringBuilderPack(wmsMoveMaster, result); return result.toString(); @@ -896,10 +906,11 @@ public class WmsHqlPack { /** * 内部单据：库存移动单明细表分页查询 + * * @param wmsMoveDetails * @return */ - public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){ + public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsMoveDetails.getOrderNo(), "orderNo", result); @@ -909,12 +920,12 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsMoveDetails.getCustNo(), "custNo", result); HqlPack.getStringLikerPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getWhNo(),"whNo",result); - HqlPack.getStringLikerPack(wmsMoveDetails.getZoneNo(),"zoneNo",result); - HqlPack.getStringLikerPack(wmsMoveDetails.getLocateNo(),"locateNo",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); - HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); - HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); + HqlPack.getStringLikerPack(wmsMoveDetails.getWhNo(), "whNo", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getZoneNo(), "zoneNo", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getLocateNo(), "locateNo", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result); + HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result); + HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsMoveDetails, result); return result.toString(); @@ -922,10 +933,11 @@ public class WmsHqlPack { /** * 内部单据：库存移动单条码信息分页查询 + * * @param wmsMoveSn * @return */ - public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){ + public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsMoveSn.getOrderNo(), "orderNo", result); @@ -1040,4 +1052,36 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业步骤处理组件查询条件封装 + * + * @param wmsActionModuleParam + * @return + */ + public static String packHqlWmsActionModule(WmsActionModuleParam wmsActionModuleParam) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + getStringBuilderPack(wmsActionModuleParam, result); + + return result.toString(); + } + + /** + * 作业步骤处理组件参数查询条件封装 + * + * @param wmsActionModule + * @return + */ + public static String packHqlWmsActionModuleParam(WmsActionModule wmsActionModule) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + getStringBuilderPack(wmsActionModule, result); + + return result.toString(); + } } From 9fefeffdb76042822420003f18fc91d63b2b415f Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 22 Nov 2018 18:04:47 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java | 15 +++++++++++++-- .../pojo/wms/repository/WmsActionStepCallRepository.java | 8 ++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 7b9f906..942e6a8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; @@ -29,7 +32,8 @@ import javax.persistence.Table; public class WmsActionStepCall extends BaseBean { @Column(name="AS_ID") - @ApiParam("作业步骤ID") + @ApiParam(value = "作业步骤ID",example = "0") + @JsonSerialize(using = ToStringSerializer.class) public Long asId; @Column(name="SEQ") @@ -37,6 +41,13 @@ public class WmsActionStepCall extends BaseBean { public Integer seq; @Column(name="AM_ID") - @ApiParam("处理组件ID") + @ApiParam(value = "处理组件ID",example = "0") + @JsonSerialize(using = ToStringSerializer.class) public Long amId; + + @ApiParam(value = "组件名称") + public transient String amName; + + @ApiParam(value = "组件描述") + public transient String amDesc; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java index 1a6a5c0..6987eb6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java @@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; /** * @Description : 作业步骤调用信息 @@ -11,4 +15,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; * @Modify: **/ public interface WmsActionStepCallRepository extends BaseRepository { + + @Query("from WmsActionStepCall was, WmsActionStep wass where was.amId = wass.id ") + List findWmsActionStepCallByAmid(@Param("id") long id); + } From 9c1466fdcac466b6036a16d542929acec089006d Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 22 Nov 2018 18:08:46 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsActionResponseBean.java | 35 ++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 13 ++++++- .../i3plus/pojo/wms/bean/WmsOperationBean.java | 43 ++++++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java new file mode 100644 index 0000000..f1abe18 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Entity; +import java.util.List; + +/** + * @Description : PDA传输到后台的实体bean对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 15:58 + * @Modify: + **/ +@Data +@Api("返回前端数据实体") +public class WmsActionResponseBean extends BaseBean { + + @ApiParam("进度") + public Double percent; + + @ApiParam("当前步骤") + public Integer currentStep; + + @ApiParam("总步数") + public int totalStep; + + @ApiParam("提示信息") + public String message; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index b8c52a4..4198ff5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -49,6 +49,15 @@ public class WmsActionStep extends BaseBean { private String atNameCRdd; @Column(name = "AT_ID") - @ApiParam(value = "步骤类型编号") - private String atId; + @ApiParam(value = "步骤类型编号", example = "0") + private Long atId; + + //get单独处理 + public Long getAtId() { + if(atId != null) { + return atId.longValue(); + }else{ + return atId; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java new file mode 100644 index 0000000..9f9d6c2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.wms.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; +import java.util.List; + +/** + * @Description : PDA传输到后台的实体bean对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 15:58 + * @Modify: + **/ +@Data +@Api("接受前端数据实体") +public class WmsOperationBean extends BaseBean { + + @ApiParam("扫描内容") + public String barCode; + + @ApiParam("可选项的值") + public List options; + + /** + * 触发源:10=扫描枪, + * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除) + * 60=明细（清空） + */ + @ApiParam("触发源") + public int sourceOwner; + + @ApiParam("选中的明细数据") + public String details; +} From e2ebcd943011b7f165b4e82ac244ab0f73e3f4e7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 22 Nov 2018 19:01:32 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index f1abe18..33c4b57 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -31,5 +31,14 @@ public class WmsActionResponseBean extends BaseBean { @ApiParam("提示信息") public String message; + @ApiParam("列表信息") + public List informations; + + @ApiParam("可选项") + public List options; + + @ApiParam("选中的明细数据") + public String details; + }