From 43ed6deb6c1591549fd8210cf2add2e96eb36dcb Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 28 Nov 2018 14:59:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 37 +++++++++++++++++++--- .../pojo/wms/bean/WmsActionResponseBean.java | 7 ++-- .../i3plus/pojo/wms/bean/WmsOperationBean.java | 3 +- 3 files changed, 39 insertions(+), 8 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 0612ef5..7813c0f 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 @@ -1514,14 +1514,43 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RC_RESPONSE_TIPS { - OK(10, "正确"), - FAIL(20, "失败"), - NO_SKIP(30, "不跳转"); + OK(true, "正确"), + NG(false, "失败"); + + private boolean codeStatus; + private String description; + + RC_RESPONSE_TIPS(boolean codeStatus, String description) { + this.codeStatus = codeStatus; + this.description = description; + } + + public boolean getCodeStatus() { + return codeStatus; + } + + public String getDescription() { + return description; + } + } + + /** + * 流程管家中触发源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_BUTLER_SOURCE { + + SCANNER(10, "扫描枪"), + SUBMIT(20, "提交按钮"), + RESET(30, "重置按钮"), + CHECK_DETAILS(40, "查看明细"), + DELETE_DETAILS(50, "明细(删除)"), + CLEAR_DETAILS(60, "明细（清空）"); private int value; private String description; - RC_RESPONSE_TIPS(int value, String description) { + ACTION_BUTLER_SOURCE(int value, String description) { this.value = value; this.description = description; } 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 5b8eb5a..8de5899 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; +import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 @@ -36,8 +37,8 @@ public class WmsActionResponseBean { public List options; @ApiParam("选中的明细数据") - public String details; + public List> details; - @ApiParam("信息代码") - public Integer code; + @ApiParam(value = "结果代码") + public Boolean codeStatus; } 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 index eeb7643..7367bd0 100644 --- 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; +import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 @@ -32,5 +33,5 @@ public class WmsOperationBean { public int sourceOwner; @ApiParam("选中的明细数据") - public String details; + public List> details; } From 433705589843f97471c6d05ceb78467ae7205c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 28 Nov 2018 15:48:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?PO=E6=9D=A1=E7=A0=81=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 78 ++++++++++++++++++++++ .../pojo/wms/repository/WmsPoSnRepository.java | 16 +++++ 2 files changed, 94 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java new file mode 100644 index 0000000..48b189c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -0,0 +1,78 @@ +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 : PO条码表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-28 15:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOC_PO_SN") +@Api("PO条码信息") +public class WmsPoSn extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + public String item; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY") + @ApiParam(value = "数量", example = "0") + public Double qty; + + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + /** + * 状态:10 = 创建，20 = 已打印，30 = 已收货 + */ + @Column(name="SN_STATUS") + @ApiParam(value = "状态", example = "10") + public Integer snStatus; + + @Column(name="PACKAGE") + @ApiParam("包装名称") + public String packAge; + + @Column(name="SN_1D") + @ApiParam("一维条码") + public String snOneBarCode; + + @Column(name="SN_2D") + @ApiParam("二维条码") + public String snTwoBarCode; + + @Column(name="GROUP_NO") + @ApiParam("组条码") + public String groupNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.java new file mode 100644 index 0000000..2835f45 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.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.WmsPoSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : PO条码 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-28 15:29 + * @Modify: + **/ +@Repository +public interface WmsPoSnRepository extends BaseRepository { +}