Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

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

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