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

5 years ago · 02decfe9c4
parent 5c1164a938 a62b10dc9d
commit 02decfe9c4
52 changed files with 176 additions and 165 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@ -3126,6 +3126,41 @@ public class MesEnumUtil {
    }

    /**
+     * 工步参数 是否必填
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_STEP_PARAM_IS_NEED {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        MES_STEP_PARAM_IS_NEED(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;
+        }
+    }
+
+    /**
     * mes工作单元参数类型
     */
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@ -869,8 +869,9 @@ public class WmsEnumUtil {
        WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
        OTHER_IN(730, "OTHER_IN", "其它入库"),
        OTHER_OUT(740, "OTHER_OUT", "其它出库"),
-        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
-        SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
+        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"),
+        SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"),
+        COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR

        private int value;
        private String code;
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>i3plus-pojo</artifactId>
        <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
@ -67,6 +67,7 @@ public class MesDefect extends BaseBean implements Serializable {
    @Transient
    @ApiParam("缺陷类型子集")
    private List<MesDefect> mesDefectList;
+
    public MesDefect() {

    }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
@ -25,7 +25,7 @@ import java.io.Serializable;
@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
 }, uniqueConstraints = {
        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
-    }
+}
 )
@Api("包装规格")
 public class MesPackage extends BaseBean implements Serializable {
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java
@ -48,23 +48,23 @@ public class MesPcnSysUserOffline extends BaseBean implements Serializable {
    @ApiParam(value = "登陆名称", access = "登陆名称")
    private String loginName;

-    @Column(name="USER_TYPE")
-    @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
+    @Column(name = "USER_TYPE")
+    @ApiParam(value = "账号类型（枚举，待定）", example = "-1")
    private Integer userType;

    @Lob
-    @Column(name="LOGIN_INFO")
-    @ApiParam(value ="登陆信息" , access ="登陆信息")
+    @Column(name = "LOGIN_INFO")
+    @ApiParam(value = "登陆信息", access = "登陆信息")
    private String loginInfo;

    @Lob
-    @Column(name="MENU_LIST")
-    @ApiParam(value ="菜单" , access ="菜单")
+    @Column(name = "MENU_LIST")
+    @ApiParam(value = "菜单", access = "菜单")
    private String menuList;

    @Lob
-    @Column(name="MODULE_LIST")
-    @ApiParam(value ="模块" , access ="模块")
+    @Column(name = "MODULE_LIST")
+    @ApiParam(value = "模块", access = "模块")
    private String moduleList;

 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
@ -27,7 +27,7 @@ import java.io.Serializable;
@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")
 }, uniqueConstraints = {
        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
-    }
+}
 )
@Api("生产主计划")
 public class MesPlanOrder extends BaseBean implements Serializable {
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java
@ -51,5 +51,5 @@ public class MesProdScatterCfgBom extends BaseBean implements Serializable {

    @Column(name = "IS_KEY_PART")
    @ApiParam("是否关键件")
-    private Integer isKeyPart ;
+    private Integer isKeyPart;
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java
@ -28,7 +28,7 @@ import java.io.Serializable;
        @Index(columnList = "CREATE_DATE_TIME")
 }, uniqueConstraints = {
        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"})
-    }
+}
 )
@Api("产品条码表")
 public class MesProduceSn extends BaseBean implements Serializable {
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java
@ -27,7 +27,7 @@ import java.io.Serializable;
        @Index(columnList = "CUST_FLAG_NO")
 }, uniqueConstraints = {
        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
-    }
+}
 )
@Api("生产队列主表")
 public class MesQueueOrder extends BaseBean implements Serializable {
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java
@ -27,7 +27,7 @@ import java.io.Serializable;
        @Index(columnList = "ORDER_NO")
 }, uniqueConstraints = {
        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
-    }
+}
 )
@Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean implements Serializable {
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java
@ -54,7 +54,7 @@ public class MesShift extends BaseBean implements Serializable {
    @ApiParam("作业时长")
    private Double workTimes;

-    @Column(name="SHIFT_SEQ")
+    @Column(name = "SHIFT_SEQ")
    @ApiParam("班次顺序")
    private Integer shiftSeq;

--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java
@ -35,6 +35,7 @@ public class DefectModel {

    @ApiParam("缺陷类型子集")
    private List<DefectModel> mesDefectList;
+
    public DefectModel() {

    }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java
@ -48,6 +48,7 @@ public class MesProdBindRecordModel {
    private String serialNumber;
    @ApiParam("关联批次")
    private String lotNo;
+
    public MesProdBindRecordModel() {

    }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
@ -67,6 +67,7 @@ public class QueueOrderModel implements Serializable {
        this.snStatus = snStatus;
        this.workType = workType;
    }
+
    public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                           String partNo, String partNameRdd, String workType) {
        this.id = id;
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java
@ -113,9 +113,13 @@ public class RequestModel {
        return orderNoList;
    }

-    public void setActionRequestBean(ActionRequestBean actionRequestBean) { this.actionRequestBean = actionRequestBean; }
+    public void setActionRequestBean(ActionRequestBean actionRequestBean) {
+        this.actionRequestBean = actionRequestBean;
+    }

-    public ActionRequestBean getActionRequestBean() { return actionRequestBean; }
+    public ActionRequestBean getActionRequestBean() {
+        return actionRequestBean;
+    }

    public Double getCurrentSeq() {
        return currentSeq == null ? 0.0d : currentSeq;
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java
@ -19,11 +19,11 @@ public class StepResult<T> {
    private String msg;

    public static StepResult getSuccessComplete() {
-        return new StepResult(true,"");
+        return new StepResult(true, "");
    }

    public static StepResult getNonComplete() {
-        return new StepResult(false,"");
+        return new StepResult(false, "");
    }

    public static StepResult getSuccessComplete(String msg) {
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java
@ -11,5 +11,5 @@ import org.springframework.stereotype.Repository;
 * @Date : 2020/1/8 0008 - 18:43
 */
@Repository
-public interface MesMonitorTaskRepository extends BaseRepository<MesMonitorTask,Long> {
+public interface MesMonitorTaskRepository extends BaseRepository<MesMonitorTask, Long> {
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java
@ -72,7 +72,7 @@ public class MesHqlPack {
     * @param mesLabelTemplate
     * @return
     */
-    public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) {
+    public static DdlPackBean getLabelTemplate(MesLabelTemplate mesLabelTemplate) {
        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
        DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
        return packBean;
@ -286,6 +286,7 @@ public class MesHqlPack {

    /**
     * 按条件分页查询产品条码补打印数据
+     *
     * @param mesProduceSn
     * @return
     */
@ -325,6 +326,7 @@ public class MesHqlPack {

    /**
     * 按条件分页查询包装条码补打印数据
+     *
     * @param mesPackage
     * @return
     */
@ -387,9 +389,9 @@ public class MesHqlPack {
    }


-
    /**
     * 按条件分页查询类型信息数据
+     *
     * @param typeCfg
     * @return
     */
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
@ -132,12 +132,13 @@ public class MesDefectRecord extends BaseBean implements Serializable {
    }

    public MesDefectRecord(String partNo, String workOrderNo, String partName, String workCenterCode,
-                           String workCellCode, String modifyUser, String modifyDatetime) {
+                           String workCellCode, String serialNumber, String modifyUser, String modifyDatetime) {
        this.partNo = partNo;
        this.workOrderNo = workOrderNo;
        this.partName = partName;
        this.workCenterCode = workCenterCode;
        this.workCellCode = workCellCode;
+        this.serialNumber = serialNumber;
        this.modifyUser = modifyUser;
        this.modifyDatetime = modifyDatetime;
    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
@ -26,10 +26,10 @@ import java.io.Serializable;
        @Index(columnList = "PACKAGE_NO"),
        @Index(columnList = "SERIAL_NUMBER"),
        @Index(columnList = "PART_NO"),
-        @Index(columnList = "PACKAGE_NO2")
-}/*, uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
-}*/)
+        @Index(columnList = "PACKAGE_NO2"),
+        @Index(columnList = "ORGANIZE_CODE,PACKAGE_NO,SERIAL_NUMBER"),
+        @Index(columnList = "PACKAGE_NO,SERIAL_NUMBER")
+})
@Api("包装规格明细")
 public class MesPackageDetail extends BaseBean implements Serializable {
    private static final long serialVersionUID = 6980459490465566975L;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@ -26,6 +26,7 @@ import java.math.BigDecimal;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_SN", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
        @Index(columnList = "PRODUCT_SN"),
        @Index(columnList = "CREATE_DATE_TIME"),
        @Index(columnList = "PART_NO"),
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
@ -145,4 +145,15 @@ public class MesQcOrder extends BaseBean implements Serializable {
    @ApiParam("本批次生产总数")
    private Double locSrcLotNoQty;

+    @Transient
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @Transient
+    @ApiParam("班次")
+    private String shiftName;
+
+    @Transient
+    @ApiParam("班长")
+    private String squadLeader;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
@ -125,7 +125,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {

    @Transient
    @ApiParam("检测值")
-    private String checkValue;
+    private String checkValue = "";

    @Transient
    @ApiParam("质检单检测记录id")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java
@ -70,6 +70,10 @@ public class MesRawPartSn extends BaseBean implements Serializable {
    @ApiParam("供应商代码")
    private String supplierCode;

+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
+
    public double getRawQtyVal() {
        return this.rawQty == null ? 0l : this.rawQty;
    }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java
@ -65,6 +65,10 @@ public class MesStepParam extends BaseBean implements Serializable {
    @ApiParam("参数对象")
    private String objectCode;

+    @Column(name = "IS_NEED")
+    @ApiParam("是否必需")
+    private Integer isNeed = 1;
+
    @Column(name = "TYPE")
    @ApiParam("type")
    private Integer type = 0;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java
@ -11,7 +11,7 @@ import lombok.Data;
@Data
 public class SparePartStockModel {

-    private Integer maxQty;
+    private String maxQty;

-    private Integer minQty;
+    private String minQty;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java
@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository;

 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail;
+import org.springframework.stereotype.Repository;


 /**
@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail;
 * @CreateDate: 2019/10/19 10:33 上午
 * @Description:
 **/
+@Repository
 public interface MesPackageDetailRepository extends BaseRepository<MesPackageDetail, Long> {
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@ -3327,9 +3327,9 @@ public class MesHqlPack {
        if (queueJitPlan.getStatus() != null) {
            DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean);
        }
-        if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
-            DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
-                    "createDatetime", packBean, true);
+        if (!StringUtils.isEmpty(queueJitPlan.getPlanStartDate()) || !StringUtils.isEmpty(queueJitPlan.getPlanEndDate())) {
+            DdlPreparedPack.timeBuilder(queueJitPlan.getPlanStartDate(), queueJitPlan.getPlanEndDate(),
+                    "planDate", packBean, true);
        }
        if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
            DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
@ -9,6 +9,7 @@ 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;

@ -63,9 +64,15 @@ public class SysOrderNoRule extends BaseBean {

    @Column(name = "IS_CYCLE")
    @ApiParam(value = "达到最大值后是否循环",example = "1")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
    private Integer isCycle;

+    @Column(name = "IS_FIXED_LENGTH")
+    @ColumnDefault("2")
+    @ApiParam(value = "是否固定序号长度长度",example = "1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isFixedLength;
+
    @Column(name = "SERIAL_NO")
    @ApiParam(value = "当前流水号",example = "-1")
    @JsonSerialize(using = ToStringSerializer.class)
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java
@ -32,8 +32,8 @@ public class SwebDocMovementDetails extends BaseBean {
    private static final long serialVersionUID = -1232334350341792942L;

    @ApiParam("供应商编号")
-    @Column(name = "VENDOR_CODE")
-    private String vendorCode;
+    @Column(name = "VENDOR_NO")
+    private String vendorNo;

    @ApiParam("供应商名称")
    @Column(name = "VENDOR_NAME")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java
@ -92,8 +92,8 @@ public class SwebDocMovementMaster extends BaseBean {
    private String refNo;

    @ApiParam("供应商编号")
-    @Column(name = "VENDOR_CODE")
-    private String vendorCode;
+    @Column(name = "VENDOR_NO")
+    private String vendorNo;

    @ApiParam("供应商名称")
    @Column(name = "VENDOR_NAME")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java
@ -75,10 +75,6 @@ public class SwebDocMovementSn extends BaseBean {
    @ApiParam(value = "条码类型")
    private Integer snType;

-    @ApiParam("供应商编号")
-    @Column(name = "VENDOR_CODE")
-    private String vendorCode;
-
    @ApiParam("供应商名称")
    @Column(name = "VENDOR_NAME")
    private String vendorName;
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java
@ -42,8 +42,8 @@ public class SwebProcurementPlanOrder extends BaseBean {
    private Integer orderStatus;

    @ApiParam("供应商代码")
-    @Column(name = "VENDOR_CODE")
-    private String vendorCode;
+    @Column(name = "VENDOR_NO")
+    private String vendorNo;

    @ApiParam("供应商名称")
    @Column(name = "VENDOR_NAME")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java
@ -37,8 +37,8 @@ public class SwebPurchaseOrder extends BaseBean {
    public String orderNo;

    @ApiParam("供应商编号")
-    @Column(name = "VENDOR_CODE")
-    private String vendorCode;
+    @Column(name = "VENDOR_NO")
+    private String vendorNo;

    @ApiParam("供应商名称")
    @Column(name = "VENDOR_NAME")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java
@ -36,8 +36,8 @@ public class SwebPurchaseOrderDetails extends BaseBean {
    private String orderNo;

    @ApiParam("供应商编号")
-    @Column(name = "VENDOR_CODE")
-    private String vendorCode;
+    @Column(name = "VENDOR_NO")
+    private String vendorNo;

    @ApiParam("供应商名称")
    @Column(name = "VENDOR_NAME")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
@ -36,8 +36,8 @@ public class SwebPurchaseOrderSn extends BaseBean {
    private String orderNo;

    @ApiParam("供应商编号")
-    @Column(name = "VENDOR_CODE")
-    private String vendorCode;
+    @Column(name = "VENDOR_NO")
+    private String vendorNo;

    @ApiParam("供应商名称")
    @Column(name = "VENDOR_NAME")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java
@ -37,9 +37,9 @@ public class SwebRequireAlarm extends BaseBean {
    @ApiParam("物料名称")
    private String partName;

-    @Column(name = "VENDOR_CODE")
+    @Column(name = "VENDOR_NO")
    @ApiParam("供应商代码")
-    private String vendorCode;
+    private String vendorNo;

    @Column(name = "VENDOR_NAME")
    @ApiParam("供应商名称")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java
@ -35,9 +35,9 @@ public class SwebVendorAlarm extends BaseBean {
    @ApiParam("物料名称")
    private String partName;

-    @Column(name = "VENDOR_CODE")
+    @Column(name = "VENDOR_NO")
    @ApiParam("供应商代码")
-    private String vendorCode;
+    private String vendorNo;

    @Column(name = "VENDOR_NAME")
    @ApiParam("供应商名称")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java
@ -38,6 +38,6 @@ public class SwebVendorRel extends BaseBean {
    private String vendorName;

    @ApiParam("供应商代码")
-    @Column(name = "VENDOR_CODE")
-    private String vendorCode;
+    @Column(name = "VENDOR_NO")
+    private String vendorNo;
 }
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java
@ -37,9 +37,9 @@ public class SwebVendorStock extends BaseBean {
    @ApiParam("物料名称")
    private String partName;

-    @Column(name = "VENDOR_CODE")
+    @Column(name = "VENDOR_NO")
    @ApiParam("供应商代码")
-    private String vendorCode;
+    private String vendorNo;

    @Column(name = "VENDOR_NAME")
    @ApiParam("供应商名称")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java
@ -30,9 +30,9 @@ import javax.persistence.Transient;
 public class SwebVendorSupplierCapcity extends BaseBean {
    private static final long serialVersionUID = 2327910806789997252L;

-    @Column(name = "VENDOR_CODE")
+    @Column(name = "VENDOR_NO")
    @ApiParam("供应商代码")
-    private String vendorCode;
+    private String vendorNo;

    @Column(name = "VENDOR_NAME")
    @ApiParam("供应商名称")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java
@ -1,48 +0,0 @@
-package cn.estsh.i3plus.pojo.sweb.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 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_MOVEMENT_TO_SWEB")
-@Api("库存移动单处理成功后的记录")
-public class WmsMovementToSweb extends BaseBean {
-    private static final long serialVersionUID = 49215041475324487L;
-
-    @Column(name = "ORDER_NO")
-    @ApiParam("单号")
-    public String orderNo;
-
-    /**
-     * 状态:1=创建,10=待处理,20=已处理
-     */
-    @Column(name="ITEM_STATUS")
-    @ApiParam(value = "状态", example = "0")
-    public Integer itemStatus;
-
-    @Column(name = "SYNC_STATUS")
-    @ApiParam("同步状态")
-    private Integer syncStatus;
-}
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java
@ -23,7 +23,7 @@ public class SwebPOBatchInsertEnterModel extends BaseBean {
    private String orderNo;

    @ApiParam("供应商编号")
-    private String vendorCode;
+    private String vendorNo;

    @ApiParam("供应商名称")
    private String vendorName;
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java
@ -24,7 +24,7 @@ public class SwebPOBatchInsertItemEnterModel implements Serializable {
    private String partName;

    @ApiParam("供应商编号")
-    private String vendorCode;
+    private String vendorNo;

    @ApiParam("供应商名称")
    private String vendorName;
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java
@ -21,7 +21,7 @@ public class SwebPODetailsUpdateHistoryModel extends BaseBean {
    private String orderNo;

    @ApiParam("供应商编号")
-    private String vendorCode;
+    private String vendorNo;

    @ApiParam(value = "零件号")
    private String partNo;
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java
@ -19,7 +19,7 @@ public class SwebPOForPubListEnterModel extends BaseBean {
    private String orderNo;

    @ApiParam("供应商编号")
-    private String vendorCode;
+    private String vendorNo;

    @ApiParam(value = "订单类型", example = "1")
    public Integer orderType;
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java
@ -28,8 +28,8 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
    private String partNo;

    @ApiParam("供应商编号")
-    @Column(name = "VENDOR_CODE")
-    private String vendorCode;
+    @Column(name = "VENDOR_NO")
+    private String vendorNo;

    @ApiParam("供应商名称")
    @Column(name = "VENDOR_NAME")
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java
@ -1,9 +0,0 @@
-package cn.estsh.i3plus.pojo.sweb.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.sweb.bean.WmsMovementToSweb;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface WmsMovementToSwebRepository extends BaseRepository<WmsMovementToSweb, Long> {
-}
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
@ -52,7 +52,7 @@ public class SwebHqlPack {
        DdlPackBean result = new DdlPackBean();
        DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
        DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
-        DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
+        DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
        if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
            DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
                    purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
@ -67,10 +67,10 @@ public class SwebHqlPack {
        DdlPackBean result = new DdlPackBean();
        DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
        DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
-        if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) {
-            DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
+        if (StringUtil.isEmpty(purchaseOrder.getVendorNo())) {
+            DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
        } else {
-            DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
+            DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorNo(), "vendorNo", result);
        }
        if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
            DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
@ -113,7 +113,7 @@ public class SwebHqlPack {
        HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result);

        HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
-        HqlPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
+        HqlPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result);
        HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result);
        HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result);
        // 封装有效状态和删除状态
@ -127,7 +127,7 @@ public class SwebHqlPack {
    public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
        DdlPackBean result = new DdlPackBean();
        DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result);
        DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result);
        DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result);
        // 封装有效状态和删除状态
@ -139,7 +139,7 @@ public class SwebHqlPack {

    public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {
        DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", result);
        DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
        return buildHql(swebProcurementPlanOrder, result);
@ -156,7 +156,7 @@ public class SwebHqlPack {

    public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) {
        DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getStringLikerPack(vendorRel.getVendorNo(), "vendorNo", result);
        DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
        return buildHql(vendorRel, result);
@ -165,19 +165,17 @@ public class SwebHqlPack {
    public static DdlPackBean getPurchaseOrderDetailsPublishListQtyWhereHql(SwebPurchaseOrderDetails details) {
        DdlPackBean result = new DdlPackBean();
        DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
        DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
        DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
-        //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
        return buildHql(details, result);
    }

    public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) {
        DdlPackBean result = new DdlPackBean();
        DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
        DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
-        //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
        return buildHql(details, result);
    }

@ -189,9 +187,7 @@ public class SwebHqlPack {
    public static DdlPackBean getPODetailsPublishListUpdatePublishStatusWhereHql(SwebPurchaseOrderDetails details) {
        DdlPackBean result = new DdlPackBean();
        DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
-        //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
-//        DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
+        DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
        return buildHql(details, result);
    }

@ -212,17 +208,17 @@ public class SwebHqlPack {
        DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
        DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result);
        DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result);
-        DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getStringLikerPack(details.getVendorNo(), "vendorNo", result);
        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
        return buildHql(details, result);
    }

-    public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List<String> vendorCodes) {
+    public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List<String> vendorNos) {
        DdlPackBean result = new DdlPackBean();
-        if (vendorCodes.size() == 1) {
-            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
-        } else if (vendorCodes.size() > 1){
-            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+        if (vendorNos.size() == 1) {
+            DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
+        } else if (vendorNos.size() > 1){
+            DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
        }
        DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result);
        DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result);
@ -236,12 +232,12 @@ public class SwebHqlPack {
        return buildHql(capcity, result);
    }

-    public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List<String> vendorCodes) {
+    public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List<String> vendorNos) {
        DdlPackBean result = new DdlPackBean();
-        if (vendorCodes.size() == 1) {
-            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
-        } else if (vendorCodes.size() > 1){
-            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+        if (vendorNos.size() == 1) {
+            DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
+        } else if (vendorNos.size() > 1){
+            DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
        }
        DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
        if (!StringUtil.isEmpty(alarm.getDateStart())) {
@ -254,24 +250,24 @@ public class SwebHqlPack {
        return buildHql(alarm, result);
    }

-    public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List<String> vendorCodes) {
+    public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List<String> vendorNos) {
        DdlPackBean result = new DdlPackBean();
-        if (vendorCodes.size() == 1) {
-            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
-        } else if (vendorCodes.size() > 1){
-            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+        if (vendorNos.size() == 1) {
+            DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
+        } else if (vendorNos.size() > 1){
+            DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
        }
        DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result);
        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result);
        return buildHql(stock, result);
    }

-    public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List<String> vendorCodes) {
+    public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List<String> vendorNos) {
        DdlPackBean result = new DdlPackBean();
-        if (vendorCodes.size() == 1) {
-            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
-        } else if (vendorCodes.size() > 1){
-            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+        if (vendorNos.size() == 1) {
+            DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
+        } else if (vendorNos.size() > 1){
+            DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
        }
        DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result);
        DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@ -337,10 +337,10 @@ public class WmsPOMasterDetails extends BaseBean {
        this.qty = qty;
    }

-    public WmsPOMasterDetails(String orderNo, String remark, Integer item,String partNo,String partNameRdd, Double qty,
+    public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty,
                                Double rcQty, Integer itemStatus) {
        this.orderNo = orderNo;
-        this.remark = remark;
+        this.erpSrcNo = erpSrcNo;
        this.item = item;
        this.partNo = partNo;
        this.partNameRdd = partNameRdd;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@ -176,7 +176,7 @@ public class WmsHqlPack {
        DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean);
        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean);
        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean);
-        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean);
+        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorNo", packBean);
        DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean);
        DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);
        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);