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

@@ -25,7 +25,7 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_MOVE_SN", indexes = {
+@Table(name = "WMS_MOVE_SN", indexes = {
         @Index(columnList = "PART_NO"),
         @Index(columnList = "ORDER_NO"),
         @Index(columnList = "SN"),
@@ -35,80 +35,80 @@ import javax.persistence.*;
 public class WmsMoveSn extends BaseBean {
 
     private static final long serialVersionUID = 1490715681910614399L;
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("单号")
     public String orderNo;
 
-    @Column(name="ITEM")
+    @Column(name = "ITEM")
     @ApiParam("行号")
     public Integer item;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name="UNIT")
+    @Column(name = "UNIT")
     @ApiParam(value = "单位")
     public String unit;
 
-    @Column(name="SN")
+    @Column(name = "SN")
     @ApiParam("条码")
     public String sn;
 
-    @Column(name="CSN")
+    @Column(name = "CSN")
     @ApiParam("客户条码")
     public String csn;
 
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
-    @Column(name="ITEM_STATUS")
+    @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer itemStatus;
 
-    @Column(name="REMARK")
+    @Column(name = "REMARK")
     @ApiParam("备注")
     public String remark;
 
-    @Column(name="LOT_NO")
+    @Column(name = "LOT_NO")
     @ApiParam("批次编号")
     public String lotNo;
 
-    @Column(name="PACKAGE_NO")
+    @Column(name = "PACKAGE_NO")
     @ApiParam("容器编号")
     public String packAgeNo;
 
-    @Column(name="SRC_QTY")
+    @Column(name = "SRC_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "源数量", example = "0")
     public Double srcQty;
 
-    @Column(name="SRC_WH_NO")
+    @Column(name = "SRC_WH_NO")
     @ApiParam("源仓库代码")
     public String srcWhNo;
 
-    @Column(name="SRC_ZONE_NO")
+    @Column(name = "SRC_ZONE_NO")
     @ApiParam("源存储区代码")
     public String srcZoneNo;
 
-    @Column(name="SRC_LOCATE_NO")
+    @Column(name = "SRC_LOCATE_NO")
     @ApiParam("源库位代码")
     public String srcLocateNo;
 
-    @Column(name="DEST_WH_NO")
+    @Column(name = "DEST_WH_NO")
     @ApiParam("目标仓库代码")
     public String destWhNo;
 
-    @Column(name="DEST_ZONE_NO")
+    @Column(name = "DEST_ZONE_NO")
     @ApiParam("目标存储区代码")
     public String destZoneNo;
 
-    @Column(name="DEST_LOCATE_NO")
+    @Column(name = "DEST_LOCATE_NO")
     @ApiParam("目标库位代码")
     public String destLocateNo;
 
@@ -120,51 +120,51 @@ public class WmsMoveSn extends BaseBean {
     @Transient
     private Long finishedCounts;
 
-    @Column(name="DEST_QTY")
+    @Column(name = "DEST_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "目标数量", example = "0")
     public Double destQty;
 
-    @Column(name="QTY")
+    @Column(name = "QTY")
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     public Double qty;
 
-    @Column(name="SRC_QC_STATUS")
+    @Column(name = "SRC_QC_STATUS")
     @ApiParam(value = "源质量状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
     public Integer srcQcStatus;
 
-    @Column(name="SRC_SN_STATUS")
+    @Column(name = "SRC_SN_STATUS")
     @ApiParam(value = "源条码状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
     public Integer srcSnStatus;
 
-    @Column(name="DEST_QC_STATUS")
+    @Column(name = "DEST_QC_STATUS")
     @ApiParam(value = "目的质量状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
     public Integer descQcStatus;
 
-    @Column(name="DEST_SN_STATUS")
+    @Column(name = "DEST_SN_STATUS")
     @ApiParam(value = "目的条码状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
     public Integer destSnStatus;
 
-    @Column(name="DATE_CODE")
+    @Column(name = "DATE_CODE")
     @ApiParam("生产日期")
     public String dateCode;
 
-    @Column(name="FIX_LOT_NO")
+    @Column(name = "FIX_LOT_NO")
     @ApiParam("特殊批次")
     public String fixLotNo;
 
-    @Column(name="VENDOR_NO")
+    @Column(name = "VENDOR_NO")
     @ApiParam("供应商编号")
     private String vendorNo;
 
     @Transient
     @ApiParam("业务类型编码")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     private Integer busiTypeCode;
 
     @Transient
@@ -183,9 +183,15 @@ 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(String partNo, Long finishedCounts ,Long waitingCounts){
+    public WmsMoveSn() {
+    }
+
+    public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) {
         this.partNo = partNo;
         this.waitingCounts = waitingCounts;
         this.finishedCounts = finishedCounts;
@@ -199,7 +205,7 @@ public class WmsMoveSn extends BaseBean {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
 
-    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode,  String transTypeCode, String refSrc) {
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.destQty = destQty;
@@ -207,7 +213,8 @@ public class WmsMoveSn extends BaseBean {
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }
-    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) {
+
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.destQty = destQty;
@@ -215,38 +222,38 @@ public class WmsMoveSn extends BaseBean {
         this.refSrc = refSrc;
     }
 
-    public  WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
+    public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd,
-            String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
+                     String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus,
-            Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn,
+                     Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn,
-            String createUser,String createDatetime,String modifyDatetime,String modifyUser){
+                     String createUser, String createDatetime, String modifyDatetime, String modifyUser) {
-            this.organizeCode=organizeCode;
+        this.organizeCode = organizeCode;
-            this.orderNo=orderNo;
+        this.orderNo = orderNo;
-            this.item=item;
+        this.item = item;
-            this.partNo=partNo;
+        this.partNo = partNo;
-            this.partNameRdd=partNameRdd;
+        this.partNameRdd = partNameRdd;
-            this.transTypeCode=transTypeCode;
+        this.transTypeCode = transTypeCode;
-            this.transTypeName=transTypeName;
+        this.transTypeName = transTypeName;
-            this.itemStatus=itemStatus;
+        this.itemStatus = itemStatus;
-            this.unit=unit;
+        this.unit = unit;
-            this.srcLocateNo=srcLocateNo;
+        this.srcLocateNo = srcLocateNo;
-            this.destLocateNo=destLocateNo;
+        this.destLocateNo = destLocateNo;
-            this.srcQty=srcQty;
+        this.srcQty = srcQty;
-            this.srcQty=srcQty;
+        this.srcQty = srcQty;
-            this.destQty=destQty;
+        this.destQty = destQty;
-            this.srcQcStatus=srcQcStatus;
+        this.srcQcStatus = srcQcStatus;
-            this.descQcStatus=descQcStatus;
+        this.descQcStatus = descQcStatus;
-            this.srcSnStatus=srcSnStatus;
+        this.srcSnStatus = srcSnStatus;
-            this.destSnStatus=destSnStatus;
+        this.destSnStatus = destSnStatus;
-            this.lotNo=lotNo;
+        this.lotNo = lotNo;
-            this.dateCode=dateCode;
+        this.dateCode = dateCode;
-            this.refSrc = refSrc;
+        this.refSrc = refSrc;
-            this.destZoneNo = destZoneNo;
+        this.destZoneNo = destZoneNo;
-            this.destWhNo =destWhNo;
+        this.destWhNo = destWhNo;
-            this.busiTypeCode = busiTypeCode;
+        this.busiTypeCode = busiTypeCode;
-            this.sn = sn;
+        this.sn = sn;
-            this.createUser = createUser;
+        this.createUser = createUser;
-            this.createDatetime = createDatetime;
+        this.createDatetime = createDatetime;
-            this.modifyDatetime =modifyDatetime;
+        this.modifyDatetime = modifyDatetime;
-            this.modifyUser =modifyUser;
+        this.modifyUser = modifyUser;
     }
 }

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