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

modules/i3plus-pojo-aps/pom.xml

@@ -11,6 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>i3plus-pojo-aps</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>

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

@@ -2,9 +2,12 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+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.EBaseOrder;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -29,7 +32,17 @@ import java.util.List;
 @MappedSuperclass
 @Api("订单基类")
 @ExcludeImportExport
-public class BaseOrder extends BaseCode {
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+public class BaseOrder extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
 
     @Column(name="MATERIAL_ID")
     @ApiParam(value ="物料")

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
-import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -24,7 +26,18 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_DAY_SHIFT")
 @Api("班次")
-public class DayShift extends BaseCode {
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+public class DayShift extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
+
     @Column(name="WORK_TIMES")
     @ApiParam(value ="工作时间")
     @FieldAnnotation(notEmpty = true)

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -34,7 +34,17 @@ import java.sql.JDBCType;
 @Table(name="APS_FIELD_INFO")
 @Api("字段信息")
 @ExcludeImportExport
-public class FieldInfo extends BaseCode {
+public class FieldInfo extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
+
     @Column(name="CLASS_NAME")
     @ApiParam(value ="所属类简称")
     private String className;

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

@@ -1,10 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
-import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EMaterial;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
@@ -29,7 +32,18 @@ import java.util.List;
 @Entity
 @Table(name = "APS_MATERIAL")
 @Api("物料")
-public class Material extends BaseCode {
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+public class Material extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
+
     @Column(name="TYPE")
     @ApiParam(value ="物料类型")
     @FieldAnnotation(defaultValue = "PRODUCT")

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

@@ -1,9 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+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.EProductRouting;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -28,7 +31,18 @@ import java.util.List;
 @Entity
 @Table(name = "APS_PRODUCT_ROUTING")
 @Api("工艺路线")
-public class ProductRouting extends BaseCode {
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+public class ProductRouting extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
+
     @Column(name="MATERIAL_ID")
     @ApiParam(value ="物料")
     @FieldAnnotation(relation = "Material", notEmpty = true, display = false)

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

@@ -1,9 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+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.EResource;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
@@ -28,7 +31,18 @@ import java.util.List;
 @Entity
 @Table(name = "APS_RESOURCE")
 @Api("资源")
-public class Resource extends BaseCode {
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+public class Resource extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
+
     @Column(name="TYPE")
     @ApiParam(value ="资源类型")
     @FieldAnnotation(defaultValue = "MAIN")

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

@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.aps.common.BaseCode;
+import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -24,7 +27,17 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_STAND_OPERATION")
 @Api("标准工序")
-public class StandOperation extends BaseCode {
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+public class StandOperation extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
 
     @Column(name="DIRECTION")
     @ApiParam(value ="排程方向")

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

@@ -1,10 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
-import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWork;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
@@ -30,6 +32,7 @@ import java.util.List;
 @Entity
 @Table(name = "APS_WORK")
 @Api("工作")
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class Work extends BaseAPS {
     @Column(name="CODE")
     @ApiParam(value ="编码")

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

@@ -1,36 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.common;
-
-import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
-import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
-import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
-
-/**
- * @Description :含有编码，名字的基类
- * @Reference :
- * @Author : jason.niu
- * @CreateDate : 2019-09-12
- * @Modify:
- **/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@MappedSuperclass
-@MainKey(groups = {InsertGroup.class})
-@ExcludeImportExport
-public abstract class BaseCode extends BaseAPS {
-    @Column(name="CODE")
-    @ApiParam(value ="编码")
-    @FieldAnnotation(popSearch = true, mainkey = true)
-    private String code;
-
-    @Column(name="NAME")
-    @ApiParam(value ="名称")
-    @FieldAnnotation(popSearch = true)
-    private String name;
-}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.common;
 
+import cn.estsh.i3plus.pojo.aps.validator.IMainKeyValidatorImpl;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 
@@ -177,6 +178,7 @@ public class BeanInfo {
 
     private static Map<Class<? extends BaseBean>, BeanInfo> beanInfos = new HashMap<>();
     private static Map<String, BeanInfo> nameMapBeanInfos = new HashMap<>();
+    private static IMainKeyValidatorImpl mainKeyValidator;
 
     static {
         BeanInfo beanInfo = new BeanInfo(BaseBean.class);
@@ -306,4 +308,8 @@ public class BeanInfo {
 
         return cls;
     }
+
+    public static IMainKeyValidatorImpl getMainKeyValidator() { return mainKeyValidator; }
+
+    public static void setMainKeyValidator(IMainKeyValidatorImpl impl) { mainKeyValidator = impl; }
 }

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

@@ -21,5 +21,4 @@ public class GanttCalendarModel {
     //private String timeRangeColor;
     private String eventColor;
     private String name;
-    private Long workId;
 }

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

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+@Data
+public class GanttDragModel {
+    private Long workId;
+    private Long resId;
+    private Long targetWorkId;
+}

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

@@ -20,7 +20,7 @@ import java.util.List;
  **/
 @Data
 @Api("甘特图分页查询参数")
-public class GanttEventModel {
+public class GanttEventRequest {
     private Long[] resourceIds;
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class GanttPlanModel {
+    private Long resourceId;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date startDate;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date endDate;
+    private String cls;
+    //private String timeRangeColor;
+    private String eventColor;
+    private String name;
+    private Long workId;
+    private List<Long> resIds;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/IMainKeyValidatorImpl.java

@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.aps.validator;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+
+public interface IMainKeyValidatorImpl {
+    boolean isValid(BaseBean bean);
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.validator;
 
 import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
+import cn.estsh.i3plus.pojo.aps.common.BeanInfo;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 
 import javax.validation.ConstraintValidator;
@@ -9,6 +10,6 @@ import javax.validation.ConstraintValidatorContext;
 public class MainKeyValidator implements ConstraintValidator<MainKey, BaseBean> {
     @Override
     public boolean isValid(BaseBean bean, ConstraintValidatorContext constraintValidatorContext) {
-        return true;
+        return BeanInfo.getMainKeyValidator().isValid(bean);
     }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/UpdateGroup.java

@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.aps.validator;
+
+public interface UpdateGroup {
+}

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

@@ -15,7 +15,8 @@ import java.util.List;
 @Data
 public class WmsJobParamModel implements Serializable {
     private static final long serialVersionUID = 5784492509251527816L;
-    private String organizeCode;
+    private String organizeCode;//工厂代码
-    private List<String> zonesNoList;
+    private List<String> zonesNoList;//存储区编号
-    private Integer snType;
+    private Integer snType;//条码类型（虚拟，实物）
+    private String devOpsEmail;//运维人员邮箱
 }

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

@@ -210,6 +210,13 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("优先级")
     private Integer priority;
 
+    @Transient
+    @ApiParam(value = "汇总需求数量", example = "0")
+    public Double sumQty;
+
+    @Transient
+    @ApiParam(value = "汇总拣货数量", example = "0")
+    public Double sumPickQty;
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
@@ -273,7 +280,9 @@ public class WmsDocMovementDetails extends BaseBean {
         this.destLocateNo = destLocateNo;
     }
 
-    public WmsDocMovementDetails (String partNo,Integer priority,String orderNo) {
+    public WmsDocMovementDetails (Double sumQty,Double sumPickQty ,String partNo,Integer priority,String orderNo) {
+        this.sumQty = sumQty;
+        this.sumPickQty = sumPickQty;
         this.partNo = partNo;
         this.priority = priority;
         this.orderNo = orderNo;