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

modules/i3plus-pojo-aps/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-aps</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-base</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.aps.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FieldAnnotation {
+    boolean modify() default true;
+    boolean display() default true;
+    int pric() default 2;
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class BaseAPS extends BaseBean {
+    private transient Map<String, Object> customFields = new HashMap<>();
+
+    public Object getCustomField(String code) {
+        return customFields.get(code);
+    }
+
+    public void setCustomField(String code, Object value) {
+        customFields.put(code, value);
+    }
+}

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import lombok.Data;
+
+import javax.persistence.MappedSuperclass;
+
+/**
+ * @Description :含有编码，名字的基类
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-12
+ * @Modify:
+ **/
+@Data
+@MappedSuperclass
+public class BaseCode extends BaseAPS {
+    private String code;
+    private String name;
+    private String remark;
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class BaseOrder extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class BaseRule extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class Calendar extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class CancelPlanRule extends BaseRule {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class DayShift extends BaseAPS {
+}

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.lang.reflect.Method;
+
+/**
+ * @Description :字段信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="APS_FIELD_INFO")
+@Api("字段信息")
+public class FieldInfo extends BaseCode {
+    private String className;
+    private FIELD_TYPE type;
+    private Boolean customize;
+    private Boolean modify;
+    private Boolean display;
+    private Integer pric;
+    private String tips;
+    private String expression;
+    private String position;
+
+    @JsonIgnore
+    private transient Class<? extends BaseBean> clazz;
+    @JsonIgnore
+    private transient Class<?> typeClass;
+    @JsonIgnore
+    private transient Method getMethod;
+    @JsonIgnore
+    private transient Method setMethod;
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class FieldSetRule extends BaseRule {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class HeuristicRule extends BaseRule {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class Inventory extends BaseOrder {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class MatCalcRule extends BaseRule {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class Material extends BaseCode {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class OperInput extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class OperOutput extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class OperResource extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class Operation extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class PlanFeedback extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class ProductOrder extends BaseOrder {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class ProductRouting extends BaseCode {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class PurchaseOrder extends BaseOrder {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class ResCalendar extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class Resource extends BaseCode {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class RuleGroup extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class SalesOrder extends BaseOrder {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class StandOperation extends BaseCode {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class SysParam extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class Work extends BaseCode {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class WorkInput extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class WorkOutput extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class WorkRelation extends BaseAPS {
+}

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

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+public class WorkResource extends BaseAPS {
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/FIELD_TYPE.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+public enum FIELD_TYPE {
+    NONE,
+    BOOLEAN,
+    CHAR,
+    SHORT,
+    INTEGER,
+    LONG,
+    DOUBLE,
+    DATE,
+    TIME,
+    DATETIME,
+    DURATION,
+    ENUM,
+    MULTIENUM,
+    STRING,
+    OBJECT,
+    LIST
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FieldInfoRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.FieldInfo;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface FieldInfoRepository extends BaseRepository<FieldInfo, Long> {
+}

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -66,8 +67,7 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="IS_VALID")
     @ApiParam(value = "有效性",example = "1")
-    @AnnoOutputColumn(hidden = true)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
-    //启用停用
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
     @Column(name="IS_DELETED")

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

@@ -111,14 +111,15 @@ public class BlockSoftSwitchEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SOFTS_WITCH_ACTION{
         /* WebService */
-        SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"serverWebServiceSendEmail","软适配服务邮件服务"),
+        SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
-        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"serverWebServiceSendEmail","软适配服务邮件服务"),
+        SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
+        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
 
         /* 数据源 */
-        CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"imppDataSourceClient","软适配服务邮件服务"),
+        CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),
 
         /* Restful */
-        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"imppHttpRestfulClient","Restful Client Impp Test");
+        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test");
 
         private int value;
         private String description;
