From caafb9c31709caf8faca1c37bf4adeed7522ba46 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 24 Mar 2021 11:39:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E7=A8=8B=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 4 ++ .../estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 65 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 5 ++ .../estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 14 +++++ .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 12 ++++ .../estsh/i3plus/pojo/aps/bean/SerialNumber.java | 31 ++++++++++- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 14 +++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 5 -- .../cn/estsh/i3plus/pojo/aps/bean/WorkShop.java | 40 +++++++++++++ .../i3plus/pojo/aps/holders/EOrderFeedback.java | 5 ++ .../estsh/i3plus/pojo/aps/holders/EResource.java | 1 + .../i3plus/pojo/aps/holders/EStandOperation.java | 1 + .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 2 +- .../aps/repository/IOrderFeedbackRepository.java | 9 +++ .../pojo/aps/repository/WorkShopRepository.java | 9 +++ .../src/main/resources/relations/OrderFeedback.xml | 5 ++ .../src/main/resources/relations/PlanFeedback.xml | 3 - .../src/main/resources/relations/Resource.xml | 2 + .../main/resources/relations/StandOperation.xml | 2 + .../src/main/resources/relations/Work.xml | 2 +- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 54 ++++++++++++++++++ 22 files changed, 274 insertions(+), 15 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IOrderFeedbackRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkShopRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/OrderFeedback.xml delete mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index cdd1b76..37ebda8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -30,6 +30,10 @@ public class HeuristicRule extends BaseRule { @ApiParam(value ="工作筛选") private String workFilter; + @Column(name="RES_FILTER") + @ApiParam(value ="资源筛选") + private String resFilter; + @Lob @Column(name="WORK_SORT") @ApiParam(value ="工作排序") 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 new file mode 100644 index 0000000..105a426 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EOrderFeedback; +import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback; +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 : 2020-03-19 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_ORDER_FEEDBACK") +@Api("订单反馈") +public class OrderFeedback extends BaseAPS { + private static final long serialVersionUID = 7822380202121225936L; + + @Column(name="ORDER_ID") + @ApiParam(value ="订单") + @FieldAnnotation(property = false) + private Long orderId; + + @Column(name="DELIVER_RATE") + @ApiParam(value ="发货百分比") + private transient Double deliverRate; + + @Column(name="QUALIFIED_RATE") + @ApiParam(value ="成品合格百分比") + private Double qualifiedRate; + + @Column(name="INVENTORY_COUNT") + @ApiParam(value ="库存扣减数量") + private Double inventoryCount; + + @Column(name="UNQUALIFIED_COUNT") + @ApiParam(value ="不良数量") + private Double unqualifiedCount; + + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="合格数量") + private Double qualifiedCount; + + public BaseOrder getOrder() { + return BeanRelation.get(this, EOrderFeedback.Order); + } + + public void setOrder(BaseOrder order) { + this.orderId = order != null ? order.getId() : 0l; + BeanRelation.set(this, EOrderFeedback.Order, order); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index 6fbd9d1..e5ade8e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -37,6 +37,11 @@ public class ParentWork extends BaseAPS { @ApiParam(value ="数量") private Double count; + @Column(name="SERIAL_NUMBER") + @ApiParam(value ="拆分工作流水号") + @FieldAnnotation(property = false) + private Integer serialNumber = 0; + @Column(name="PRODUCT_ORDER_ID") @ApiParam(value ="订单") @FieldAnnotation(property = false) 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 8855d00..5ed25cd 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; 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.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,11 +29,24 @@ import javax.persistence.Table; public class PlanFeedback extends BaseAPS { private static final long serialVersionUID = 2520555825093741381L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(property = false) private Long workId; + @Column(name="STATUS") + @ApiParam(value ="状态") + private ApsEnumUtil.FEED_BACK_STATUS status; + + @Column(name="ACTUAL_COUNT") + @ApiParam(value ="实际完成数量") + private Double actualCount; + + @Column(name="REMARK") + @ApiParam(value ="备注") + private String remark; + public Work getWork() { return BeanRelation.get(this, EPlanFeedback.Work); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 4493b0e..c54dc54 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -60,6 +60,11 @@ public class Resource extends BaseAPS { @FieldAnnotation(defaultValue = "1.0", notEmpty = true) private Double efficiency; + @Column(name="WORK_SHOP_ID") + @ApiParam(value ="车间代码") + @FieldAnnotation(relation = "WorkShop") + private Long workShopId; + @Column(name="PREV_BUFFER") @ApiParam(value ="前缓冲时间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -122,6 +127,13 @@ public class Resource extends BaseAPS { @Transient private boolean hasConflict; + public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); } + + public void setWorkShop(WorkShop workShop) { + this.workShopId = workShop != null ? workShop.getId() : 0l; + BeanRelation.set(this, EResource.WorkShop, workShop); + } + @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java index 6d0f976..bf0944d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.Date; /** * @Description :流水号，补充生产订单和采购订单时自动生成编码 @@ -27,7 +28,31 @@ import javax.persistence.Table; public class SerialNumber extends BaseAPS { private static final long serialVersionUID = 312483211086701109L; - @Column(name="NUMBER") - @ApiParam(value ="流水号") - private Integer number; + @Column(name="S_NUMBER") + @ApiParam(value ="销售订单流水号") + private Integer sNumber = 0; + + @Column(name="M_NUMBER") + @ApiParam(value ="生产订单流水号") + private Integer mNumber = 0; + + @Column(name="P_NUMBER") + @ApiParam(value ="采购订单流水号") + private Integer pNumber = 0; + + @Column(name="W_NUMBER") + @ApiParam(value ="库存订单流水号") + private Integer wNumber = 0; + + @Column(name="Q_NUMBER") + @ApiParam(value ="安全库存订单流水号") + private Integer qNumber = 0; + + @Column(name="H_NUMBER") + @ApiParam(value ="插单流水号") + private Integer hNumber = 0; + + @Column(name="LAST_DATE") + @ApiParam(value ="最后生成日期") + private Date lastDate; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 220aac2..41b5d04 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -3,6 +3,8 @@ 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.EStandOperation; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; @@ -65,4 +67,16 @@ public class StandOperation extends BaseAPS { @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") private ApsEnumUtil.RES_COMB_TIME_TYPE combType; + + @Column(name="WORK_SHOP_ID") + @ApiParam(value ="车间代码") + @FieldAnnotation(relation = "WorkShop") + private Long workShopId; + + public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); } + + public void setWorkShop(WorkShop workShop) { + this.workShopId = workShop != null ? workShop.getId() : 0l; + BeanRelation.set(this, EStandOperation.WorkShop, workShop); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index afda122..fc2f1fe 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -217,8 +217,8 @@ public class Work extends BaseAPS { } @JsonBackReference - public List getPlanFeedbacks() { - return BeanRelation.list(this, EWork.PlanFeedbacks); + public PlanFeedback getPlanFeedback() { + return BeanRelation.get(this, EWork.PlanFeedback); } public WorkPlan getMainPlan() { return BeanRelation.get(this, EWork.MainPlan); } 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 8c15fbd..bf6f33f 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 @@ -99,11 +99,6 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer postSetTime; - @Column(name="FORCE_POST_SET_ZERO") - @ApiParam(value ="是否将后设置时间强制设置成0") - @FieldAnnotation(property = false) - private Boolean forcePostSetZero; - @Column(name="WORK_RESOURCE_ID") @ApiParam(value ="工作资源对象id") @FieldAnnotation(property = false) 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 new file mode 100644 index 0000000..377522b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java @@ -0,0 +1,40 @@ +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-03-22 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_WORK_SHOP") +@Api("车间") +public class WorkShop extends BaseAPS { + private static final long serialVersionUID = 5627016086816721284L; + + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) + private String name; + + +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java new file mode 100644 index 0000000..5719df5 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EOrderFeedback { + Order +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index c72c61e..ded90db 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResource { + WorkShop, WorkPlans } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java index 08ae7b4..6e9ac1b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java @@ -1,4 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EStandOperation { + WorkShop } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index c9befe8..b9f6294 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -9,7 +9,7 @@ public enum EWork { PrevRelations, // 前关联 PostRelations, // 后关联 Operation, // 工序 - PlanFeedbacks, // 工作计划反馈 + PlanFeedback, // 工作计划反馈 MainPlan, // 关联的为主资源的计划 WorkPlans, // 关联的工作计划 SpecifyResource, // 指定资源 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IOrderFeedbackRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IOrderFeedbackRepository.java new file mode 100644 index 0000000..9382b9b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IOrderFeedbackRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.OrderFeedback; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface IOrderFeedbackRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkShopRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkShopRepository.java new file mode 100644 index 0000000..4c8b98d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/WorkShopRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.WorkShop; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface WorkShopRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OrderFeedback.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OrderFeedback.xml new file mode 100644 index 0000000..1ff56e1 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OrderFeedback.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml deleted file mode 100644 index c0988ef..0000000 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml index c2123bc..889e6c8 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml @@ -1,5 +1,7 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml index ead1a31..538cede 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml @@ -1,3 +1,5 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 5c26770..2942714 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -16,7 +16,7 @@ - + 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 e4bf9f7..87cc0a6 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 @@ -1174,4 +1174,58 @@ public class ApsEnumUtil { return description; } } + + /** + * 插单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FEED_BACK_STATUS { + UNCOMMIT("UNCOMMIT", "未提交"), + COMMIT("COMMIT", "提交"); + + private String value; + private String description; + + FEED_BACK_STATUS(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) + public enum APS_ORDER_TYPE { + SALES_ORDER("S", "销售订单"), + PRODUCT_ORDER("M", "生产订单"), + PURCHASE_ORDER("P", "采购订单"), + INVENTORY("W", "库存订单"), + SAFE_STOCK_ORDER("Q", "安全库存订单"), + INSERTED_ORDER("H", "插单"); + + private String value; + private String description; + + APS_ORDER_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } }