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

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

@@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务周期描述")
     private String taskCycleDescription;
 
-    @Column(name="TASK_STATUS")
-    @ApiParam("任务状态")
-    private Integer taskStatus;
-
     @Column(name="TASK_PARAM")
     @ApiParam("任务参数")
     private String taskParam;
@@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean {
         return this.taskType == null ? 0 : this.taskType;
     }
 
-    public int getTaskStatusVal() {
-        return this.taskStatus == null ? 0 : this.taskStatus;
-    }
 }

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

@@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("任务周期描述")
     private String taskCycleDescription;
 
-    @Column(name="TASK_STATUS")
-    @ApiParam("任务状态")
-    private Integer taskStatus;
-
     @Column(name="TASK_PARAM")
     @ApiParam("任务参数")
     private String taskParam;
@@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean {
         return this.taskType == null ? 0 : this.taskType;
     }
 
-    public int getTaskStatusVal() {
-        return this.taskStatus == null ? 0 : this.taskStatus;
-    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1161,9 +1161,6 @@ public class MesHqlPack {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
         DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
         DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
-        if (null != mesPcnTask.getTaskStatus()) {
-            DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean);
-        }
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.wms.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
-import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -174,6 +173,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("创建时间")
     private String createDateTime;
 
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public transient Integer lockVersion;
    /* @JSONField(name="fPartNo")
     public String getfPartNo() {
         return fPartNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java

@@ -144,6 +144,11 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam(value = "设备编号")
     public String fixId;
 
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public transient Integer lockVersion;
+
     public WmsMoveMaster(){};
 
     public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -183,7 +183,13 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("交易类型名称")
     private String transTypeName;
 
-    public WmsMoveSn(){}
+    @Version
+    @Column(name = "LOCK_VERSION")
+    @ApiParam(value = "乐观锁", example = "1")
+    public transient Integer lockVersion;
+
+    public WmsMoveSn() {
+    }
 
     public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) {
         this.partNo = partNo;
@@ -207,6 +213,7 @@ public class WmsMoveSn extends BaseBean {
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }
+
     public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean.iotio;
+
+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 : 开口合同主表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-09 11:14
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SWEB_PROCUREMENT_PLAN_ORDER")
+@Api("开口合同主表")
+public class SwebProcurementPlanOrder extends BaseBean {
+
+    private static final long serialVersionUID = -4332932784803175933L;
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "合同号")
+    private String orderNo;
+
+    @Column(name = "VENDOR_CODE")
+    @ApiParam(value = "物料名称")
+    private String vendorCode;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "物料名称")
+    private String vendorName;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料名称")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.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.iotio.SwebProcurementPlanOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-09 14:49
+ * @Modify:
+ **/
+@Repository
+public interface SwebProcurementPlanOrderRepository extends BaseRepository<SwebProcurementPlanOrder, Long> {
+}