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

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :订单基类
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class BaseOrder extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :规则基类
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class BaseRule extends BaseAPS {
 }

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

@@ -1,4 +0,0 @@
-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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :取消计划规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class CancelPlanRule extends BaseRule {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :班次
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class DayShift extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :字段赋值规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class FieldSetRule extends BaseRule {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :排程运算规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class HeuristicRule extends BaseRule {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :库存
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class Inventory extends BaseOrder {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :物料运算规则
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class MatCalcRule extends BaseRule {
 }

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

@@ -10,6 +10,13 @@ import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Table;
 
+/**
+ * @Description :物料
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 @Data
 @MappedSuperclass
 @Table(name = "MATERIAL")

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工序输入
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class OperInput extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工序输出
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class OperOutput extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工序资源
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class OperResource extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工序
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class Operation extends BaseAPS {
 }

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

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+/**
+ * @Description :加班日历
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public class OvertimeCalendar extends BaseAPS {
+}

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :计划反馈
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class PlanFeedback extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :生产订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class ProductOrder extends BaseOrder {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工艺路线
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class ProductRouting extends BaseCode {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :采购订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class PurchaseOrder extends BaseOrder {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :日历
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class ResCalendar extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :资源
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class Resource extends BaseCode {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :规则组合
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class RuleGroup extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :销售订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class SalesOrder extends BaseOrder {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description : 标准工序
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class StandOperation extends BaseCode {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :系统参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class SysParam extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工作
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class Work extends BaseCode {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工作输入
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class WorkInput extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工作输出
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class WorkOutput extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工作关联
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class WorkRelation extends BaseAPS {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+/**
+ * @Description :工作资源
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
 public class WorkResource extends BaseAPS {
 }

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

@@ -2,19 +2,19 @@ package cn.estsh.i3plus.pojo.aps.enums;
 
 public enum FIELD_TYPE {
     NONE,
-    BOOLEAN,
+    BOOLEAN,    // 布尔
-    CHAR,
+    CHAR,       // 字符
-    SHORT,
+    SHORT,      // 短整型
-    INTEGER,
+    INTEGER,    // 整型
-    LONG,
+    LONG,       // 长整型
-    DOUBLE,
+    DOUBLE,     // 浮点型
-    DATE,
+    DATE,       // 日期类型(2019-09-16)
-    TIME,
+    TIME,       // 时间类型(17:35:30)
-    DATETIME,
+    DATETIME,   // 日期时间类型(2019-09-16 17:35:30)
-    DURATION,
+    DURATION,   // 时间段(1H)
-    ENUM,
+    ENUM,       // 枚举
-    MULTIENUM,
+    MULTIENUM,  // 多选枚举
-    STRING,
+    STRING,     // 字符串
-    OBJECT,
+    OBJECT,     // 关联对象，下来选择关联对象的Code值
-    LIST
+    LIST        // 对象集合，不可编辑。
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+@Data
+public class EnumModel {
+    private String code;
+    private String name;
+}

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

@@ -43,7 +43,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer asnStatus;
 
     @Column(name = "VENDOR_NO")
@@ -68,7 +68,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isTask;
 
     @ApiParam("ASN详情列表")
@@ -169,18 +169,19 @@ public class WmsASNMaster extends BaseBean {
 
     @Transient
     @ApiParam("收货状态")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class, refForeignKey = "value", value = "description")
     private String recStatus;
 
     @Transient
     @ApiParam("项目")
     private String prodCfgTypeCode;
 
-    public  WmsASNMaster(){}
+    public WmsASNMaster() {
+    }
 
-    public  WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNameRdd,
+    public WmsASNMaster(String orderNo, Integer asnStatus, String vendorNo, String partNo, String partNameRdd,
-                                       Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType,
+                        Double sumQty, Double sumRecQty, String planDate, String planTime, Double diffQty, String orderType,
-                                       String recStatus){
+                        String recStatus) {
 
         this.orderNo = orderNo;
         this.asnStatus = asnStatus;
@@ -196,5 +197,7 @@ public class WmsASNMaster extends BaseBean {
         this.recStatus = recStatus;
     }
 
-
+    public int getAsnStatusVal() {
+        return this.asnStatus == null ? 0 : this.asnStatus;
+    }
 }

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

@@ -45,7 +45,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "MOVE_TYPE")
     @ApiParam("移动类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description")
     public Integer moveType;
     /**
      * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
@@ -54,7 +54,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "BUSI_TYPE")
     @ApiParam("业务类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     public Integer busiType;
 
     /**
@@ -63,7 +63,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer orderStatus;
 
     @Column(name = "CUST_NO")
@@ -95,7 +95,7 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isTask;
 
     @Column(name = "PRIORITY")
@@ -123,7 +123,7 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "IS_PART")
     @ApiParam(value = "是否散件", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer isPart;
 
     @Column(name = "SRC_WH_NO")
@@ -162,7 +162,7 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("类型名称")
     public String busiTypeName;
 
-//    public Integer getIsSn() {
+    public int getOrderStatusVal() {
-////        return isSn == null ? 0 : this.getIsSn();
+        return this.orderStatus == null ? 0 : this.orderStatus;
-////    }
+    }
 }

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

@@ -210,4 +210,7 @@ public class WmsMoveMaster extends BaseBean {
     public Double getTransQty(){
         return this.transQty == null ? 0 : this.transQty.doubleValue();
     }
+    public int getBusiTypeCodeVal(){
+        return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue();
+    }
 }

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

@@ -140,4 +140,8 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     @ApiParam("前端信息")
     private String message;
+
+    public int getPoStatusVal() {
+        return this.poStatus == null ? 0 : this.poStatus;
+    }
 }

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

@@ -42,7 +42,7 @@ public class WmsQCMaster extends BaseBean {
      */
     @Column(name = "ORDER_TYPE")
     @ApiParam(value = "业务类型", example = "0")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description")
     public Integer orderType;
 
     /**
@@ -50,7 +50,7 @@ public class WmsQCMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer orderStatus;
 
     @Column(name = "REMARK")
@@ -87,11 +87,15 @@ public class WmsQCMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isTask;
 
-    @Column(name="IS_PART")
+    @Column(name = "IS_PART")
     @ApiParam(value = "是否散件", example = "2")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isPart;
+
+    public int getOrderStatusVal() {
+        return this.orderStatus == null ? 0 : this.orderStatus;
+    }
 }