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

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

@@ -2558,4 +2558,54 @@ public class CommonEnumUtil {
     public enum DYNAMIC_DATA_SOURCE_TYPE {
         MASTER,NODE
     }
+
+
+
+    /**
+     * 业务表：库存条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SESSION_MODE {
+        DEFAULT(10, "默认"),
+        OVERWRITE(20, "覆盖"),
+        SEIZE(30, "抢占");
+
+        private int value;
+        private String description;
+
+        SESSION_MODE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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 Integer descriptionOfValue(String desc) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -2339,7 +2339,8 @@ public class MesEnumUtil {
     public enum MES_WORK_CELL_TYPE {
 
         NORMAL(10, "正常"),
-        REWORK(20, "返修");
+        REWORK(20, "返修"),
+        ON_LINE(30, "上线工位");
 
         private int value;
         private String description;

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

@@ -797,7 +797,8 @@ public class MesPcnEnumUtil {
     public enum MES_WORK_CELL_TYPE {
 
         NORMAL(10, "正常"),
-        REWORK(20, "返修");
+        REWORK(20, "返修"),
+        ON_LINE(30, "上线工位");
 
         private int value;
         private String description;
@@ -4378,6 +4379,16 @@ public class MesPcnEnumUtil {
             return tmp;
         }
 
+        public static int codeOf(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -4642,8 +4653,73 @@ public class MesPcnEnumUtil {
         public int getValue() {
             return value;
         }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GET_AND_SET {
+        GET(10, "get"),
+        SET(20, "set");
 
+        private int value;
+        private String description;
+
+        GET_AND_SET(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
     }
 
+    /**
+     * mes设备状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQUIPMENT_STATUS {
+
+        INUSE(10, "在用"),
+        SPARE(20, "停止"),
+        FAULT(30, "故障"),
+        SERVICE(40, "检修"),
+        STOPUSING(50, "暂停");
+
+        private int value;
+        private String description;
+
+        MES_EQUIPMENT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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 Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
 }

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

@@ -0,0 +1,47 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_STATUS")
+@Api("工位运行状态")
+public class MesWorkCellStatus extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 102975351699481524L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "TIME_OUT_STATUS")
+    @ApiParam("超时状态")
+    private Integer timeOutStatus;
+
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.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.MesWorkCellStatus;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\15 11:21
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellStatusRepository extends BaseRepository<MesWorkCellStatus, Long> {
+}

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

@@ -65,7 +65,7 @@ public class IfDefectData extends BaseBean implements Serializable {
 
     @Column(name = "DEFECT_ACTION_TYPE")
     @ApiParam("不良处理类型")
-    private Integer defectActionType;
+    private String defectActionType;
 
     @Column(name = "QTY")
     @ApiParam("数量")

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

@@ -82,7 +82,7 @@ public class MesDefectRecord extends BaseBean implements Serializable {
 
     @Column(name = "DEFECT_ACTION_TYPE")
     @ApiParam("不良处理类型")
-    private Integer defectActionType;
+    private String defectActionType;
 
     @Transient
     private List<MesDefect> mesDefectList;

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

@@ -0,0 +1,98 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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 :设备运行履历表
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQUIPMENT_TRAVEL")
+@Api("设备运行履历表")
+public class MesEquipmentTravel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -419342647505833190L;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name = "EQUIPMENT_NAME")
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @Column(name = "STATUS")
+    @ApiParam("设备状态")
+    private Integer status;
+
+    @Column(name = "EQUIPMENT_TYPE")
+    @ApiParam("设备类型")
+    private Integer equipmentType;
+
+    @Column(name = "EQUIPMENT_CATEGORY")
+    @ApiParam("设备类别")
+    private String equipmentCategory;
+
+    @Column(name = "EQUIPMENT_MODEL")
+    @ApiParam("型号")
+    private String equipmentModel;
+
+    @Column(name = "EQUIPMENT_SPEC")
+    @ApiParam("规格")
+    private String equipmentSpec;
+
+    @Column(name = "EQUIPMENT_MAKER")
+    @ApiParam("制造商")
+    private String equipmentMaker;
+
+    @Column(name = "RELEASE_DATE")
+    @ApiParam("出厂日期")
+    private String releaseDate;
+
+    @Column(name = "RECEIVE_DATE")
+    @ApiParam("接收日期")
+    private String receiveDate;
+
+    @Column(name = "ENABLE_DATE")
+    @ApiParam("启用日期")
+    private String enableDate;
+
+    @Column(name = "CONNECT_TYPE")
+    @ApiParam("连接类型")
+    private Integer connectType;
+
+    @Column(name = "CHECK_MODEL")
+    @ApiParam("作业校验模式")
+    private Integer checkModel;
+
+    @Column(name = "STATUS_START_TIME")
+    @ApiParam("状态开始时间")
+    private String statusStartTime;
+
+    @Column(name = "STATUS_END_TIME")
+    @ApiParam("状态结束时间")
+    private String statusEndTime;
+
+}

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

@@ -0,0 +1,35 @@
+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 org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "MES_LOG")
+@Api("MES_日志表")
+public class MesLog extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4089347882308864216L;
+
+    @Column(name = "METHOD_NAME")
+    @ApiParam(value = "方法名")
+    private String methodName;
+
+    @Column(name = "LOG")
+    @ApiParam(value = "日志")
+    private String log;
+
+    @Column(name = "RESULT")
+    @ApiParam(value = "更新结果")
+    private String result;
+}

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

@@ -148,6 +148,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("生产批次")
     private String lotNo;
 
+    @Column(name = "DEFECT_ACTION_TYPE")
+    @ApiParam("不良处理类型")
+    private String defectActionType;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")

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

@@ -180,6 +180,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String productSn;
 
+    @Transient
+    @ApiParam("队列类型")
+    private Integer queueType;
+
     public double getQueueSeqVal() {
         return this.queueSeq == null ? 0.0d : this.queueSeq;
     }
@@ -207,7 +211,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
 
     public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode,
                                Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime,
-                               String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) {
+                               String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,
+                               String gradeCode,String assyNo,Integer queueType) {
         this.orderNo = orderNo;
         this.vinCode = vinCode;
         this.partNo = partNo;
@@ -224,5 +229,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         this.produceColor = produceColor;
         this.gradeCode = gradeCode;
         this.assyNo = assyNo;
+        this.queueType = queueType;
     }
 }

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

@@ -0,0 +1,47 @@
+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 java.io.Serializable;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_STATUS")
+@Api("工位运行状态")
+public class MesWorkCellStatus extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 102975351699481524L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "TIME_OUT_STATUS")
+    @ApiParam("超时状态")
+    private Integer timeOutStatus;
+
+
+}

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

@@ -32,6 +32,10 @@ public class PlcEquStatusModel implements Serializable {
     @ApiParam("产线状态")
     private Integer workCenterStatus;
 
+    // 电检设备切换密码
+    @ApiParam("电检设备切换密码")
+    private String equChoosePassWard;
+
     @ApiParam("停机类型")
     private Integer stopType;
 

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

@@ -27,9 +27,12 @@ public class StationRequestBean implements Serializable {
     @ApiParam("扫描信息")
     private String scanInfo;
 
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
+    @ApiParam("产品条码")
+    private String productSn;
+
     @ApiParam("物料号")
     private String partNo;
 

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

@@ -6,6 +6,12 @@ import lombok.Data;
 @Data
 public class TorqueReviewModel {
 
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     @ApiParam("工作单元代码")
     private String workCellCode;
 

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTravel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :设备运行履历
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesEquipmentTravelRepository extends BaseRepository<MesEquipmentTravel, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesLog;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesLogRepository extends BaseRepository<MesLog, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellStatusRepository.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.MesWorkCellStatus;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\15 11:21
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellStatusRepository extends BaseRepository<MesWorkCellStatus, Long> {
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLog.java

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_LOG")
+@EqualsAndHashCode(callSuper = true)
+@Api("PTL_LOG")
+public class PtlLog extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3885987217528730391L;
+
+    @Column(name = "METHOD_NAME")
+    @ApiParam(value = "方法名")
+    private String methodName;
+
+    @Column(name = "EXCEPTION_LOG")
+    @ApiParam(value = "异常日志")
+    private String exceptionLog;
+
+    @Column(name = "CONTROL_CODE")
+    @ApiParam(value = "控制器")
+    private String controlCode;
+
+    @Column(name = "IP")
+    @ApiParam(value = "IP")
+    private String ip;
+
+    @Column(name = "AREA_NO")
+    @ApiParam(value = "区域")
+    private String areaNo;
+
+    @Column(name = "SECTION_CODE")
+    @ApiParam(value = "区段")
+    private String sectionCode;
+
+    @Column(name = "TAG_NO")
+    @ApiParam(value = "标签地址")
+    private Integer tagNo;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLogRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.IfPickData;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlLog;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlLogRepository extends BaseRepository<PtlLog, Long> {
+
+}

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

@@ -8,11 +8,7 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 
 /**
  * 脚本持久化实体类
@@ -26,7 +22,9 @@ import javax.persistence.Transient;
 @DynamicUpdate
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "SCRIPT_PERSISTENCE")
+@Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"})
+})
 @Api("系统动态脚本")
 public class EngineScriptPersistence extends BaseBean {
     private static final long serialVersionUID = 7893111140559759490L;

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

@@ -229,6 +229,10 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam(value = "jis料架号")
     private String queueGroupNo;
 
+    @Column(name = "CUST_ORDER_NO")
+    @ApiParam(value = "客户单号")
+    private String custOrderNo;
+
     @Transient
     private Long shippingId;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -395,7 +395,16 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
-        DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
+        if (!StringUtil.isEmpty(wmsPart.getPartType()) && wmsPart.getPartType().contains(",")) {
+            String types[] = wmsPart.getPartType().split(",");
+            List<String> partTypes = new ArrayList<>();
+            for (String type : types) {
+                partTypes.add(type);
+            }
+            DdlPreparedPack.getInPackList(partTypes, "partType", result);
+        } else {
+            DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
         DdlPreparedPack.getNumEqualPack(wmsPart.getIsValuable(), "isValuable",result);
         getStringBuilderPack(wmsPart, result);