Merge remote-tracking branch 'pth-test/ext-dev' into ext-dev

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java

@@ -33,7 +33,7 @@ public class InterMediateResult extends BaseAPS {
     private static final long serialVersionUID = -1869359887027950540L;
 
     @Column(name="WORK_ID")
-    @ApiParam(value ="工作")
+    @ApiParam(value ="工作编码")
     @FieldAnnotation(relation = "Work")
     private Long workId;
 
@@ -63,5 +63,5 @@ public class InterMediateResult extends BaseAPS {
     }
 
     @JsonBackReference
-    public List<InterMediateDetail> getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); }
+    public List<InterMediateDetail> getDetails() { return BeanRelation.list(this, EInterMediateResult.Details); }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWork;
+import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
 import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
@@ -18,6 +19,7 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -264,4 +266,7 @@ public class Work extends BaseAPS {
         this.originWorkId = work != null ? work.getId() : 0;
         BeanRelation.set(this, EWork.OriginWork, work);
     }
+
+    @JsonBackReference
+    public List<InterMediateResult> getEvaluateResult() { return BeanRelation.list(this, EWork.EvaluateResult); }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -19,6 +19,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description :工作计划

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java

@@ -15,4 +15,5 @@ public enum EWork {
     SpecifyResource, // 指定资源
     DynSplitWorks, // 动态拆分后的工作
     OriginWork, // 动态拆分前的工作
+    EvaluateResult, // 资源评估结果
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java

@@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.tool;
 
 public class APSDoubleTool {
     public static boolean isZero(Double value) {
-        return (value == null) || (value > -0.000001 && value < 0.000001);
+        return (value == null) || (value > -0.0000001 && value < 0.0000001);
     }
 }

modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="InterMediateResult">
-    <Relation field="Work" name="Work" type="MULTI_TO_ONE">
-    </Relation>
     <Relation field="Resource" name="Resource" type="MULTI_TO_ONE">
     </Relation>
     <Relation field="Details" name="InterMediateDetail" reverse="Result" type="ONE_TO_MULTI" owner="true">

modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml

@@ -22,4 +22,6 @@
     </Relation>
     <Relation field="DynSplitWorks" name="Work" reverse="OriginWork" type="ONE_TO_MULTI">
     </Relation>
+    <Relation field="EvaluateResult" name="InterMediateResult" reverse="Work" type="ONE_TO_MULTI" owner="true">
+    </Relation>
 </Class>

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

@@ -3693,6 +3693,7 @@ public class MesPcnEnumUtil {
         WS_CMD_INIT_MODULE(10, "initModule", "actorReceiveStrategyInitService", "展示组件初始化"),
         WS_CMD_DO_SCAN(20, "doScan", "actorReceiveStrategyScanService", "执行扫描"),
         WS_CMD_DO_MODULE(30, "doModule", "actorReceiveStrategyModuleService", "展示组件执行方法"),
+        WS_CMD_DO_FUNCTION(30, "doFunction", "actorReceiveStrategyFunctionService", "展示组件业务功能方法"),
         WS_CMD_JUMP_PROCESS(40, "jumpProcess", "actorReceiveStrategyJumpProcessService", "跳过工序"),
         WS_CMD_STOP_CELL_MONITOR(50, "stopCellMonitor", "actorReceiveStrategyStopCellMonitorService", "停止执行监听组件");
 

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

@@ -105,6 +105,43 @@ public class ScreenEnumUtil {
         }
     }
 
+    public enum ACTION_TYPE {
+        FRONT(10, "FRONT", "前端"),
+        BACKEND(20, "BACKEND", "后端");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        ACTION_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     public enum NULLABLE {
         YES(10, "YES", "允许为空"),
         NO(20, "NO", "不允许为空");
@@ -351,6 +388,16 @@ public class ScreenEnumUtil {
             return tmp;
         }
 
+        public static ACTION codeOfEnum(String code) {
+            ACTION tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equalsIgnoreCase(code)) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
         public static String codeOfDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java

@@ -36,7 +36,7 @@ public abstract class BaseMdmBean extends BaseBean {
     @Column(name = "MDM_VERSION")
     @ApiParam("当前版本")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long mdmVersion;
+    public Long mdmVersion;
 
     public long getMdmVersionVal() {
         return mdmVersion == null ? 0 : mdmVersion;

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

@@ -122,4 +122,9 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "CUSTOMER_CODE")
     @ApiParam("客户代码")
     private String customerCode;
+
+    //枚举：MesPcnEnumUtil.IF_SYNC_STATUS
+    @Column(name = "SYNC_FLAG")
+    @ApiParam("同步标识(同步工具使用)")
+    private Integer syncFlag;
 }

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

@@ -107,4 +107,9 @@ public class IfQcOrder extends BaseBean  implements Serializable {
     @ApiParam("客户发运地")
     private String custDelieryLocation;
 
+    //枚举：MesPcnEnumUtil.IF_SYNC_STATUS
+    @Column(name = "SYNC_FLAG")
+    @ApiParam("同步标识(同步工具使用)")
+    private Integer syncFlag;
+
 }

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

@@ -63,4 +63,8 @@ public class MesContainer extends BaseBean {
     @Column(name = "TIME_SECOND")
     @ApiParam(value = "处理时间(秒)")
     private String timeSecond;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus = 10;
 }

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

@@ -55,4 +55,8 @@ public class MesContainerType extends BaseBean {
     @Column(name = "LIMIT_UOM")
     @ApiParam(value = "期限单位")
     private String limitUom;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus = 10;
 }

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

@@ -33,10 +33,6 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 6727925715356900171L;
 
-    @Column(name = "SERIAL_NUMBER")
-    @ApiParam("过程条码")
-    private String serialNumber;
-
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
@@ -45,32 +41,31 @@ public class MesDbCheckRecord extends BaseBean implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
-    @Column(name = "DB_CHECK_ITEM")
-    @ApiParam("DB复核项")
-    private String dbCheckItem;
-
     @Column(name = "ERROR_FILED_CODE")
     @ApiParam("异常取值字段")
     private String errorFiledCode;
 
-    @Column(name = "ERROR_DESC")
-    @ApiParam("异常描述")
-    private String errorDesc;
+    @Column(name = "ERROR_FILED_DESC")
+    @ApiParam("异常取值字段描述")
+    private String errorFiledDesc;
+
+    //10数字、20字符串
+    @Column(name = "ERROR_FILED_TYPE")
+    @ApiParam("异常取值字段类型")
+    private String errorFiledType;
+
+    @Column(name = "ERROR_FILED_VALUE")
+    @ApiParam("异常取值字段值")
+    private String errorFiledValue;
 
-    @Column(name = "PRODUCT_DATA_ID")
-    @ApiParam("生产记录表主键ID")
-    private Long productDataId;
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("对象代码（第三方库表名）")
+    private String objectCode;
 
-    //是否停线：1=是，2=否
-    @Column(name = "IS_STOP_LINE")
-    @ApiParam("是否停线")
-    private Integer isStopLine;
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
 
-    //审批状态：10=待审批，20=已审批
-    @Column(name = "STATUS")
-    @ApiParam("审批状态")
-    private Integer status;
 
     @Transient
     @ApiParam("按钮名称")

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

@@ -40,33 +40,29 @@ public class MesDbDataCheck extends BaseBean implements Serializable {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    //DB复核项：10=物料为空复核。20=零件工单匹对复核。30=过程条码重复复核。40=过程条码为空复核。50=产品二维码重复复核。60=产品二维码为空复核。70=质量关键字段为空复核。80=缺陷类型连续超过设定数复核。
-    @Column(name = "DB_CHECK_ITEM")
-    @ApiParam("DB复核项")
-    private Integer dbCheckItem;
-
     @Column(name = "OBJECT_CODE")
-    @ApiParam("对象代码")
+    @ApiParam("对象代码（第三方库表名）")
     private String objectCode;
 
-    //是否停线：1=是，2=否
-    @Column(name = "IS_STOP_LINE")
-    @ApiParam("是否停线")
-    private Integer isStopLine;
-
-    @Column(name = "KEY_DATA_FILED")
-    @ApiParam("质量关键字段")
-    private String keyDataFiled;
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
 
     @Column(name = "QC_FILED_CODE")
-    @ApiParam("缺陷类型字段")
+    @ApiParam("质检取值字段")
     private String qcFiledCode;
 
+    @Column(name = "QC_FILED_DESC")
+    @ApiParam("质检取值字段描述")
+    private String qcFiledDesc;
+
+    @Column(name = "QC_FILED_TYPE")
+    @ApiParam("质检取值字段类型")
+    private String qcFiledType;
+
     @Column(name = "QC_FILED_VALUE")
     @ApiParam("缺陷类型合格值")
     private String qcFiledValue;
 
-    @Column(name = "QC_FAIL_MAX_COUNT")
-    @ApiParam("缺陷连续不合格预警次数")
-    private String qcFailMaxCount;
+
 }

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

@@ -48,4 +48,8 @@ public class MesPartContainerCapacity extends BaseBean {
     @Column(name = "CT_QTY")
     @ApiParam(value = "容量")
     private Integer ctQty;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus = 10;
 }

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

@@ -125,7 +125,7 @@ public class MesQcOrder extends BaseBean implements Serializable {
 
     @Column(name = "ON_SITE_FREQUENCY")
     @ApiParam("巡检次数")
-    private Integer onSiteFrequency = 0;
+    private Integer onSiteFrequency = 1;
 
     @Deprecated
     @ApiParam(value = "检测结果")

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

@@ -74,4 +74,8 @@ public class MesSpcKeyData extends BaseBean implements Serializable {
     @Column(name = "KD_CONDITION")
     @ApiParam("取值条件")
     private String kdCondition;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
 }

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

@@ -19,7 +19,7 @@ public class MesQcOrderDetailRecordModel implements Serializable {
     private String orderNo;
 
     @ApiParam("判定结果")
-    private Integer checkResult = 0;
+    private String checkResult;
 
     @ApiParam("检测值")
     private String checkValue;

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

@@ -94,6 +94,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("强制跳过工序")
     private Boolean forceJumpProcess = false;
 
+    @ApiParam("自动执行状态机")
+    private Boolean triggerAutoFsm = false;
+
     @ApiParam("强制执行工步代码")
     private String forceSpecStepCode;
 

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

@@ -97,6 +97,10 @@ public class StepResult<T> {
         return new StepResult<>(true, data, "", nextTriggerEvent);
     }
 
+    public static <T> StepResult<T> getNewFailureData(T data, String nextTriggerEvent) {
+        return new StepResult<>(false, data, "", nextTriggerEvent);
+    }
+
     public static <T> StepResult<T> getSuccessData(Collection<T> data, String msg) {
         return new StepResult<T>(true, data, msg);
     }

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

@@ -341,7 +341,7 @@ public class MesPcnHqlPack {
         return packBean;
     }
 
-    public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
+    /*public static DdlPackBean getDbCheckRecord(MesDbCheckRecord dbCheckRecord, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
         if (!StringUtils.isEmpty(dbCheckRecord.getSerialNumber())) {
             DdlPreparedPack.getStringLikerPack(dbCheckRecord.getSerialNumber(), "serialNumber", packBean);
@@ -362,7 +362,7 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getStatus(), "status", packBean);
         }
         return packBean;
-    }
+    }*/
 
     /**
      * 按条件分页查询产品条码补打印数据

modules/i3plus-pojo-screen/pom.xml

@@ -16,7 +16,10 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,6 +14,8 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -42,6 +45,7 @@ public class ScrAction extends BaseBean implements Serializable {
 
     @Column(name = "ACTION_TYPE")
     @ApiModelProperty("动作类型")
-    private String actionType;
+    @Enumerated(EnumType.STRING)
+    private ScreenEnumUtil.ACTION_TYPE actionType;
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,6 +16,7 @@ import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -89,10 +91,6 @@ public class ScrModelField extends BaseBean implements Serializable {
     @ApiModelProperty("是否是虚拟的")
     private Boolean isVirtual;
 
-    @Column(name = "VIRTUAL_SPEL")
-    @ApiModelProperty("SPEL表达式虚拟属性")
-    private String virtualSpel;
-
     @Column(name = "MODEL_FIELD_DATASOURCE")
     @ApiModelProperty("字段数据来源")
     @Enumerated(EnumType.STRING)
@@ -106,5 +104,8 @@ public class ScrModelField extends BaseBean implements Serializable {
     @ApiModelProperty("数据列权限")
     private String dataRowAuth;
 
+    @Transient
+    private Object fieldValue;
+
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java

@@ -55,4 +55,14 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable {
     @ApiModelProperty("是否是用户创建的")
     @Enumerated(EnumType.STRING)
     private CommonEnumUtil.TRUE_OR_FALSE isUserCreated;
+
+    @Column(name = "PRIMARY_KEY_SWITCH")
+    @ApiModelProperty("model主键唯一检查开关")
+    @Enumerated(EnumType.STRING)
+    private CommonEnumUtil.TRUE_OR_FALSE primaryKeySwitch;
+
+    @Column(name = "UNIQUE_KEY_SWITCH")
+    @ApiModelProperty("model唯一键唯一检查开关")
+    @Enumerated(EnumType.STRING)
+    private CommonEnumUtil.TRUE_OR_FALSE uniqueKeySwitch;
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource;
 import lombok.Builder;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -15,7 +16,8 @@ import java.util.List;
  */
 @Data
 @Builder
-public class ScrDataObjectIndexModel {
+public class ScrDataObjectIndexModel implements Serializable {
+    private static final long serialVersionUID = -5784177094937410041L;
 
     private ScrDatasource datasource;
 

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrExecuteModel.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.screen.model;
 
+import cn.estsh.i3plus.pojo.screen.bean.ScrAction;
 import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject;
+import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex;
 import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource;
 import cn.estsh.i3plus.pojo.screen.bean.ScrModel;
 import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
@@ -11,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -24,25 +27,39 @@ import java.util.List;
 @Builder
 @AllArgsConstructor
 @ApiModel("model，modelFields与数据对象，数据源的关系")
-public class ScrModelDataObjectModel implements Serializable {
+public class ScrExecuteModel implements Serializable {
     private static final long serialVersionUID = -7305897999888994870L;
 
-    @ApiModelProperty("Model")
+    @ApiModelProperty("动作")
+    private ScrAction action;
+
+    @ApiModelProperty("模型")
     private ScrModel model;
 
     @ApiModelProperty("数据源")
     private ScrDatasource datasource;
 
+    @ApiModelProperty("model对应的数据对象")
+    private List<ScrDataObject> dataObjects;
+
+    @ApiModelProperty("model对应的数据对象索引")
+    private List<ScrDataObjectIndex> dataObjectIndices;
+
     @ApiModelProperty("model字段")
     private List<ScrModelField> modelFields;
 
-    @ApiModelProperty("model字段约束")
-    private List<ScrModelFieldIndex> modelFieldConstraints;
+    @ApiModelProperty("model字段索引")
+    private List<ScrModelFieldIndex> modelFieldIndices;
 
     @ApiModelProperty("model虚拟字段")
     private List<ScrModelFieldVirtual> modelFieldVirtuals;
 
-    @ApiModelProperty("model对应的数据对象")
-    private List<ScrDataObject> dataObjects;
+    private List<ScrModelField> insertCondition;
+
+    private List<ScrModelField> queryCondition;
+
+    private List<ScrModelField> updateCondition;
+
+    private List<ScrModelField> deleteCondition;
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRequestModel.java

@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/5/14 09:58
+ * @desc
+ */
+@Data
+@ApiModel("请求model")
+public class ScrRequestModel implements Serializable {
+    private static final long serialVersionUID = -4119744678742689856L;
+
+    @ApiModelProperty("工厂代码")
+    private String organizeCode;
+
+    @ApiModelProperty("用户名")
+    private String userName;
+
+    @ApiModelProperty("页面代码")
+    private String screenCode;
+
+    @ApiModelProperty("容器代码")
+    private String panelCode;
+
+    @ApiModelProperty("模型")
+    private String modelCode;
+
+    @ApiModelProperty("动作")
+    private String actionCode;
+
+    @ApiModelProperty("分页")
+    private Pager pager;
+
+    @ApiModelProperty("下载文件Id")
+    private Long downloadFileId;
+
+    @ApiModelProperty("跳转参数")
+    private String redirectUrl;
+
+    @ApiModelProperty("跳转参数")
+    private String enumName;
+
+    @ApiModelProperty("目标系统")
+    private CommonEnumUtil.SOFT_TYPE targetSystem;
+
+    @ApiModelProperty("包名")
+    private String packageName;
+
+    @ApiModelProperty("类名")
+    private String className;
+
+    @ApiModelProperty("方法名")
+    private String methodName;
+
+    @ApiModelProperty("上传文件")
+    private MultipartFile file;
+
+    @ApiModelProperty("模型字段")
+    private List<ScrModelField> modelFields;
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -15,7 +16,8 @@ import java.util.List;
  */
 @Data
 @ApiModel("行列Model")
-public class ScrRowColumnModel {
+public class ScrRowColumnModel implements Serializable {
+    private static final long serialVersionUID = 7450630220924238356L;
 
     @ApiModelProperty("行")
     private ScrLayoutRow row;

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDdlModel.java

@@ -14,8 +14,8 @@ import java.util.List;
  **/
 @Data
 public class ScrSqlDdlModel implements Serializable {
-
     private static final long serialVersionUID = -1294648161172538340L;
+
     private String tableCat;
     private String tableSchem;
     private String tableName;

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrSqlDmlModel.java

@@ -35,6 +35,9 @@ public class ScrSqlDmlModel implements Serializable {
     @ApiModelProperty("表名或视图名")
     private String table;
 
+    @ApiModelProperty("字段")
+    private List<String> fields;
+
     @ApiModelProperty("查询参数")
     private Map<String, Object> searchParams;
 
@@ -59,8 +62,8 @@ public class ScrSqlDmlModel implements Serializable {
     @ApiModelProperty("数据源")
     private ScrDatasource datasource;
 
-    @Deprecated
-    @ApiModelProperty("model与数据对象的model")
-    private ScrModelDataObjectModel modelDataObjectModel;
+    @ApiModelProperty("主键")
+    private Map<String, Object> primaryKeys;
+
 
 }

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

@@ -136,6 +136,21 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("备注")
     private String remark;
 
+    @Column(name = "REASON")
+    @ApiParam("原因")
+    public String reason;
+
+    @Column(name = "DEPARTMENT")
+    @ApiParam(value = "部门")
+    private String department;
+
+    @Column(name = "RECEIVER")
+    @ApiParam("领用人")
+    private String receiver;
+
+    @Column(name = "PROD_DFG_TYPE_CODE")
+    @ApiParam("项目号")
+    private String prodCfgTypeCode;
 
     @Transient
     private List<WmsDocMovementDetails> movementDetailsList;

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -90,4 +92,95 @@ public class WmsTransSn extends BaseBean {
     @Column(name = "SN_STATUS")
     @ApiParam(value = "条码状态", example = "0")
     private Integer snStatus;
+
+    @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "交易数量")
+    public Double transQty;
+
+    @Column(name = "SRC_PART_NO")
+    @ApiParam("源物料编码")
+    public String srcPartNo;
+
+    @Column(name = "NEW_PART_NO")
+    @ApiParam("新物料编码")
+    public String newPartNo;
+
+    @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "源数量")
+    public Double srcQty;
+
+    @Column(name = "NEW_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "新数量")
+    public Double newQty;
+
+    @Column(name = "SRC_SN_STATUS")
+    @ApiParam(value = "源条码状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class)
+    public Integer srcSnStatus;
+
+    @Column(name = "NEW_SN_STATUS")
+    @ApiParam(value = "目的条码状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class)
+    public Integer newSnStatus;
+
+    @Column(name = "SRC_QC_STATUS")
+    @ApiParam(value = "源质量状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class)
+    public Integer srcQcStatus;
+
+    @Column(name = "NEW_QC_STATUS")
+    @ApiParam(value = "目的质量状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class)
+    public Integer descQcStatus;
+
+    @Column(name = "SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name = "NEW_WH_NO")
+    @ApiParam("新仓库代码")
+    public String newWhNo;
+
+    @Column(name = "SRC_ZONE_NO")
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @Column(name = "NEW_ZONE_NO")
+    @ApiParam("新存储区代码")
+    public String newZoneNo;
+
+    @Column(name = "NEW_LOCATE_NO")
+    @ApiParam("新库位代码")
+    public String newLocateNo;
+
+    @Column(name = "SRC_LOCATE_NO")
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @Column(name = "SRC_ORGANIZE_CODE")
+    @ApiParam("源工厂代码")
+    public String srcOrganizeCode;
+
+    @Column(name = "NEW_ORGANIZE_CODE")
+    @ApiParam("新工厂代码")
+    public String newOrganizeCode;
+
+    @Column(name = "SRC_IS_DELETED")
+    @ApiParam("旧软删标识")
+    public Integer srcIsDeleted;
+
+    @Column(name = "NEW_IS_DELETED")
+    @ApiParam("新软删标识")
+    public Integer newIsDeleted;
+
+    @Column(name = "SRC_IS_VALID")
+    @ApiParam("旧有效标识")
+    public Integer srcIsValid;
+
+    @Column(name = "NEW_IS_VALID")
+    @ApiParam("新有效标识")
+    public Integer newIsValid;
 }