墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")

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)

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调账"),
+        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"),
-        SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
+        SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"),
+        COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR
 
         private int value;
         private String code;
@@ -5096,6 +5097,7 @@ public class WmsEnumUtil {
     public enum WORK_ORDER_PLAN_STATUS {
         CREATE(10, "CREATE", "创建"),
         PLANNED(20, "PLANNED", "处理中"),
+        FINISH(25, "FINISH", "已完成"),
         CLOSE(30, "CLOSE", "已关闭");
 
         private int value;

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() {
 
     }

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 {

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")
+    @Column(name = "USER_TYPE")
-    @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
+    @ApiParam(value = "账号类型（枚举，待定）", example = "-1")
     private Integer userType;
 
     @Lob
-    @Column(name="LOGIN_INFO")
+    @Column(name = "LOGIN_INFO")
-    @ApiParam(value ="登陆信息" , access ="登陆信息")
+    @ApiParam(value = "登陆信息", access = "登陆信息")
     private String loginInfo;
 
     @Lob
-    @Column(name="MENU_LIST")
+    @Column(name = "MENU_LIST")
-    @ApiParam(value ="菜单" , access ="菜单")
+    @ApiParam(value = "菜单", access = "菜单")
     private String menuList;
 
     @Lob
-    @Column(name="MODULE_LIST")
+    @Column(name = "MODULE_LIST")
-    @ApiParam(value ="模块" , access ="模块")
+    @ApiParam(value = "模块", access = "模块")
     private String moduleList;
 
 }

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 {

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;
 }

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 {

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 {

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 {

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;
 

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() {
 
     }

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() {
 
     }

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;

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;

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) {

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

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
      */

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

@@ -169,12 +169,13 @@ public class IfProductOffLine extends BaseBean implements Serializable {
         this.qcStatus = qcStatus;
     }
 
-    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime) {
+    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) {
         this.workCenterCode = workCenterCode;
         this.partNo = partNo;
         this.partName = partName;
         this.packageNo = packageNo;
         this.qty = qty;
         this.createDatetime = createDatetime;
+        this.workOrderNo = workOrderNo;
     }
 }

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

@@ -48,7 +48,7 @@ public class MesBoardLine extends BaseBean implements Serializable {
 
     @Column(name = "PLAN_TAKT")
     @ApiParam("计划节拍")
-    private Integer planTakt;
+    private Double planTakt;
 
     @Column(name = "PASS_PERCENT_MAX")
     @ApiParam("良品率上限")
@@ -60,7 +60,7 @@ public class MesBoardLine extends BaseBean implements Serializable {
 
     @Column(name = "CAR_RUN_TIME")
     @ApiParam("小车运行时间（分）")
-    private Integer carRunTime;
+    private Double carRunTime;
 
     @Column(name = "TEST_CAR_SUM")
     @ApiParam("调试车数")

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

@@ -41,4 +41,8 @@ public class MesBoardShift extends BaseBean implements Serializable {
     @Column(name = "SHIFT_NAME")
     @ApiParam("班次名称")
     private String shiftName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
 }

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

@@ -130,4 +130,16 @@ public class MesDefectRecord extends BaseBean implements Serializable {
         this.defectName = defectName;
         this.defectQty = defectQty;
     }
+
+    public MesDefectRecord(String partNo, String workOrderNo, String partName, String workCenterCode,
+                           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;
+    }
 }

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

@@ -26,9 +26,9 @@ import java.io.Serializable;
         @Index(columnList = "PACKAGE_NO"),
         @Index(columnList = "SERIAL_NUMBER"),
         @Index(columnList = "PART_NO"),
-        @Index(columnList = "PACKAGE_NO2")
+        @Index(columnList = "PACKAGE_NO2"),
-}, uniqueConstraints = {
+        @Index(columnList = "ORGANIZE_CODE,PACKAGE_NO,SERIAL_NUMBER"),
-        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
+        @Index(columnList = "PACKAGE_NO,SERIAL_NUMBER")
 })
 @Api("包装规格明细")
 public class MesPackageDetail extends BaseBean implements Serializable {

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"),

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;
 }

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")

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

@@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("工作中心")
     private String workCenterCode;
 
+    @Column(name = "GROUP_NO")
+    @ApiParam("分组号")
+    private String groupNo;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;
@@ -213,7 +217,7 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty,
                                Integer queueType,Integer status,String createUser,
                          String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo,
-                         String workCenterCode, String workCellCode, Double qty, Double finsihQty) {
+                         String workCenterCode, String workCellCode, Double qty, Double finsihQty, String groupNo) {
         this.id = id;
         this.seq = seq;
         this.partNo = partNo;
@@ -231,6 +235,7 @@ public class MesQueueOrder extends BaseBean implements Serializable {
         this.workCellCode = workCellCode;
         this.qty = qty;
         this.finsihQty = finsihQty;
+        this.groupNo = groupNo;
     }
 
 }

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;
     }

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

