From 4590133c27efe00fed76b2ed56ed38ed63d4609c Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 8 Apr 2021 18:04:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 13 +++++++++++++ .../estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 22 ++++++++++++++++++---- .../estsh/i3plus/pojo/aps/holders/EMaterial.java | 3 ++- .../src/main/resources/relations/Material.xml | 6 ++++-- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index dcdd0ba..e00c22a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -7,6 +7,7 @@ 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.holders.EMaterial; +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; @@ -157,6 +158,11 @@ public class Material extends BaseAPS { @ApiParam(value ="标签颜色") private String labelColor; + @Column(name="WORK_SHOP_ID") + @ApiParam(value ="车间代码") + @FieldAnnotation(relation = "WorkShop") + private Long workShopId; + public Material getGroup() { return BeanRelation.get(this, EMaterial.Group); } @@ -223,4 +229,11 @@ public class Material extends BaseAPS { public List getProductOrders() { return BeanRelation.listByClass(this, ProductOrder.class, EMaterial.Orders); } + + public WorkShop getWorkShop() { return BeanRelation.get(this, EMaterial.WorkShop); } + + public void setWorkShop(WorkShop workShop) { + this.workShopId = workShop != null ? workShop.getId() : 0l; + BeanRelation.set(this, EMaterial.WorkShop, workShop); + } } 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 105a426..d5533c2 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 @@ -30,13 +30,13 @@ public class OrderFeedback extends BaseAPS { private static final long serialVersionUID = 7822380202121225936L; @Column(name="ORDER_ID") - @ApiParam(value ="订单") - @FieldAnnotation(property = false) + @ApiParam(value ="顶层订单号") + @FieldAnnotation(relation = "Order", modify = false) private Long orderId; @Column(name="DELIVER_RATE") @ApiParam(value ="发货百分比") - private transient Double deliverRate; + private Double deliverRate; @Column(name="QUALIFIED_RATE") @ApiParam(value ="成品合格百分比") @@ -46,14 +46,28 @@ public class OrderFeedback extends BaseAPS { @ApiParam(value ="库存扣减数量") private Double inventoryCount; + @Column(name="LAST_OPERATION_COUNT") + @ApiParam(value ="硫化报工数量") + private Double lastOperationCount; + @Column(name="UNQUALIFIED_COUNT") @ApiParam(value ="不良数量") private Double unqualifiedCount; @Column(name="QUALIFIED_COUNT") - @ApiParam(value ="合格数量") + @ApiParam(value ="成品合格数量") private Double qualifiedCount; + @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() { return BeanRelation.get(this, EOrderFeedback.Order); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index eaa363a..16f5f77 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -9,5 +9,6 @@ public enum EMaterial { WorkInputs, WorkOutputs, WorkRelations, - Orders + Orders, + WorkShop } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml index 33c5974..6ce3798 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -1,7 +1,9 @@ - - + + + + \ No newline at end of file From 33be7da477be55337041d048f156812de2984aaa Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 8 Apr 2021 18:05:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 87cc0a6..c50c528 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1228,4 +1228,29 @@ public class ApsEnumUtil { return description; } } + + /** + * 工序类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SANLUX_OPERATION_TYPE { + NORMAL("NORMAL", "正常工序"), + FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"); + + private String value; + private String description; + + SANLUX_OPERATION_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From 77f66de188d0509688018a0b7e5a13023bd03c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 9 Apr 2021 17:18:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=9014930=2020027-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E7=94=9F=E4=BA=A7=E5=8C=85=E8=A3=85=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=A0=B9=E6=8D=AE=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=8C=85=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?-20210409=E3=80=91=20=E3=80=9014884=2020027--=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=AE=A1=E5=88=92--=E7=BC=96=E8=BE=91=E4=B8=AD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=80=E8=A1=8C=E6=95=B0=E6=8D=AE=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=81=9A=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=96=B0=E3=80=82-2021-04-06=E3=80=91=20?= =?UTF-8?q?=E3=80=9014848=2020027--=E6=8E=A7=E5=88=B6=E8=AE=A1=E5=88=92--?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=AD=E8=BE=93=E5=85=A5=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E6=9D=A1=E4=BB=B6=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=95=88=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E6=98=BE=E7=A4=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C-2021-04-02=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 89307ed..d0ed327 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -207,6 +207,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("工序名称") private String processName; + @Transient + @ApiParam("产品条码") + private String productSn; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java index 4dab68a..d3f4b25 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java @@ -40,6 +40,9 @@ public class MesControlPlanModel { @ApiParam("是否启用") private Integer isEnable; + @ApiParam("是否删除") + private Integer isCutOut; + @ApiParam("质量标准数组") private List standardList; From 736087852e90f601408143008aab40182a0ad184 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 9 Apr 2021 17:28:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 3 +- .../cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 8 +++++ .../estsh/i3plus/pojo/aps/bean/PriorityType.java | 37 ++++++++++++++++++++++ .../aps/repository/PriorityTypeRepository.java | 9 ++++++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 25 +++++++++++++++ 5 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 62943f9..738d2ad 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -8,6 +8,7 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; @@ -97,7 +98,7 @@ public class BaseOrder extends BaseAPS { @Column(name="VALID_ORDER") @ApiParam(value ="有效订单") @FieldAnnotation(modify = false) - private Integer validOrder = CommonEnumUtil.VALID; + private ApsEnumUtil.ORDER_VALID_TYPE validOrder = ApsEnumUtil.ORDER_VALID_TYPE.VALID; @Column(name="DELAY") @ApiParam(value ="是否延期") 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 7f1f95d..cb0d6e4 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 @@ -54,6 +54,14 @@ public class ImportField extends BaseAPS { @FieldAnnotation(defaultValue = "255") private Integer maxLength; + @Column(name="VALIDATOR") + @ApiParam("校验表达式") + private String validator; + + @Column(name="VALIDATOR_MESSAGE") + @ApiParam("校验表达式报错") + private String validatorMessage; + @Column(name="RELATION_TABLE") @ApiParam("关联表名") private String relationTable; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java new file mode 100644 index 0000000..ec04938 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :优先级 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-08 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_PRIORITY_TYPE") +@Api("优先级") +public class PriorityType extends BaseAPS { + private static final long serialVersionUID = 445577901076659576L; + + @Column(name="CODE") + @ApiParam(value ="标识") + @FieldAnnotation(mainkey = true) + private String code; + + @Column(name="VALUE") + @ApiParam(value ="值") + private Integer value; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java new file mode 100644 index 0000000..4fa95d3 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/PriorityTypeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.PriorityType; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface PriorityTypeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index c50c528..dfe9ddf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -81,6 +81,31 @@ public class ApsEnumUtil { } /** + * 物料类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_VALID_TYPE { + VALID("VALID", "有效"), + INVALID("INVALID", "无效"); + + private String value; + private String description; + + ORDER_VALID_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 物料报表统计类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 95dffb65e094710c76f9e6ceea3ded7af22579da Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 12 Apr 2021 11:29:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 14 ++++++++++---- .../java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java | 2 +- .../java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java | 1 + .../src/main/resources/relations/BaseOrder.xml | 2 ++ 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 738d2ad..9a9eb42 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -9,7 +9,6 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -58,10 +57,10 @@ public class BaseOrder extends BaseAPS { @Min(0) private Double count; - @Column(name="PRIORITY") + @Column(name="PRIORITY_ID") @ApiParam(value ="优先级") - @FieldAnnotation(defaultValue = "10") - private Integer priority; + @FieldAnnotation(relation = "Priority") + private Long priorityId; @Column(name="LET") @ApiParam(value ="最晚结束时刻") @@ -128,4 +127,11 @@ public class BaseOrder extends BaseAPS { public List getPostRelations() { return BeanRelation.list(this, EBaseOrder.PostRelations); } + + public PriorityType getPriority() { return BeanRelation.get(this, EBaseOrder.Priority); } + + public void setPriority(PriorityType priority) { + this.priorityId = priority != null ? priority.getId() : 0; + BeanRelation.set(this, EBaseOrder.Priority, priority); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java index ec04938..f9e9ffa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java @@ -28,10 +28,11 @@ public class PriorityType extends BaseAPS { @Column(name="CODE") @ApiParam(value ="标识") - @FieldAnnotation(mainkey = true) + @FieldAnnotation(mainkey = true, popSearch = true) private String code; @Column(name="VALUE") @ApiParam(value ="值") + @FieldAnnotation(notEmpty = true, popSearch = true) private Integer value; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java index 377522b..273641d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java @@ -33,7 +33,7 @@ public class WorkShop extends BaseAPS { @Column(name="NAME") @ApiParam(value ="名称") - @FieldAnnotation(popSearch = true) + @FieldAnnotation(popSearch = true, notEmpty = true) private String name; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java index 28e4b51..d6720fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java @@ -5,4 +5,5 @@ public enum EBaseOrder { Material, PrevRelations, PostRelations, + Priority, } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml index e1e512a..75f82e5 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml @@ -8,4 +8,6 @@ + + \ No newline at end of file From 39b716d2a1356ef3a5e9ab1507ecc725c3829fea Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 12 Apr 2021 14:47:32 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index 14fbae8..19ed55a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -63,7 +63,7 @@ public class WmsPrintingQueue extends BaseBean{ public WmsPrintingQueue() { } - public WmsPrintingQueue(Long id) { - this.id = id; + public WmsPrintingQueue(String printIdentification) { + this.printIdentification = printIdentification; } } \ No newline at end of file