@@ -126,6 +127,13 @@ public class BlockSoftSwitchEnumUtil {
         private SUIT_MODE mode;
         private CASE_TYPE type;
 
+        SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String description) {
+            this.value = value;
+            this.description = description;
+            this.mode = mode;
+            this.type = type;
+        }
+
         SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String clazzName, String description) {
             this.value = value;
             this.description = description;

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

@@ -1188,10 +1188,10 @@ public class MesHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesActionAllData(String organizeCode) {
+    public static DdlPackBean getMesAllData(String organizeCode) {
         DdlPackBean packBean = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/12 下午2:00
+ * @Modify:
+ **/
+@Data
+public class SoftswitchIocModel {
+    private String beanName;
+    private Object obj;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java

@@ -9,6 +9,8 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.HashMap;
+
 /**
  * @Description :
  * @Reference :
@@ -17,7 +19,7 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-@XStreamAlias("model")
+@XStreamAlias("client")
 public class SuitClientModel {
 
     /**
@@ -31,7 +33,7 @@ public class SuitClientModel {
     private Integer caseTypeId;
 
     @ApiParam(value = "适配命令(枚举)")
-    private Integer suitServerActionId;
+    private Integer actionId;
 
     /**
      * 适配器信息
@@ -80,15 +82,12 @@ public class SuitClientModel {
     public SuitClientModel() {
     }
 
-    public SuitClientModel(BlockSoftSwitchEnumUtil.REQUEST_SOURCE source, BsSuitCaseModel suitCaseModel) {
-        new SuitClientModel(source.getValue(),suitCaseModel);
-    }
-
     public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) {
         this.requestSource = requestSource;
 
         this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId();
-        this.suitServerActionId = suitCaseModel.getBsSuitCase().getSuitServerActionId();
+        this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId();
+        this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode();
         this.suitCaseModel = suitCaseModel;
 
         // 设置默认

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
@@ -14,11 +15,12 @@ import java.util.Map;
  * @Modify:
  **/
 @Data
-@XStreamAlias("model")
+@XStreamAlias("server")
 public class SuitServerModel {
 
     // 执行方法命令
-    private String action;
+    @ApiParam(value = "适配命令(枚举)")
+    private Integer actionId;
     /* 认证使用 以后使用 */
     private String token;
     // 传输单对象
@@ -30,4 +32,13 @@ public class SuitServerModel {
     // 传输 JSON 数据
     private String json;
 
+    /**
+     * 适配结果信息
+     */
+    private String suitMessage;
+    /**
+     * 适配状态码
+     */
+    private String suitCaseStatusCode;
+
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -76,9 +76,9 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "适配模式(枚举,主动，被动)")
     private Integer suitModeId;
 
-    @Column(name = "SUIT_SERVER_ACTION_ID")
+    @Column(name = "SUIT_ACTION_ID")
     @ApiParam(value = "Server 适配命令")
-    private Integer suitServerActionId;
+    private Integer suitActionId;
 
     @Column(name = "SUIT_CASE_HOST")
     @ApiParam(value = "适配主机")

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

@@ -79,8 +79,8 @@ public class WmsCSOrderMaster extends BaseBean {
     public String year;
 
     @Column(name = "IS_SYNC_ERP")
-    @ApiParam("是否同步ERP: 1=已同步，2=未同步")
+    @ApiParam("是否同步ERP")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_ERP_SYNC_FLAG.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isSyncErp;
 
     @Transient

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

@@ -144,16 +144,21 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam(value = "设备编号")
     public String fixId;
 
-    @Version
+    @Transient
-    @Column(name = "LOCK_VERSION")
+    @ApiParam("获取数量大于0")
-    @ApiParam(value = "乐观锁", example = "1")
+    private Integer qtyIdentity;
-    public  Integer lockVersion;
+
+//    @Version
+//    @Column(name = "LOCK_VERSION")
+//    @ApiParam(value = "乐观锁", example = "1")
+//    public  Integer lockVersion;
 
     public WmsMoveMaster(){};
 
     public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,
                          Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark,
-                         String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser,String fixId) {
+                         String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser,String fixId,
+                         Double sumTranQty) {
         this.orderNo = orderNo;
         this.orderStatus = orderStatus;
         this.remark = remark;
@@ -172,6 +177,7 @@ public class WmsMoveMaster extends BaseBean {
         this.modifyDatetime =modifyDatetime;
         this.modifyUser =modifyUser;
         this.fixId = fixId;
+        this.transQty = sumTranQty;
     }
 
     public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
@@ -200,4 +206,8 @@ public class WmsMoveMaster extends BaseBean {
         this.modifyUser =modifyUser;
         this.modifyDatetime =modifyDatetime;
     }
+
+    public Double getTransQty(){
+        return this.transQty == null ? 0 : this.transQty.doubleValue();
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.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;
@@ -56,6 +58,7 @@ public class WmsTaskInfo extends BaseBean {
      */
     @Column(name = "TASK_STATUS")
     @ApiParam(value = "任务状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TASK_INFO_STATUS.class,refForeignKey = "value",value = "description")
     public Integer taskStatus;
 
     @Column(name = "TRANS_TYPE_CODE")
@@ -68,10 +71,12 @@ public class WmsTaskInfo extends BaseBean {
 
     @Column(name = "IS_ONE_STEP")
     @ApiParam("是否一步法操作")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isOneStep;
 
     @ApiParam("作业类型名称")
     @Transient
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OP_TYPE_CODE.class,refForeignKey = "value",value = "description")
     public String opTypeName;
 
     @ApiParam("作业任务明细")
@@ -80,6 +85,7 @@ public class WmsTaskInfo extends BaseBean {
 
     @Column(name = "IS_CHECK_SN")
     @ApiParam("是否校验条码")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isCheckSn;
 
     @Transient