diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index 21dd6e1..c5eec24 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,6 +19,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_ASSIST_RESOURCE_SET_TIME") @Api("副资源设置时间") 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 dd36fb7..3576592 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,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.MappedSuperclass; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @MappedSuperclass @Api("订单基类") public class BaseOrder extends BaseCode { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index 456ed09..3759481 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -5,6 +5,7 @@ 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.MappedSuperclass; @@ -17,6 +18,7 @@ import javax.persistence.MappedSuperclass; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @MappedSuperclass @Api("规则参数基类") public class BaseRule extends BaseAPS { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java index a802118..b8f05fb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @Description :BOM树 @@ -14,6 +15,7 @@ import lombok.Data; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Api("BOM树") public class BomTree extends BaseAPS { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java index 5d09632..23159bc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -16,6 +17,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_CANCEL_PLAN_RULE") @Api("取消计划规则") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 1f2edb3..067f76a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,6 +19,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_DATA_LINK") @Api("数据集成数据连接信息") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index ff9e9c0..54f2d8a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -4,6 +4,7 @@ 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; @@ -17,6 +18,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_DAY_SHIFT") @Api("班次") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index 34c1a8e..ba3afb0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -19,6 +20,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_DYNAMIC_SET_TIME") @Api("动态设置时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index 9343571..5e49e94 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EExportDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_EXPORT_DETAIL") @Api("数据导出明细") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index 458c9a5..1a44c20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_EXPORT_PROJECT") @Api("数据导出明细集合") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index 4e3677d..470db80 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -17,6 +18,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_FIELD_SET_RULE") @Api("属性赋值规则") 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 e65c965..1c3c598 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -17,6 +18,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_HEURISTIC_RULE") @Api("排程运算规则") 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 872c9e3..8e0d4c5 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 @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_IMPORT_DETAIL") @Api("数据导入明细") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 35e8af3..3c78c4c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -22,6 +23,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_IMPORT_PROJECT") @Api("数据导入明细集合") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 97056fa..ad08ede 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_INVENTORY") @Api("库存") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index 31e3941..9150118 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,6 +19,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_MAT_CALC_RULE") @Api("物料运算规则") 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 66199b2..e19681f 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 @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,6 +25,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_MATERIAL") @Api("物料") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index facf9b4..6e01250 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -5,6 +5,7 @@ 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; @@ -18,6 +19,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_MATERIAL_SET_TIME") @Api("物料设置时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 3f4d265..b4b241c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_OPER_INPUT") @Api("工序输入") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 5e98d6e..c1f8984 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -22,6 +23,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index a877505..7d78809 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_OPER_RESOURCE") @Api("工序资源") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 5b1d730..9400f9c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_OPERATION") @Api("工序") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java index b1a449a..493c332 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java @@ -5,6 +5,7 @@ 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 java.util.Date; @@ -18,6 +19,7 @@ import java.util.Date; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Api("订单树") public class OrderTree extends BaseAPS { @ApiParam(value ="物料编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java index 884adbd..b16377c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -19,6 +20,7 @@ import java.util.Date; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_OVERTIME_CALENDAR") @Api("加班日历") 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 a81d45f..1539067 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 @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,6 +25,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PARENT_WORK") @Api("父工作") 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 40b004b..620ba31 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 @@ -7,6 +7,7 @@ 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; @@ -20,6 +21,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PLAN_FEEDBACK") @Api("物料") 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 7175b15..8655079 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 @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PRODUCT_ORDER") @Api("生产订单") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 74a3b60..7cdd7b5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PRODUCT_ROUTING") @Api("物料") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index 21eed1b..e12badd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PURCHASE_ORDER") @Api("工艺路线") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index cc889e3..fdac512 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_RES_CALENDAR") @Api("日历") 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 903874d..b0963f9 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 @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,12 +25,14 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_RESOURCE") @Api("资源") public class Resource extends BaseCode { @Column(name="BOTTLENECK") @ApiParam(value ="是否瓶颈资源") + @FieldAnnotation(defaultValue = "false") private Boolean bottleneck; @Column(name="TYPE") @@ -60,11 +63,11 @@ public class Resource extends BaseCode { private Double maxProduceBatch; @Column(name="TIME_TAIL_ADJUST") - @ApiParam(value ="时间尾数调整") + @ApiParam(value ="时间尾数圆整") private String timeTailAdjust; @Column(name="TIME_ADJUST") - @ApiParam(value ="时间调整") + @ApiParam(value ="时间圆整") private String timeAdjust; @Column(name="MAX_PREV_SD_TIME") @@ -80,7 +83,7 @@ public class Resource extends BaseCode { private String maxPostSdTime; @Column(name="ROUND_TYPE") - @ApiParam(value ="时间与时间尾数圆整类型") + @ApiParam(value ="圆整类型") @FieldAnnotation(defaultValue = "ROUNDING") private ApsEnumUtil.TIME_ROUND_TYPE roundType; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index d019c4d..72f0ae6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_RULE_DETAIL") @Api("规则明细") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 6ad589e..670f56a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_RULE_GROUP") @Api("规则组合") @@ -34,5 +36,5 @@ public class RuleGroup extends BaseAPS { private Integer orderNumber; @JsonBackReference - List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } + public List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 66a5337..0dae95e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import java.util.Date; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_SALES_ORDER") @Api("销售订单") 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 new file mode 100644 index 0000000..53a30a4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +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 : 2019-09-17 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_SERIAL_NUMBER") +@Api("取消计划规则") +public class SerialNumber extends BaseAPS { + + @Column(name="NUMBER") + @ApiParam(value ="流水号") + private Integer number; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index de87386..6fc2187 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EShippingTime; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_SHIPPING_TIME") @Api("运输时间") 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 7e6aeb4..52d1f68 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 @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -19,6 +20,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_STAND_OPERATION") @Api("标准工序") 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 68e1ddf..acea2ca 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 @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import java.util.Date; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_SYS_PARAM") @Api("系统参数") 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 4e64725..e14f224 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 @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,6 +25,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK") @Api("工作") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index e690ba2..ad465c2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK_INPUT") @Api("工作输入") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index c947efd..51f4803 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.context.annotation.Bean; import javax.persistence.Column; @@ -24,6 +25,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK_OUTPUT") @Api("工作输出") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 13aa2cc..b0cb321 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_Work_Relation") @Api("工作关联") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 16a577f..67bac97 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK_RESOURCE") @Api("工作资源") 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 a300c90..1be31d5 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 @@ -39,4 +39,9 @@ public abstract class BaseAPS extends BaseBean { public void setCustomField(String code, Object value) { customFields.put(code, value); } + + @Override + public boolean equals(Object obj) { + return this == obj; + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index 5d03f34..8fca466 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.common; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.MappedSuperclass; @@ -15,6 +16,7 @@ import javax.persistence.MappedSuperclass; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @MappedSuperclass public abstract class BaseCode extends BaseAPS { @Column(name="CODE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index fa3db91..f35fbed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -359,30 +359,31 @@ public class BeanRelation { * * @param bean */ - public static void delete(BaseBean bean) { - if (bean == null) { - return; - } - BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); - List> ownerSigns = beanInfo.getOwnerHolders(); - for (Enum holder : ownerSigns) { - List relaBeans = new ArrayList<>(list(bean, holder)); - for (BaseBean relaBean : relaBeans) { - //MemoryManager.delete(relaBean); - } - } - - List> normalSigns = beanInfo.getNormalSigns(); - for (Enum holder : normalSigns) { - Enum reverseHolder = beanInfo.getReverseHolder(holder); - List relaBeans = new ArrayList<>(list(bean, holder)); - for (BaseBean relaBean : relaBeans) { - if (reverseHolder != null) { - remove(relaBean, reverseHolder, bean); - } - } - } - } +// public static void delete(BaseBean bean) { +// if (bean == null) { +// return; +// } +// BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); +// List> ownerSigns = beanInfo.getOwnerHolders(); +// for (Enum holder : ownerSigns) { +// Class relaCls = beanInfo.getRelationInfo(holder).getBeanInfo().getBeanClass(); +// List relaBeans = new ArrayList<>(list(bean, holder)); +// for (BaseBean relaBean : relaBeans) { +// //MemoryManager.delete(relaBean); +// } +// } +// +// List> normalSigns = beanInfo.getNormalSigns(); +// for (Enum holder : normalSigns) { +// Enum reverseHolder = beanInfo.getReverseHolder(holder); +// List relaBeans = new ArrayList<>(list(bean, holder)); +// for (BaseBean relaBean : relaBeans) { +// if (reverseHolder != null) { +// remove(relaBean, reverseHolder, bean); +// } +// } +// } +// } /** * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java new file mode 100644 index 0000000..3770ae5 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.SerialNumber; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ISerialNumberRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index a5b5ece..e9e3ae3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -13,6 +13,116 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * RAW_PART_STATUS 原材料状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RAW_PART_STATUS { + + READY(10, "待投料"), + ALREADY(20, "已投料"); + + private int value; + private String description; + + RAW_PART_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 接口同步状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IF_SYNC_STATUS { + + NO_SYNC(10, "未同步"), + ALREADY_SYNC(20, "已同步"), + FAIL_SYNC(30, "同步失败"); + + private int value; + private String description; + + IF_SYNC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 包装层级 MES_PACKAGE + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_PACKLEVEL { + + FIRST(1, "第一层"), + SECOND(2, "第二层"), + THIRD(3, "第三层"), + FOURTH(4, "第四层"); + + private int value; + private String description; + + PACKAGE_PACKLEVEL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } /** * MesIf 交互方式 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 38268c7..e2b1412 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -13,6 +13,43 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 接口同步状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IF_SYNC_STATUS { + + NO_SYNC(10, "未同步"), + ALREADY_SYNC(20, "已同步"), + FAIL_SYNC(30, "同步失败"); + + private int value; + private String description; + + IF_SYNC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 条码类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -154,19 +191,19 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_CODE_TYPE { - SERIAL_SN("10", "过程条码"), - PRODUCT_SN("20", "产品条码"), - PACK_SN("30", "包装条码"); + SERIAL_SN(10, "过程条码"), + PRODUCT_SN(20, "产品条码"), + PACK_SN(30, "包装条码"); - private String value; + private int value; private String description; - MES_CODE_TYPE(String value, String description) { + MES_CODE_TYPE(int value, String description) { this.value = value; this.description = description; } - public String getValue() { + public int getValue() { return value; } @@ -174,7 +211,7 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(String val) { + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index c06ad50..0711dcc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3809,7 +3809,8 @@ public class WmsEnumUtil { CREATE_TASK(10, "CREATE_TASK", "生成任务"), AUTO_OPT(20, "AUTO_OPT", "自动操作"), MENU_OPT(30, "MENU_OPT", "手工操作"), - AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"); + AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"), + CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index 1b43256..7ec411c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -76,11 +76,11 @@ public class LacCommandStackStepTask extends BaseBean { /** * 不建议使用 */ - @Deprecated - @Column(name="TASK_INSTANCE_ID") - @ApiParam(value ="任务实例ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long taskInstanceId; +// @Deprecated +// @Column(name="TASK_INSTANCE_ID") +// @ApiParam(value ="任务实例ID") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long taskInstanceId; // // @Column(name="STEP_NAME_RDD") // @ApiParam(value ="步骤名称") @@ -115,6 +115,13 @@ public class LacCommandStackStepTask extends BaseBean { @ApiParam(value ="适配任务记录") private LacLogTask logTask; + public Long getTaskInstanceId(){ + if(lacSuitTask == null){ + return logTask.getId(); + } + return null; + } + public LacCommandStackStepTask() { } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 22c04a7..8fd5bbc 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -126,10 +126,6 @@ public class LacSuitTask extends BaseBean { private LacSuitCase lacSuitCase; @Transient - @ApiParam(value ="任务实例id") - private Long taskInstanceId; - - @Transient @ApiParam(value ="适配原始参数") private Object orginParam; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 6bb3a32..abf9368 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -34,8 +34,8 @@ public class LacHqlPack { public static DdlPackBean packHqlLacLogTask(LacLogTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(), "commandStackRecordId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); return ddlPackBean; } @@ -43,7 +43,7 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean); return ddlPackBean; } @@ -51,7 +51,9 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(), "templateId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getStepName(), "stepName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getStepCode(), "stepCode", ddlPackBean); return ddlPackBean; } @@ -60,23 +62,28 @@ public class LacHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getStepId(),"stepId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getTaskNameRdd(), "taskNameRdd", ddlPackBean); return ddlPackBean; } public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - - DdlPreparedPack.getStringLikerPack(bean.getTaskName(),"taskName",ddlPackBean); - DdlPreparedPack.getStringLikerPack(bean.getTaskCode(),"taskCode",ddlPackBean); + if (bean == null) { + return ddlPackBean; + } + DdlPreparedPack.getStringLikerPack(bean.getTaskName(), "taskName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getTaskCode(), "taskCode", ddlPackBean); return ddlPackBean; } public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List idList) { - DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ; + DdlPackBean ddlPackBean = packHqlLacSuitTask(bean); - DdlPreparedPack.getInPackList(idList,"id",ddlPackBean); + DdlPreparedPack.getInPackList(idList, "id", ddlPackBean); return ddlPackBean; } @@ -90,15 +97,18 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List taskIdList) { DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean); - DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + DdlPreparedPack.getInPackList(taskIdList, "taskId", ddlPackBean); return ddlPackBean; } public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getParamType(),"paramType",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); + if(bean == null){ + return ddlPackBean; + } + DdlPreparedPack.getNumEqualPack(bean.getParamType(), "paramType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); return ddlPackBean; } @@ -106,7 +116,7 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List taskIdList) { DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean); - DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + DdlPreparedPack.getInPackList(taskIdList, "taskId", ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java new file mode 100644 index 0000000..19bbed9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java @@ -0,0 +1,103 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 java.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\14 19:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_DISMENTLE_RECORD") +@Api("物料拆解表") +public class IfDismantleRecord extends BaseBean { + + @Column(name = "DISMANTLE_ID") + @ApiParam("拆解编号") + private String dismantleId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "PARENT_PART_NAME") + @ApiParam("产品物料名称") + private String parentPartName; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Integer qty; + + @Column(name = "DISMANTLE_QTY") + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料名称") + private String itemPartName; + + @Column(name = "OK_QTY") + @ApiParam("合格数") + private BigDecimal okQty; + + @Column(name = "MISS_QTY") + @ApiParam("缺失数") + private BigDecimal missQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数") + private BigDecimal scrapQty; + + @Column(name = "LOT_NO") + @ApiParam("批次") + private String lotNo; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java new file mode 100644 index 0000000..afecb21 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE_DETAIL") +@Api("包装明细表") +public class IfPackageDetail extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "LOT_NO") + @ApiParam("包装批次") + private String lotNo; + + @Column(name = "QTY") + @ApiParam("数量") + private String qty; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编号2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编号3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编号4") + private String packageNo4; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java new file mode 100644 index 0000000..a53a8b5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 10:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PRODUCT_OFF_LINE") +@Api("生产报工表") +public class IfProductOffLine extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "QTY") + @ApiParam("数量") + private String qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java new file mode 100644 index 0000000..c1c1a82 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_IF") +@Api("动作接口配置") +public class MesActionIf extends BaseBean { + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index 33b2402..5b9c854 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.math.BigDecimal; /** * @Description: @@ -59,7 +60,7 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "DISMANTLE_QTY") @ApiParam("拆解数") - private Integer dismantleQty; + private BigDecimal dismantleQty; @Column(name = "ITEM_PART_NO") @ApiParam("子物料编码") @@ -71,15 +72,15 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "OK_QTY") @ApiParam("合格数") - private Integer okQty; + private BigDecimal okQty; @Column(name = "MISS_QTY") @ApiParam("缺失数") - private Integer missQty; + private BigDecimal missQty; @Column(name = "SCRAP_QTY") @ApiParam("报废数") - private Integer scrapQty; + private BigDecimal scrapQty; @Column(name = "MEMO") @ApiParam("备注") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 88a3791..466ead5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -55,6 +55,10 @@ public class MesPackage extends BaseBean { @ApiParam("批号") private String lotNo; + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + @Column(name = "PACK_SPEC") @ApiParam("包装规格") private String packSpec; @@ -95,8 +99,21 @@ public class MesPackage extends BaseBean { @ApiParam("打印状态文字") private String printStrStatus; + @Transient + @ApiParam("客户代码名称") + private String custCodeName; + + @Transient + @ApiParam("打印缓存id") + private String printId; + @Transient + @ApiParam("包装层级名称") + private String packLevelName; + @Transient + @ApiParam("是否封箱名称") + private String isSealedName; public MesPackage() { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index d3864d0..883c12a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -24,7 +24,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE_DETAIL") -@Api("包装规格") +@Api("包装规格明细") public class MesPackageDetail extends BaseBean { @Column(name = "PACKAGE_NO") @@ -32,15 +32,15 @@ public class MesPackageDetail extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "PART_NO") - @ApiParam("产品条码") + @ApiParam("物料编号") private String partNo; @Column(name = "PART_NAME_RDD") - @ApiParam("产品条码") + @ApiParam("物料名称") private String partNameRdd; @Column(name = "PACKAGE_NO2") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java index 89e6f89..19bd5d9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -32,7 +32,7 @@ public class MesPackageTravel extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "OP_TYPE") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java index 0aff72b..c3ae649 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java @@ -73,9 +73,9 @@ public class MesPart extends BaseBean { @ApiParam("产品类型") private String produceCategory; - @Column(name = "PORCESS_MATCH_TYPE") + @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private String porcessMatchType; + private String processMatchType; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java index 1ff7261..abc6f92 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -34,6 +34,9 @@ public class ProdPackageModel { @ApiParam("班次") private String shiftCode; + @ApiParam("班次名称") + private String shiftName; + @ApiParam("物料号") private String partNo; @@ -55,10 +58,28 @@ public class ProdPackageModel { @ApiParam("包装规格") private String packSpec; + @ApiParam("数量") + private Double qty; + + @ApiParam("特殊批次") + private String fixLotNo; + @ApiParam("包装集合") private List packageList; @ApiParam("工单集合") private List workOrderList; + @ApiParam("打印状态文字") + private String printStrStatus; + + @ApiParam("客户代码名称") + private String custCodeName; + + @ApiParam("包装层级名称") + private String packLevelName; + + @ApiParam("是否封箱名称") + private String isSealedName; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java new file mode 100644 index 0000000..02bca6e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.IfDismantleRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 14:14 + * @Modify: + **/ +public interface IfDismantleRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java new file mode 100644 index 0000000..9a4d6be --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.IfPackageDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 17:47 + * @Modify: + **/ +public interface IfPackageDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java new file mode 100644 index 0000000..9d362f1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.IfProductOffLine; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 17:48 + * @Modify: + **/ +public interface IfProductOffLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java new file mode 100644 index 0000000..5f1dbef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesActionIf; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 11:21 + * @Modify: + **/ +public interface MesActionIfRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java new file mode 100644 index 0000000..6fe4ca3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -0,0 +1,99 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 java.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\14 19:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_DISMENTLE_RECORD") +@Api("物料拆解表") +public class IfDismantleRecord extends BaseBean { + + @Column(name = "DISMANTLE_ID") + @ApiParam("拆解编号") + private String dismantleId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "PARENT_PART_NAME") + @ApiParam("产品物料名称") + private String parentPartName; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Integer qty; + + @Column(name = "DISMANTLE_QTY") + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料名称") + private String itemPartName; + + @Column(name = "OK_QTY") + @ApiParam("合格数") + private BigDecimal okQty; + + @Column(name = "MISS_QTY") + @ApiParam("缺失数") + private BigDecimal missQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数") + private BigDecimal scrapQty; + + @Column(name = "LOT_NO") + @ApiParam("批次") + private String lotNo; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java new file mode 100644 index 0000000..71f7100 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE_DETAIL") +@Api("包装明细表") +public class IfPackageDetail extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "LOT_NO") + @ApiParam("包装批次") + private String lotNo; + + @Column(name = "QTY") + @ApiParam("数量") + private String qty; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编号2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编号3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编号4") + private String packageNo4; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java new file mode 100644 index 0000000..2309dbe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 10:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PRODUCT_OFF_LINE") +@Api("生产报工表") +public class IfProductOffLine extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "QTY") + @ApiParam("数量") + private String qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index b018ee8..88fb6d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -9,10 +9,7 @@ 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.Transient; +import javax.persistence.*; /** * @Description :设备通知对象配置 @@ -37,10 +34,12 @@ public class MesEquNotifyObjectCfg extends BaseBean { @ApiParam("对象名称") private String notifyObjectName; + @Lob @Column(name="NOTIFY_OBJECT_VALUE") @ApiParam("对象值") private String notifyObjectValue; + @Lob @Column(name="NOTIFY_OBJECT_VALUE_RDD") @ApiParam("对象值") private String notifyObjectValueRdd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 7e6eff9..6ee033d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -49,4 +49,5 @@ public class MesLabelTemplate extends BaseBean { @Transient @ApiParam(value = "模板id对应的模板参数") private List labelTemplateParamList; + } 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 ce04c3d..36b3bf6 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 @@ -55,6 +55,10 @@ public class MesPackage extends BaseBean { @ApiParam("批号") private String lotNo; + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + @Column(name = "PACK_SPEC") @ApiParam("包装规格") private String packSpec; @@ -91,4 +95,20 @@ public class MesPackage extends BaseBean { @ApiParam("封箱状态") private String sealStatus; + @Transient + @ApiParam("打印状态文字") + private String printStrStatus; + + @Transient + @ApiParam("客户代码名称") + private String custCodeName; + + @Transient + @ApiParam("包装层级名称") + private String packLevelName; + + @Transient + @ApiParam("是否封箱名称") + private String isSealedName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index a6594ad..95483c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -23,8 +23,8 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") -@Api("包装规格") +@Table(name = "MES_PACKAGE_DETAIL") +@Api("包装规格明细") public class MesPackageDetail extends BaseBean { @Column(name = "PACKAGE_NO") @@ -32,7 +32,7 @@ public class MesPackageDetail extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 4ac7024..76a808b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -32,7 +32,7 @@ public class MesPackageTravel extends BaseBean { private String packageNo; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; @Column(name = "OP_TYPE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 7502dd2..397ff0b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -77,9 +77,9 @@ public class MesPart extends BaseBean { @ApiParam("产品类型名称") private String produceCategoryName; - @Column(name = "PORCESS_MATCH_TYPE") + @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private String porcessMatchType; + private String processMatchType; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java new file mode 100644 index 0000000..6ab949d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 9:34 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("动作函数关系model") +public class IfRawPartDataModel implements Serializable { + + @ApiParam("id") + private Long id; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("原料类型") + private String partType; + + @ApiParam("原料条码") + private String serialNumber; + + @ApiParam("数量") + private BigDecimal qty; + + @ApiParam("单位") + private String unit; + + @ApiParam("收货批次") + private String srcLotNo; + + @ApiParam("生产批次") + private String lotNo; + + @ApiParam("特殊批次") + private String fixLotNo; + + @ApiParam("供应商代码") + private String supplierCode; + + @ApiParam("工厂代码") + private String organizationCode; + + @ApiParam("同步状态") + private Integer syncStatus; + + @ApiParam("异常消息") + private String errorMessage; + + @ApiParam("动作代码") + private String actionCode; + + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java new file mode 100644 index 0000000..5c0b2ab --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 产品/包装打印模板model + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +public class SnPrintTemplateModel implements Serializable { + + @ApiParam("产品条码模板") + private MesLabelTemplate prodSnPrintTemplate; + + @ApiParam("包装条码模板集合") + private List packageSnPrintTemplateList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDismantleRecordRepository.java new file mode 100644 index 0000000..165ab5e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDismantleRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfDismantleRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:33 + * @Modify: + **/ +public interface IfDismantleRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageDetailRepository.java new file mode 100644 index 0000000..e7d0602 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfPackageDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface IfPackageDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfProductOffLineRepository.java new file mode 100644 index 0000000..abdbfba --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfProductOffLineRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfProductOffLine; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:32 + * @Modify: + **/ +public interface IfProductOffLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRawPartSnRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRawPartSnRepository.java new file mode 100644 index 0000000..8dbe9f8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRawPartSnRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesRawPartSn; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 11:17 + * @Modify: + **/ +public interface MesRawPartSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index bc3eab8..9b67963 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -818,6 +818,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(customerPart.getCustomerPartNo())) { DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); } + if (!StringUtils.isEmpty(customerPart.getCustomerPartName())) { + DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartName(), "customerPartName", packBean); + } return packBean; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index c9fb540..0cdedf7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -63,4 +63,11 @@ public class LacCommandStackModel { return null; } + public Long getRecordId(){ + if(recordId == null &&this.commandStackRecord !=null){ + this.recordId = this.commandStackRecord.getId(); + } + return recordId; + } + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index ff5adbd..f9e9067 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -46,6 +46,13 @@ public class SysMenu extends BaseBean { @ApiParam(value ="功能代码") private String menuCode; + /** + * 产品类型暂时不能填写, 产品以上线调整影响范围太大. + */ + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型", example = "0") + private Integer softTyp; + @Column(name="MENU_TYPE") @ApiParam(value ="功能类型" , example ="-1" ,access = "枚举：1.模块，2.菜单，3.按钮") private Integer menuType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index 31153ac..c54315e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -51,6 +51,6 @@ public class SwebProcurementPlanOrder extends BaseBean { @Column(name = "CONSIGNMENT") @ApiParam(value = "是否寄售") - private Integer consignment; + private Integer consignment=2; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 442a5c4..81db268 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -58,6 +58,10 @@ public class WmsLocatePart extends BaseBean { @ApiParam(value = "是否生成领料单", example = "2") private Integer isGeneratePicklist; + @Column(name = "SAFETY_STOCK", columnDefinition = "decimal(18,8)") + @ApiParam(value = "安全库存", example = "0") + private Double safetyStock; + @Transient @ApiParam("库位类型") private Integer locateType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 208e2ca..8e6d27e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -190,6 +190,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "车号") private String carNo; + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + private Integer consignation; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 96ffb91..4581410 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -196,6 +196,10 @@ public class WmsMoveSn extends BaseBean { @Transient private Integer isSnapshot; + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + private Integer consignation; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 654dbd2..6342635 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -175,6 +175,14 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("年度") public String year; + @Column(name = "IS_CONSIGNMENT") + @ApiParam("是否寄售") + public Integer isConsignment = 2; + + @Column(name = "PRIOR_RC") + @ApiParam("是否预收货") + public Integer priorRC = 2; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index b2c81ff..34d1a36 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -116,7 +116,7 @@ public class WmsPOMaster extends BaseBean { @ApiParam("集装箱号") public String containerNo; - @Column(name = "PRIOR_RC") + @Column(name = "PRIOR_RC",columnDefinition = "int default 2") @ApiParam("预收货") public Integer priorRC; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 0c9c9bf..f4c6c39 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -67,6 +67,11 @@ public class WmsPoSn extends BaseBean { @Column(name="SN_STATUS") @ApiParam(value = "状态", example = "10") public Integer snStatus; + /** + * 质量:10-合格 20-不合格 30-隔离 40-报废 + */ + @ApiParam(value = "质量状态", example = "10") + public Integer qcStatus; @Column(name="PACKAGE") @ApiParam("包装名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index c98681aa..9fd93de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -59,13 +61,37 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目标存储区" , example = "2") private String destZoneNo; - @Column(name = "OP_TYPE_CODE") - @ApiParam(value = "作业类型" , example = "2") - private String opTypeCode; - - @Column(name = "TRANS_TYPE_CODE") - @ApiParam(value = "交易类型" , example = "1") - private String transTypeCode; + @Column(name = "DEST_BUSI_TYPE_CODE") + @ApiParam(value = "目标业务类型编码" , example = "") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + private String destBusiTypeCode; + + @Column(name = "SRC_BUSI_TYPE_CODE") + @ApiParam(value = "源业务类型编码" , example = "") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + private String srcBusiTypeCode; + + @Column(name = "DEST_OP_TYPE_CODE") + @ApiParam(value = "目标作业类型" , example = "2") + private String destOpTypeCode; + + @Column(name = "DEST_TRANS_TYPE_CODE") + @ApiParam(value = "目标交易类型" , example = "1") + private String destTransTypeCode; + + @Column(name = "SRC_TRANS_TYPE_CODE") + @ApiParam(value = "源交易类型" , example = "1") + private String srcTransTypeCode; + + @Column(name = "DEST_SN_STATUS") + @ApiParam(value = "目标条码状态" , example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") + private Integer destSnStatus; + + @Column(name = "DEST_QC_STATUS") + @ApiParam(value = "目标质量状态" , example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") + private Integer destQcStatus; @Column(name = "MODE_CODE") @ApiParam(value = "处理模式(10:生成任务,20:自动操作,30手工操作，40:自动操作 无交易)" , example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index a3e8927..773ae39 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -274,6 +274,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("批次校验规则") private String lotCheckRule; + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + private Integer consignation; + public WmsStockSn() { } @@ -325,4 +329,37 @@ public class WmsStockSn extends BaseBean { this.lotNo = lotNo; this.qty = qty; } + + public WmsStockSn(String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo, + String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd, + String qualityDate, String custNo, String lotCheckRule, String sn2d, + String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) { + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.vendorNo = vendorNo; + this.vendorNameRdd = vendorNameRdd; + this.qualityDate = qualityDate; + this.qualityDay = qualityDay; + this.custNo = custNo; + this.lotCheckRule = lotCheckRule; + this.sn2d = sn2d; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } } 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 dd901c0..15013e3 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 @@ -208,6 +208,16 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){ + ArrayList numList = new ArrayList<>(); + numList.add(0); + numList.add(wmsPOMaster.getPriorRC()); + numList.add(null); + DdlPreparedPack.getInPackList(numList, "priorRC", result); + }else{ + DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); + } + // 查询计划时间在指定范围的单号，查询这些单号的数据 if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { @@ -1510,7 +1520,9 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "snOneBarCode", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result);