From b17b15964f2b62240ff031a6b44b9e0ad76a127a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 30 Apr 2019 09:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E4=B8=BB?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E7=94=A8=E7=BB=84=E4=BB=B6=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsActionGroupDetailsModel.java | 32 ++++++++++++++ .../i3plus/pojo/model/wms/WmsActionGroupModel.java | 26 ++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 4 ++ .../pojo/wms/modelbean/WmsOrderDetailsModel.java | 49 ---------------------- 4 files changed, 62 insertions(+), 49 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java new file mode 100644 index 0000000..2f06b5a --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 作业流程明细Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-04-29 15:39 + * @Modify: + **/ +@Data +@Api("作业流程明细Model") +public class WmsActionGroupDetailsModel { + @ApiParam("作业流程明细") + public WmsActionGroupDetails wmsActionGroupDetails; + @ApiParam("作业步骤") + public WmsActionStep wmsActionStep; + @ApiParam("作业步骤调用") + public List wmsActionStepCallList; + @ApiParam("作业步骤调用参数") + public List wmsActionStepCallParamList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java new file mode 100644 index 0000000..260eda7 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** +* @Description : 作业流程Model +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2019-04-29 15:39 +* @Modify: +**/ +@Data +@Api("作业流程Model") +public class WmsActionGroupModel { + @ApiParam("流程") + public WmsActionGroup wmsActionGroup; + @ApiParam("流程明细Model集合") + public List wmsActionGroupDetailsModelList; +} 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 eb5b996..4830c63 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 @@ -52,6 +52,10 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "明细处理组件编号", example = "0") private Long detailsAmId; + @Column(name="SUBMIT_AM_ID") + @ApiParam(value = "提交组件编号", example = "0") + private Long submitAmId; + @Column(name="END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") private Long endAmId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java deleted file mode 100644 index 755af50..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; -import com.fasterxml.jackson.annotation.JsonInclude; -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.*; -import java.util.List; - -/** - * @Description : 单据明细Model - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-03-07 19:18 - * @Modify: - **/ -@Data -@Entity -//以子类table为准 -@javax.persistence.Inheritance(strategy= InheritanceType.TABLE_PER_CLASS) -@JsonInclude(value = JsonInclude.Include.NON_EMPTY) -@Api("单据明细Model") -public class WmsOrderDetailsModel extends BaseBean { - - @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - @Column(name = "ITEM") - @ApiParam("行号") - public Integer item; - @Column(name = "QTY") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - @Column(name = "ORDER_NO") - @ApiParam("订单号") - public String orderNo; -}