From 351e542fd9cf676a5ecb16d83765518cc264da43 Mon Sep 17 00:00:00 2001 From: gsz Date: Fri, 22 Oct 2021 11:09:00 +0800 Subject: [PATCH 01/11] =?UTF-8?q?18062=2020065-=E6=96=B0=E5=A2=9E=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=A1=B6=E5=B1=82=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E8=BE=93=E5=85=A5=E5=92=8C=E8=BE=93=E5=87=BA=E6=83=85?= =?UTF-8?q?=E5=86=B5-20211019?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/model/OrderFinishStatusModel.java | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java new file mode 100644 index 0000000..44919e9 --- /dev/null +++ b/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; + + +} From 72673bfa121bbe0bf2afa400334b015a6710da5b Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 3 Nov 2021 17:33:59 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E5=85=B3=E8=81=94model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/SysRefUserRoleModel.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java new file mode 100644 index 0000000..a502375 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; +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 SysRefUserRoleModel implements Serializable { + private SysRefUserRole sysRefUserRole; + private SysUser sysUser; +} From 5b5e00eee7a277e40fd95bcee79b2932b7832139 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 4 Nov 2021 10:50:33 +0800 Subject: [PATCH 03/11] =?UTF-8?q?model=20core=20=E5=A2=9E=E5=8A=A0SysRoleM?= =?UTF-8?q?odel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/{SysRefUserRoleModel.java => SysRoleModel.java} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/{SysRefUserRoleModel.java => SysRoleModel.java} (68%) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java similarity index 68% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java index a502375..1a033dd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRefUserRoleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java @@ -1,6 +1,8 @@ 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; @@ -17,7 +19,7 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @Api("用户角色关联model") -public class SysRefUserRoleModel implements Serializable { - private SysRefUserRole sysRefUserRole; - private SysUser sysUser; +public class SysRoleModel implements Serializable { + private SysRole sysRole; + private Pager pager; } From 5a73e89e97ffaf91dd9514b68d49c6d98bf97a58 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 5 Nov 2021 09:34:40 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 0e17bda..2a5a224 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index c178867..6b5b511 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -49,6 +49,10 @@ 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") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index c42834e..db66293 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/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") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 8d8922d..1aedf34 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/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") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 81bdc50..97395f8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/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) { From 365c9e927e6fb10dc829d33cffe85a18cae11a9e Mon Sep 17 00:00:00 2001 From: gsz Date: Fri, 5 Nov 2021 13:58:53 +0800 Subject: [PATCH 05/11] =?UTF-8?q?17789=2020065-=E6=8E=92=E7=A8=8B=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=94=99=E8=AF=AF=E9=9C=80=E8=A6=81=E5=9C=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8A=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?-20211009?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java index f40114a..3e9821b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java +++ b/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; } From 7b9a91fd0f133de7191a356c5e90ae349a17f464 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 10 Nov 2021 11:04:43 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E3=80=9018541=2021062+=E7=9B=98=E7=82=B9?= =?UTF-8?q?=20=E7=9B=98=E7=82=B9=E5=8D=95=E5=86=BB=E7=BB=93=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=BC=BA=E4=B8=80=E4=B8=AA=E6=89=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=9C=80=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?+1110=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 1552eba..367b73a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -124,6 +126,11 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("收货批次") public String lotNo = ""; + @Column(name = "package_no") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + @Transient @ApiParam(value = "实盘数量", example = "1") @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 1a810a4..a391528 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1481,6 +1481,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringLikeEqualPack(wmsCSOrderDetails.getPackageNo(), "packageNo", result); DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result); DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); @@ -1507,6 +1508,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result); DdlPreparedPack.getInPackArray(wmsCSFactTrans.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result); + DdlPreparedPack.getStringLikeEqualPack(wmsCSFactTrans.getPackageNo(), "packageNo", result); getStringBuilderPack(wmsCSFactTrans, result); From c8ce17363ba67938ab637dddeb6551b5b138df41 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 10 Nov 2021 20:44:42 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 2 -- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index 6b5b511..7bcc351 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -58,6 +58,10 @@ public class ImportField extends BaseAPS { @FieldAnnotation(defaultValue = "255") private Integer maxLength; + @Column(name="ADD_VALUE") + @ApiParam(value = "累加数值", example = "0") + private Boolean addValue; + @Column(name="VALIDATOR") @ApiParam("校验表达式") private String validator; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index db66293..32fa28f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -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() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 9892f7c..7da5a30 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/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; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 2d26e1d..de346ba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/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 customFields = new HashMap<>(); @ApiParam(value ="主键值") - @FieldAnnotation(display = false, modify = false) + @FieldAnnotation(display = false) @Transient private String key; From 0400305d9126e38f641fb9e8e95be312dc440a51 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 11 Nov 2021 13:32:20 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0aps-2=E7=9A=84=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 9517965..ed94d5e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/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, 141000000L, "i3aps-2", "高级计划与排产-2"), SURFACE(98, 0, 0, 0, "i3surface", "对外服务"), /** From fc9ef265f91b2a29298a64996dab823ef9c1a1f9 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 11 Nov 2021 14:04:35 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9aps-2=E7=9A=84menurooti?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index ed94d5e..1ae7366 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -64,7 +64,7 @@ public class CommonEnumUtil { * 计划排产服务 */ APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"), - APS_2(18, 18400, 25, 141000000L, "i3aps-2", "高级计划与排产-2"), + APS_2(18, 18400, 25, 180000000L, "i3aps-2", "高级计划与排产-2"), SURFACE(98, 0, 0, 0, "i3surface", "对外服务"), /** From 5056f30f45ea385fe56e0c18e3ba9dc2d6e51301 Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Mon, 15 Nov 2021 10:32:59 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=A0=B8=E5=BF=83=E5=8C=85mes=E6=95=A3?= =?UTF-8?q?=E4=BB=B6=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AEBOM=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java index d8fb95d..bbb096a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java +++ b/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.Entity; -import javax.persistence.Table; +import javax.persistence.*; 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; From 4625987eefb249c5066b0522c012897153b77e1a Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Mon, 15 Nov 2021 17:35:31 +0800 Subject: [PATCH 11/11] =?UTF-8?q?Mes=E6=95=A3=E4=BB=B6BOM=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java index bbb096a..2d9edbd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java @@ -92,4 +92,5 @@ public class MesScatterBomCfg extends BaseBean implements Serializable { @Column(name = "CHANGE_NO") @ApiParam("change No") private String changeNo; + }