Merge branch 'dev' into test

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :工序物料清单
@@ -54,6 +55,15 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "是否检查")
     private Integer isCheck;
 
+    @Transient
+    @ApiParam("是否已绑定")
+    private boolean isBind;
+
+    @Transient
+    @ApiParam("显示颜色")
+    private String color;
+
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java

@@ -0,0 +1,83 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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.ColumnDefault;
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PROD_BIND_RECORD")
+@Api("产品绑定记录表")
+public class MesProdBindRecord extends BaseBean {
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam(value = "产品条码")
+    private String serialNumber;
+
+    @Column(name="PART_NO")
+    @ApiParam("产品条码零件号")
+    private String partNo;
+
+    @Column(name="WORK_ORDER")
+    @ApiParam("工单号")
+    private String  workOrder;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元")
+    private String workCellCode;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam(value = "工步代码")
+    private String stepCode;
+
+    @Column(name="ITEM_PART_NO")
+    @ApiParam("原材料零件号")
+    private String itemPartNo;
+
+    @Column(name="KP_SN")
+    @ApiParam("原材料条码")
+    private String kpSn;
+
+    @Column(name = "KP_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "原材料数量", example = "0")
+    private Double kpQty;
+
+    @Column(name="SUPPLIER_CODE")
+    @ApiParam("供应商")
+    private String supplierCode;
+
+    @Column(name="VERSION")
+    @ApiParam("版本")
+    private String version;
+
+    @Column(name = "RESULT")
+    @ApiParam(value = "结果")
+    private String result;
+
+    public double getQtyVal() {
+        return this.kpQty == null ? 0.0d : this.kpQty;
+    }
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepModel.java

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class StepModel implements Serializable {
+    @ApiParam("工步代码")
+    private String stepCode;
+
+    @ApiParam("工步名称")
+    private String stepName;
+
+    @ApiParam("工步描述")
+    private String stepText;
+
+    @ApiParam("工步类型")
+    private String stepType;
+
+    @ApiParam("工步对象")
+    private String stepObject;
+
+    /**
+     * 工位扫描业务所需使用字段
+     */
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    /**
+     * 工位扫描业务所需使用字段
+     */
+    @ApiParam("工序代码")
+    private String processCode;
+
+    /**
+     * 工位扫描业务所需使用字段
+     */
+    @ApiParam("工步顺序")
+    private Integer stepSeq;
+
+    /**
+     * 工位扫描业务所需使用字段
+     */
+    @ApiParam("工步执行完毕")
+    private boolean isComplete;
+
+    /**
+     * 工位扫描业务所需使用字段
+     */
+    @ApiParam("工步是否跳过")
+    private boolean isJump;
+
+        public StepModel(String stepCode,String stepName,String stepText,String stepType,String stepObject,
+                   String routeCode,String processCode,Integer stepSeq){
+        this.stepCode = stepCode;
+        this.stepName = stepName;
+        this.stepText = stepText;
+        this.stepType = stepType;
+        this.stepObject = stepObject;
+        this.routeCode = routeCode;
+        this.processCode = processCode;
+        this.stepSeq = stepSeq;
+    }
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdBindRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProdBindRecordRepository extends BaseRepository<MesProdBindRecord, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java

@@ -0,0 +1,84 @@
+package cn.estsh.i3plus.pojo.mes.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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :产品绑定记录表
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PROD_BIND_RECORD")
+@Api("产品绑定记录表")
+public class MesProdBindRecord extends BaseBean {
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam(value = "产品条码")
+    private String serialNumber;
+
+    @Column(name="PART_NO")
+    @ApiParam("产品条码零件号")
+    private String partNo;
+
+    @Column(name="WORK_ORDER")
+    @ApiParam("工单号")
+    private String  workOrder;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元")
+    private String workCellCode;
+
+    @Column(name = "STEP_CODE")
+    @ApiParam(value = "工步代码")
+    private String stepCode;
+
+    @Column(name="ITEM_PART_NO")
+    @ApiParam("原材料零件号")
+    private String itemPartNo;
+
+    @Column(name="KP_SN")
+    @ApiParam("原材料条码")
+    private String kpSn;
+
+    @Column(name = "KP_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "原材料数量", example = "0")
+    private Double kpQty;
+
+    @Column(name="SUPPLIER_CODE")
+    @ApiParam("供应商")
+    private String supplierCode;
+
+    @Column(name="VERSION")
+    @ApiParam("版本")
+    private String version;
+
+    @Column(name = "RESULT")
+    @ApiParam(value = "结果")
+    private String result;
+
+    public double getQtyVal() {
+        return this.kpQty == null ? 0.0d : this.kpQty;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdBindRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProdBindRecordRepository extends BaseRepository<MesProdBindRecord, Long> {
+}