diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 52bc4f7..a1712da 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -19,7 +19,7 @@ import java.util.Date; @Data @Entity @Table(name = "APS_PRODUCT_ORDER") -@Api("计划反馈") +@Api("生产订单") public class ProductOrder extends BaseOrder { @Column(name="EST") @ApiParam(value ="最早开始时间") 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 new file mode 100644 index 0000000..e4c5238 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EBaseOrder { + Works, + Material, + PrevRelations, + PostRelations, + UpperOrders, + LowerOrders +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java new file mode 100644 index 0000000..e1142a0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EDayShift { + ResCalendar +} 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 new file mode 100644 index 0000000..d24c26a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EMaterial { + ProductRouting, + OperInputs, + OperOutputs, + WorkInputs, + WorkOutputs, + WorkRelations, + Orders +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java new file mode 100644 index 0000000..4ee6467 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EOperInput { + Operation, + Material, + WorkInputs +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java new file mode 100644 index 0000000..898f576 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EOperOutput { + Operation, + Material, + WorkOutputs +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java new file mode 100644 index 0000000..36345e9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EOperResource { + Operation, + Resource, + WorkResources +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java new file mode 100644 index 0000000..42f06cc --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EOperation { + ProductRouting, + OperInputs, + OperOutputs, + OperResources, + StandOperation, + Works +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java new file mode 100644 index 0000000..5ce71a5 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EPlanFeedback { + Work +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java new file mode 100644 index 0000000..9ad0f8a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EProductOrder { + ProductRouting +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java new file mode 100644 index 0000000..9fe315f --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EProductRouting { + Material, + Operations, + ProductOrders +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java new file mode 100644 index 0000000..c8e2201 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java @@ -0,0 +1,6 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EResCalendar { + DayShifts, + Resources, +} 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 new file mode 100644 index 0000000..8064356 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -0,0 +1,6 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EResource { + OperResources, + WorkResources +} 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 new file mode 100644 index 0000000..200b2a1 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EStandOperation { + Operations +} 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 new file mode 100644 index 0000000..330d898 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EWork { + Order, + WorkResources, + WorkInputs, + WorkOutputs, + WorkRelationInputs, + WorkRelationOutputs, + Operation, + PlanFeedback +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java new file mode 100644 index 0000000..ddfbd3a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EWorkInput { + Work, + WorkRelations, + Material, + OperInput +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java new file mode 100644 index 0000000..e2f1de2 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EWorkOutput { + Work, + WorkRelations, + Material, + OperOutput +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java new file mode 100644 index 0000000..cdfc8ab --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EWorkRelation { + WorkInput, + WorkOutput, + PrevWork, + PostWork, + PrevOrder, + PostOrder, + Material +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java new file mode 100644 index 0000000..2f77bcc --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EWorkResource { + Work, + Resource, + OperResource +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml new file mode 100644 index 0000000..65c1fe1 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/DayShift.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/DayShift.xml new file mode 100644 index 0000000..7182232 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/DayShift.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml new file mode 100644 index 0000000..f5a2928 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml new file mode 100644 index 0000000..e2d484c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml new file mode 100644 index 0000000..5a7f843 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperResource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperResource.xml new file mode 100644 index 0000000..27afb26 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperResource.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Operation.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Operation.xml new file mode 100644 index 0000000..8b21555 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Operation.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ 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 new file mode 100644 index 0000000..c0988ef --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml new file mode 100644 index 0000000..40fa8d7 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ProductRouting.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductRouting.xml new file mode 100644 index 0000000..44b1ebf --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductRouting.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml new file mode 100644 index 0000000..30dc59a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml @@ -0,0 +1,7 @@ + + + + + + + \ 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 new file mode 100644 index 0000000..81c9f49 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml @@ -0,0 +1,3 @@ + + + \ 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 new file mode 100644 index 0000000..5c82b55 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml @@ -0,0 +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 new file mode 100644 index 0000000..1bb7816 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml new file mode 100644 index 0000000..c1f7586 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkOutput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkOutput.xml new file mode 100644 index 0000000..d7777f8 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkOutput.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkRelation.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkRelation.xml new file mode 100644 index 0000000..613c415 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkRelation.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml new file mode 100644 index 0000000..28b6264 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file