Merge remote-tracking branch 'origin/dev' into test

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<WmsActionStepCall> wmsActionStepCallList;
+    @ApiParam("作业步骤调用参数")
+    public List<WmsActionStepCallParam> wmsActionStepCallParamList;
+}

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<WmsActionGroupDetailsModel> wmsActionGroupDetailsModelList;
+}

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;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java

@@ -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;
-}