@@ -92,6 +92,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     private Double feedWarningQty;
 
     @Transient
+    @ApiParam("标准包规数量")
+    private Double partSpecQty = 0d;
+
+    @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;
 

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;

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

@@ -28,6 +28,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_WORK_ORDER", indexes = {
         @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "AREA_CODE"),
         @Index(columnList = "WORK_CENTER_CODE"),
         @Index(columnList = "WO_STATUS")
 }, uniqueConstraints = {

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

@@ -43,6 +43,9 @@ public class TJMgnBoardModel extends BaseBean implements Serializable {
     @ApiParam("不合格数量")
     private Double noQuQty;
 
+    @ApiParam("待定数量")
+    private Double determindQty;
+
     @ApiParam("一次合格率")
     private String firstPassRate;
 
@@ -81,6 +84,9 @@ public class TJMgnBoardModel extends BaseBean implements Serializable {
     @ApiParam("结束工单")
     private String workOrderNoEnd;
 
+    @ApiParam("产线")
+    private String workCenterCode;
+
     public TJMgnBoardModel() {
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -18,13 +18,13 @@ public class MgnBjBoardModel implements Serializable {
 
     private Integer qty;
     @ApiParam("jsa数量")
-    private Integer jsaQty;
+    private Integer jsaQty = 0;
     @ApiParam("jsa数量")
     private Integer jsaRate;
     @ApiParam("完成数量")
     private Integer completeQty = 0;
     @ApiParam("完成率")
-    private Integer completeRate;
+    private Integer completeRate = 0;
     @ApiParam("总数量")
     private Integer totalQty = 0;
     @ApiParam("预警数量")
@@ -79,6 +79,9 @@ public class MgnBjBoardModel implements Serializable {
     @ApiParam("工位名称")
     private String workCellName;
 
+    @ApiParam("工位描述")
+    private String workCellDesc;
+
     @ApiParam("x坐标内容")
     private List<String> xAxisList;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/11/29 5:40 PM
+ * @Modify:
+ */
+@Data
+public class SparePartStockModel {
+
+    private String maxQty;
+
+    private String minQty;
+}

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

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())) {
+        if (!StringUtils.isEmpty(queueJitPlan.getPlanStartDate()) || !StringUtils.isEmpty(queueJitPlan.getPlanEndDate())) {
-            DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
+            DdlPreparedPack.timeBuilder(queueJitPlan.getPlanStartDate(), queueJitPlan.getPlanEndDate(),
-                    "createDatetime", packBean, true);
+                    "planDate", packBean, true);
         }
         if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java

@@ -25,9 +25,16 @@ public class WmsStockFifoModel {
     @ApiParam(value = "物料集合")
     List<String> partNos;
 
+    @ApiParam(value = "物料")
+    String partNo;
+
     @ApiParam(value = "存储区集合")
     List<String> zoneNos;
 
+    @ApiParam(value = "存储区")
+    String zoneNo;
+
+
     @ApiParam(value = "物料对应的存储区")
     Map<String, String> partToZoneMap;
 

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)

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")
+    @Column(name = "VENDOR_NO")
-    private String vendorCode;
+    private String vendorNo;
 
     @ApiParam("供应商名称")
     @Column(name = "VENDOR_NAME")

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")
+    @Column(name = "VENDOR_NO")
-    private String vendorCode;
+    private String vendorNo;
 
     @ApiParam("供应商名称")
     @Column(name = "VENDOR_NAME")

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;

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")
+    @Column(name = "VENDOR_NO")
-    private String vendorCode;
+    private String vendorNo;
 
     @ApiParam("供应商名称")
     @Column(name = "VENDOR_NAME")

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")
+    @Column(name = "VENDOR_NO")
-    private String vendorCode;
+    private String vendorNo;
 
     @ApiParam("供应商名称")
     @Column(name = "VENDOR_NAME")

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")
+    @Column(name = "VENDOR_NO")
-    private String vendorCode;
+    private String vendorNo;
 
     @ApiParam("供应商名称")
     @Column(name = "VENDOR_NAME")

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")
+    @Column(name = "VENDOR_NO")
-    private String vendorCode;
+    private String vendorNo;
 
     @ApiParam("供应商名称")
     @Column(name = "VENDOR_NAME")

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("供应商名称")

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("供应商名称")

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")
+    @Column(name = "VENDOR_NO")
-    private String vendorCode;
+    private String vendorNo;
 }

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("供应商名称")

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("供应商名称")

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;
-}

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;

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;

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;

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;

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")
+    @Column(name = "VENDOR_NO")
-    private String vendorCode;
+    private String vendorNo;
 
     @ApiParam("供应商名称")
     @Column(name = "VENDOR_NAME")

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

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())) {
+        if (StringUtil.isEmpty(purchaseOrder.getVendorNo())) {
-            DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
+            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.getStringEqualPack(details.getVendorNo(), "vendorNo", result);
-        //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
-//        DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", 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) {
+        if (vendorNos.size() == 1) {
-            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
+            DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
-        } else if (vendorCodes.size() > 1){
+        } else if (vendorNos.size() > 1){
-            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+            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) {
+        if (vendorNos.size() == 1) {
-            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
+            DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
-        } else if (vendorCodes.size() > 1){
+        } else if (vendorNos.size() > 1){
-            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+            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) {
+        if (vendorNos.size() == 1) {
-            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
+            DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
-        } else if (vendorCodes.size() > 1){
+        } else if (vendorNos.size() > 1){
-            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+            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) {
+        if (vendorNos.size() == 1) {
-            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
+            DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result);
-        } else if (vendorCodes.size() > 1){
+        } else if (vendorNos.size() > 1){
-            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+            DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result);
         }
         DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);

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

@@ -154,6 +154,14 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("备注")
     private String remark;
 
+    @Column(name = "REMARK1")
+    @ApiParam("备注1")
+    private String remark1;
+
+    @Column(name = "REMARK2")
+    @ApiParam("备注2")
+    private String remark2;
+
     @Transient
     @ApiParam(value = "散件收货输入数量", example = "0")
     private Double inputRcQty;
@@ -329,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;

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

@@ -179,6 +179,13 @@ public class WmsPoSn extends BaseBean {
     @ApiParam("物料库位")
     private String partLocateNo;
 
+    @Transient
+    @ApiParam("备注1")
+    private String remark1;
+
+    @Transient
+    @ApiParam("备注2")
+    private String remark2;
 
     public WmsPoSn(){}
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java

@@ -80,8 +80,9 @@ public class WmsInterfaceDataRecord extends BaseBean {
     @Column(name = "ERP_DOC_NO")
     private String erpDocNo;
 
+    // 必须有默认值
     @ApiParam("ERP状态代码")
-    @Column(name = "ERP_STATUS_CODE")
+    @Column(name = "ERP_STATUS_CODE", columnDefinition = "varchar(225) default ''")
     private String erpStatusCode;
 
     @ApiParam("ERP状态描述")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster;
+import cn.estsh.i3plus.pojo.wms.bean.WmsProductVersion;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description 生产版本DAO层
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/12/4 18:49
+ * @Modify
+ */
+@Repository
+public interface WmsProductVersionRepository extends BaseRepository<WmsProductVersion, Long> {
+}

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);
@@ -2030,8 +2030,9 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getSrcLocateNo(), "srcLocateNo", result);
+        if (!StringUtil.isEmpty(wmsDocMovementSn.getItem())) {
-        DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getDestLocateNo(), "destLocateNo", result);
+            DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getItem(), "item", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result);
 
         getStringBuilderPack(wmsDocMovementSn, result);
@@ -2039,6 +2040,7 @@ public class WmsHqlPack {
         return result;
     }
 
+
     /**
      * 移库单订单条码表 分页查询
      *