【合并冲突】

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -6035,4 +6035,116 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 校枪状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CALIBRATION_STATUS {
+        UNEXECUTED(10, "UNEXECUTED", "待执行"),
+        EXECUTE(20, "EXECUTE", "执行中"),
+        CANCEL(30, "CANCEL", "取消"),
+        FINISH(40, "FINISH", "完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CALIBRATION_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+
+    /**
+     * 扭矩枪类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GUN_TYPE {
+        DL(10, "DL", "小枪"),
+        PF(20, "PF", "大枪");
+
+        private int value;
+        private String code;
+        private String description;
+
+        GUN_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -3792,7 +3792,6 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
-
     /**
      * 界面类型
      */
@@ -3828,4 +3827,116 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 校枪状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CALIBRATION_STATUS {
+        UNEXECUTED(10, "UNEXECUTED", "待执行"),
+        EXECUTE(20, "EXECUTE", "执行中"),
+        CANCEL(30, "CANCEL", "取消"),
+        FINISH(40, "FINISH", "完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CALIBRATION_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 扭矩枪类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GUN_TYPE {
+        DL(10, "DL", "小枪"),
+        PF(20, "PF", "大枪");
+
+        private int value;
+        private String code;
+        private String description;
+
+        GUN_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -0,0 +1,81 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/5/27 2:20 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_PACKAGE_DETAIL")
+@Api("校枪记录表")
+public class MesGunCalibrationRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6166370020956801528L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "GUN_CODE")
+    @ApiParam("枪号")
+    private String gunCode;
+
+    @Column(name = "CUN_TYPE")
+    @ApiParam("扭矩枪类型")
+    private String cunType;
+
+    @Column(name = "PSET_CODE")
+    @ApiParam("PSET号")
+    private String psetCode;
+
+    @Column(name = "EXPECT_COUNT")
+    @ApiParam("设定枪数")
+    private Integer expectCount;
+
+    @Column(name = "REAL_COUNT")
+    @ApiParam("实际枪叔")
+    private Integer realCount;
+
+    @Column(name = "CALIBRATION_STATUS")
+    @ApiParam("校枪状态")
+    private Integer calibrationStatus;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始校枪时间")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束校枪时间")
+    private String endTime;
+
+    @Transient
+    @ApiParam("校枪状态名称")
+    private String calibrationStatusName;
+
+    @Transient
+    @ApiParam("界面编号")
+    private String windowNo;
+}

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

@@ -135,6 +135,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步弹框参数")
     private String stepDialogParam;
 
+    @ApiParam("工步弹框状态")
+    private Boolean stepDialogStatus = false;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesGunCalibrationRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/5/27 2:39 下午
+ * @Modify:
+ */
+public interface MesGunCalibrationRecordRepository extends BaseRepository<MesGunCalibrationRecord, Long> {
+}

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

@@ -2910,4 +2910,30 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean);
         return packBean;
     }
+
+    /**
+     * MES 校枪记录
+     *
+     * @param gunCalibrationRecord
+     * @return
+     */
+    public static DdlPackBean getMesGunCalibrationRecord(MesGunCalibrationRecord gunCalibrationRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(gunCalibrationRecord, organizeCode);
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(gunCalibrationRecord.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getGunCode())) {
+            DdlPreparedPack.getStringEqualPack(gunCalibrationRecord.getGunCode(), "gunCode", packBean);
+        }
+        if (gunCalibrationRecord.getCalibrationStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(gunCalibrationRecord.getCalibrationStatus(), "calibrationStatus", packBean);
+        }
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getStartTime())) {
+            DdlPreparedPack.getStringBiggerPack(gunCalibrationRecord.getStartTime(), "startTime", packBean);
+        }
+        if (!StringUtils.isEmpty(gunCalibrationRecord.getStartTime())) {
+            DdlPreparedPack.getStringSmallerPack(gunCalibrationRecord.getEndTime(), "endTime", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java

@@ -31,6 +31,14 @@ import javax.persistence.Version;
 public class SwebDocMovementDetails extends BaseBean {
     private static final long serialVersionUID = -1232334350341792942L;
 
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
     @Column(name = "DEST_AREA_NO")
     @ApiParam("目的库存地代码")
     public String destAreaNo;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java

@@ -91,9 +91,13 @@ public class SwebDocMovementMaster extends BaseBean {
     @ApiParam(value = "关联单据")
     private String refNo;
 
-    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编号")
-    @ApiParam(value = "供应商编号")
+    @Column(name = "VENDOR_CODE")
-    private String vendorNo;
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
 
     @Column(name = "VERSION")
     @ApiParam(value = "版本", example = "1")
@@ -111,7 +115,7 @@ public class SwebDocMovementMaster extends BaseBean {
     @ApiParam("打印状态")
     private Integer printStatus;
 
-    @Column(name = "PRINT_STATUS")
+    @Column(name = "IS_SN")
     @ApiParam("打印状态")
     private Integer isSn;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java

@@ -74,4 +74,12 @@ public class SwebDocMovementSn extends BaseBean {
     @Column(name = "SN_TYPE")
     @ApiParam(value = "条码类型")
     private Integer snType;
+
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -175,6 +175,7 @@ public class SwebHqlPack {
     public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(master, result);
     }
@@ -182,6 +183,7 @@ public class SwebHqlPack {
     public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(details, result);
     }

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

@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.wms.bean.sweb;
+
+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 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 : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PO_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class WmsMovementToSweb extends BaseBean {
+    private static final long serialVersionUID = 49215041475324487L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam(value = "计划日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam(value = "计划时间")
+    private String planTime;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+}

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

@@ -0,0 +1,95 @@
+package cn.estsh.i3plus.pojo.wms.bean.sweb;
+
+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 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 : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PO_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class WmsMovementToWms extends BaseBean {
+    private static final long serialVersionUID = -8089219927352225317L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    /**
+     * 移动类型:IN=入库,OUT=出库,MOVE=移库
+     */
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer moveType;
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.wms.bean.sweb;
+
+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 : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PO_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class WmsPoToSweb extends BaseBean {
+    private static final long serialVersionUID = 4710841067412420270L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+}

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

@@ -0,0 +1,93 @@
+package cn.estsh.i3plus.pojo.wms.bean.sweb;
+
+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 : jason.niu
+ * @CreateDate : 2020-05-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PO_TO_WMS")
+@Api("库存移动单处理成功后的记录")
+public class WmsPoToWms extends BaseBean {
+
+    private static final long serialVersionUID = -3999194389200855165L;
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "VERSION")
+    @ApiParam("版本")
+    public String version;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    private Integer item;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数量", example = "0")
+    private Double qty;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商")
+    private String vendorNo;
+
+    @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "条码打印数量", example = "0")
+    private Double printQty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "PLAN_DATE")
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @Column(name = "PLAN_TIME")
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @Column(name = "ERP_AREA_NO")
+    @ApiParam("默认收货库存地")
+    private String erpAreaNo;
+
+    @Column(name = "SNP", columnDefinition = "decimal(18,8)")
+    @ApiParam("标准包装")
+    private Double snp;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+}