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

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

@@ -116,6 +116,10 @@ public class ImportDetail extends BaseAPS {
     @ApiParam(value ="外部对象筛选")
     private String outterFilter;
 
+    @Column(name="UPDATE_SQL")
+    @ApiParam(value ="更新外部数据")
+    private String updateSQL;
+
     @FieldAnnotation(property = false)
     private transient ImportDataModel model;
 

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

@@ -49,11 +49,19 @@ public class ImportField extends BaseAPS {
     @ApiParam(value = "是否必填", example = "0")
     private Integer isRequire;
 
+    @Column(name="IGNORE_NOT_VALID")
+    @ApiParam(value = "无效忽略", example = "0")
+    private Boolean ignoreNotValid;
+
     @Column(name="MAX_LENGTH")
     @ApiParam(value = "最大长度", example = "0")
     @FieldAnnotation(defaultValue = "255")
     private Integer maxLength;
 
+    @Column(name="ADD_VALUE")
+    @ApiParam(value = "累加数值", example = "0")
+    private Boolean addValue;
+
     @Column(name="VALIDATOR")
     @ApiParam("校验表达式")
     private String validator;

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

@@ -31,7 +31,7 @@ public class OrderFeedback extends BaseAPS {
 
     @Column(name="ORDER_ID")
     @ApiParam(value ="顶层订单号")
-    @FieldAnnotation(relation = "Order", modify = false)
+    @FieldAnnotation(mainkey = true, relation = "Order")
     private Long orderId;
 
     @Column(name="ORDER_COUNT")
@@ -56,12 +56,10 @@ public class OrderFeedback extends BaseAPS {
 
     @Column(name="ADD_UNQUALIFIED_COUNT")
     @ApiParam(value ="累加不良数量")
-    @FieldAnnotation(display = false)
     private Double addUnqualifiedCount;
 
     @Column(name="ADD_QUALIFIED_COUNT")
     @ApiParam(value ="累加合格数量")
-    @FieldAnnotation(display = false)
     private Double addQualifiedCount;
 
     public BaseOrder getOrder() {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.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.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.EPlanFeedback;
+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;
@@ -26,12 +29,13 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_PLAN_FEEDBACK")
 @Api("工作反馈")
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class PlanFeedback extends BaseAPS {
     private static final long serialVersionUID = 2520555825093741381L;
 
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
-    @FieldAnnotation(property = false)
+    @FieldAnnotation(popSearch = true, mainkey = true, relation = "Work")
     private Long workId;
 
     @Column(name="STATUS")

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

@@ -73,4 +73,8 @@ public class SysParam extends BaseAPS {
     @Column(name="MAX_SPACE_LIMIT_DRAG")
     @ApiParam(value ="间隔时间限制")
     private Boolean maxSpaceLimitDrag = true;
+
+    @Column(name="DEFAULT_FEEDBACK")
+    @ApiParam(value ="自动提交前三道")
+    private Boolean defaultFeedback = true;
 }

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

@@ -136,6 +136,9 @@ public class WorkPlan extends BaseAPS {
     @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse")
     private Date resProduceEnd;
 
+    @ApiParam(value ="调整时间")
+    private Date adjustDate;
+
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 
     public void setWork(Work work) {

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

@@ -33,7 +33,7 @@ public abstract class BaseAPS extends BaseBean {
     private HashMap<String, Object> customFields = new HashMap<>();
 
     @ApiParam(value ="主键值")
-    @FieldAnnotation(display = false, modify = false)
+    @FieldAnnotation(display = false)
     @Transient
     private String key;
 

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+/**
+ * 顶层订单完成情况
+ *
+ * @Description : OrderFinishStatusModel
+ * @Author :gsz
+ * @Date 2021/10/21 10:45
+ * @Modify
+ **/
+@Data
+@Api("顶层订单完成情况报表")
+public class OrderFinishStatusModel extends APSPager {
+    //订单号
+    private String topOrderNo;
+    //订单类型
+    private String orderType;
+    //物料编码
+    private String materialCode;
+    //工厂货品
+    private String materialName;
+    //商标编码
+    private String code;
+    //商标
+    private String logo;
+    //皮带标识编码
+    private String leatherSignId;
+    //皮带标识
+    private String sign;
+    //顶层订单数量
+    private Integer topOrderCount;
+    //库存扣减数量
+    private Integer inventoryBackCount;
+    //生产订单数量
+    private Integer productOrderCount;
+    //参与排程数量
+    private Double inScheduleCount;
+    //已下发数量
+    private Double confirmCount;
+    //已报工数量
+    private Double reportCount;
+    //牵纱排程数量
+    private Double trainbearerScheduleCount;
+    //覆胶排程数量
+    private Double coatingScheduleCount;
+    //包布排程数量
+    private Double wrappingScheduleCount;
+    //硫化排程数量
+    private Double sulfidationScheduleCount;
+
+
+}

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

@@ -35,6 +35,9 @@ public class RuleDetailModel {
     @ApiParam(value ="异常消息")
     private String exception = "";
 
+    @ApiParam(value ="错误信息")
+    private ImportErrorInfo errorInfo;
+
     public void addProcess() {
         this.curProcess += 1;
     }

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

@@ -64,6 +64,7 @@ public class CommonEnumUtil {
          * 计划排产服务
          */
         APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"),
+        APS_2(18, 18400, 25, 180000000L, "i3aps-2", "高级计划与排产-2"),
         SURFACE(98, 0, 0, 0, "i3surface", "对外服务"),
 
         /**

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

@@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
@@ -41,6 +37,10 @@ public class MesScatterBomCfg extends BaseBean implements Serializable {
     @ApiParam("客户零件号")
     private String customerPartNo;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
     @Column(name = "PART_LOCATION1")
     @ApiParam("产品位置1")
     private String partLocation1;
@@ -92,4 +92,5 @@ public class MesScatterBomCfg extends BaseBean implements Serializable {
     @Column(name = "CHANGE_NO")
     @ApiParam("change No")
     private String changeNo;
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
+import cn.estsh.i3plus.pojo.platform.bean.SysRole;
+import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author ns
+ * @create 2021/11/3 0003 下午 17:31
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("用户角色关联model")
+public class SysRoleModel implements Serializable {
+    private SysRole sysRole;
+    private Pager pager;
+}