diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java new file mode 100644 index 0000000..f4a4264 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.aps.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface HolderAnnotation { + String[] notProperty(); +} 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..3837379 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("动态设置时间") @@ -28,25 +30,25 @@ public class DynamicSetTime extends BaseAPS { private String resCode; @Column(name="TYPE") - @ApiParam(value ="应用工作计划类型") + @ApiParam(value ="影响类型") @FieldAnnotation(defaultValue = "ALL") private ApsEnumUtil.DYNAMIC_SET_TYPE type; @Column(name="CONSIDER_ASS_RES") - @ApiParam(value ="是否启用副资源动态设置时间") + @ApiParam(value ="启用副资源设置时间") private Boolean considerAssRes; @Column(name="CONSIDER_MATERIAL") - @ApiParam(value ="是否启用物料动态设置时间") + @ApiParam(value ="启用物料设置时间") private Boolean considerMaterial; @Column(name="ASS_RES_CALC") - @ApiParam(value ="副资源动态设置计算方式") + @ApiParam(value ="副资源设置计算方式") @FieldAnnotation(defaultValue = "MAX") private ApsEnumUtil.DYNAMIC_SET_CALC assResCalc; @Column(name="MATERIAL_CALC") - @ApiParam(value ="物料动态设置时间计算方式") + @ApiParam(value ="物料设置时间计算方式") @FieldAnnotation(defaultValue = "MAX") private ApsEnumUtil.DYNAMIC_SET_CALC materialCalc; 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/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 30da6eb..2ea445a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; @@ -50,18 +51,22 @@ public class FieldInfo extends BaseCode { @Column(name="CUSTOMIZE") @ApiParam(value ="是否为自定义字段") - private Boolean customize; + @FieldAnnotation(defaultValue = "true") + private Boolean customize = true; @Column(name="MODIFY") @ApiParam(value ="是否能修改") - private Boolean modify; + @FieldAnnotation(defaultValue = "true") + private Boolean modify = true; @Column(name="DISPLAY") @ApiParam(value ="是否在界面显示") - private Boolean display; + @FieldAnnotation(defaultValue = "true") + private Boolean display = true; @Column(name="PRIC") @ApiParam(value ="浮点数显示精度") + @FieldAnnotation(defaultValue = "2") private Integer pric; @Column(name="TIPS") 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 129a9db..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,6 +25,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_RESOURCE") @Api("资源") 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 index eea1979..53a30a4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -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_SERIAL_NUMBER") @Api("取消计划规则") 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..576ffb0 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWork; @@ -9,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,13 +26,24 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK") @Api("工作") -public class Work extends BaseCode { +public class Work extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="ORDER_ID") + @ApiParam(value ="订单") + @FieldAnnotation(property = false) + private Long orderId; + @Column(name="WORK_TYPE") @ApiParam(value ="工作类型") - @FieldAnnotation(modify = false) + @FieldAnnotation(property = false) private ApsEnumUtil.WORK_TYPE workType; @Column(name="count") @@ -122,11 +135,6 @@ public class Work extends BaseCode { @FieldAnnotation(modify = false) private String failedReason; - @Column(name="ORDER_ID") - @ApiParam(value ="订单") - @FieldAnnotation(property = false) - private Long orderId; - @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(property = false) 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..10cc5dd 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,14 +24,20 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK_INPUT") @Api("工作输入") public class WorkInput extends BaseAPS { - @Column(name="INPUT_TIME") - @ApiParam(value ="输入时间") - @FieldAnnotation(modify = false) - private Date inputTime; + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; @Column(name="INPUT_COUNT") @ApiParam(value ="输入数量") @@ -42,15 +49,10 @@ public class WorkInput extends BaseAPS { @FieldAnnotation(modify = false) private Double shortCount; - @Column(name="WORK_ID") - @ApiParam(value ="工作") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; + @Column(name="INPUT_TIME") + @ApiParam(value ="输入时间") + @FieldAnnotation(modify = false) + private Date inputTime; @Column(name="OPER_INPUT_ID") @ApiParam(value ="工序输入") 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..c5638a8 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,14 +25,21 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK_OUTPUT") @Api("工作输出") public class WorkOutput extends BaseAPS { - @Column(name="OUTPUT_TIME") - @ApiParam(value ="输出时间") - @FieldAnnotation(modify = false) - private Date outputTime; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") @@ -43,15 +51,10 @@ public class WorkOutput extends BaseAPS { @FieldAnnotation(modify = false) private Double remainCount; - @Column(name="WORK_ID") - @ApiParam(value ="工作") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; + @Column(name="OUTPUT_TIME") + @ApiParam(value ="输出时间") + @FieldAnnotation(modify = false) + private Date outputTime; @Column(name="OPER_OUTPUT_ID") @ApiParam(value ="工序输出") 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..876e25f 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,10 +22,42 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_Work_Relation") @Api("工作关联") public class WorkRelation extends BaseAPS { + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="PREV_ORDER_ID") + @ApiParam(value ="前订单") + @FieldAnnotation(property = false) + private Long prevOrderId; + + @Column(name="POST_ORDER_ID") + @ApiParam(value ="后订单") + @FieldAnnotation(property = false) + private Long postOrderId; + + @Column(name="PREV_WORK_ID") + @ApiParam(value ="前工作") + @FieldAnnotation(property = false) + private Long prevWorkId; + + @Column(name="POST_WORK_ID") + @ApiParam(value ="后工作") + @FieldAnnotation(property = false) + private Long postWorkId; + + @Column(name="COUNT") + @ApiParam(value ="关联数量") + @FieldAnnotation(modify = false) + private Double count; + @Column(name="TYPE") @ApiParam(value ="关联类型") @FieldAnnotation(modify = false) @@ -45,11 +78,6 @@ public class WorkRelation extends BaseAPS { @FieldAnnotation(modify = false) private String minSpaceTime; - @Column(name="COUNT") - @ApiParam(value ="关联数量") - @FieldAnnotation(modify = false) - private Double count; - @Column(name="FIX_RELATION") @ApiParam(value ="是否固定关联") private Boolean fixRelation; @@ -68,31 +96,6 @@ public class WorkRelation extends BaseAPS { @FieldAnnotation(property = false) private Long workOutputId; - @Column(name="PREV_WORK_ID") - @ApiParam(value ="前工作") - @FieldAnnotation(property = false) - private Long prevWorkId; - - @Column(name="POST_WORK_ID") - @ApiParam(value ="后工作") - @FieldAnnotation(property = false) - private Long postWorkId; - - @Column(name="PREV_ORDER_ID") - @ApiParam(value ="前订单") - @FieldAnnotation(property = false) - private Long prevOrderId; - - @Column(name="POST_ORDER_ID") - @ApiParam(value ="后订单") - @FieldAnnotation(property = false) - private Long postOrderId; - - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - public WorkInput getWorkInput() { return BeanRelation.get(this, EWorkRelation.WorkInput); } 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..fbc7726 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,10 +22,22 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK_RESOURCE") @Api("工作资源") public class WorkResource extends BaseAPS { + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(property = false) + private Long resourceId; + @Column(name="USE_TYPE") @ApiParam(value ="使用类型") @FieldAnnotation(modify = false) @@ -70,16 +83,6 @@ public class WorkResource extends BaseAPS { @FieldAnnotation(modify = false) private String userMatchNumber; - @Column(name="WORK_ID") - @ApiParam(value ="工作") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="RESOURCE_ID") - @ApiParam(value ="资源") - @FieldAnnotation(property = false) - private Long resourceId; - @Column(name="OPER_RESOURCE_ID") @ApiParam(value ="工序资源") @FieldAnnotation(property = false) 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..638f867 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") @@ -26,8 +28,4 @@ public abstract class BaseCode extends BaseAPS { @ApiParam(value ="名称") @FieldAnnotation(popSearch = true) private String name; - - @Column(name="REMARK") - @ApiParam(value ="备注") - private String remark; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 47da0e1..4e72065 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -1,5 +1,9 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = {"ParentWork", "WorkResources", "WorkInputs", "WorkOutputs", + "PrevRelations", "PostRelations", "Operation"}) public enum EWork { Order, // 订单 ParentWork, // 父工作 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java index ddfbd3a..2b35993 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = {"OperInput"}) public enum EWorkInput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java index e2f1de2..b6d52e0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = "OperOutput") public enum EWorkOutput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index 490bddc..25438ec 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = {"WorkResource", "MainPlan", "FurnacePlan"}) public enum EWorkPlan { Work, Resource, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java index cdfc8ab..d75afa7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java @@ -1,11 +1,14 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = {"WorkInput", "WorkOutput"}) public enum EWorkRelation { - WorkInput, - WorkOutput, - PrevWork, - PostWork, + Material, PrevOrder, PostOrder, - Material + PrevWork, + PostWork, + WorkInput, + WorkOutput } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java index 2f77bcc..360e756 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = "OperResource") public enum EWorkResource { Work, Resource, 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..6d080fb 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 交互方式 @@ -265,21 +375,21 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_MATCH_TYPE { - ORGANIZATION("10", "工厂"), - PART("20", "物料"), - CUST_CODE("30", "客户代码"), - CUST_PART_NO("40", "客户物料号"), - WORK_CENTER("50", "产线"); + ORGANIZATION(10, "工厂"), + PART(20, "物料"), + CUST_CODE(30, "客户代码"), + CUST_PART_NO(40, "客户物料号"), + WORK_CENTER(50, "产线"); - private String value; + private int value; private String description; - MES_MATCH_TYPE(String value, String description) { + MES_MATCH_TYPE(int value, String description) { this.value = value; this.description = description; } - public String getValue() { + public int getValue() { return value; } @@ -287,7 +397,7 @@ public class MesEnumUtil { 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) { @@ -304,19 +414,19 @@ public class MesEnumUtil { @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; } @@ -324,7 +434,7 @@ public class MesEnumUtil { 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) { @@ -2852,7 +2962,8 @@ public class MesEnumUtil { SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""), PCN_LOGIN(160, "PCN_LOGIN",""), PCN_MENU(170, "PCN_MENU",""), - PCN_MODULE(180, "PCN_MODULE",""); + PCN_MODULE(180, "PCN_MODULE",""), + PCN_LOGOUT(190, "PCN_LOGOUT",""); private int value; @@ -2963,6 +3074,39 @@ public class MesEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ONLINE_SEND_TYPE { + + PLC("PLC", "PLC"), + DB("DB", "DB"); + + private String value; + private String description; + + ONLINE_SEND_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * WC_CHECK_TYPE 开线检查的模块 */ 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 59dfd14..d3a1cf1 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 @@ -142,21 +142,21 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_MATCH_TYPE { - ORGANIZATION("10", "工厂"), - PART("20", "物料"), - CUST_CODE("30", "客户代码"), - CUST_PART_NO("40", "客户物料号"), - WORK_CENTER("50", "产线"); + ORGANIZATION(10, "工厂"), + PART(20, "物料"), + CUST_CODE(30, "客户代码"), + CUST_PART_NO(40, "客户物料号"), + WORK_CENTER(50, "产线"); - private String value; + private int value; private String description; - MES_MATCH_TYPE(String value, String description) { + MES_MATCH_TYPE(int value, String description) { this.value = value; this.description = description; } - public String getValue() { + public int getValue() { return value; } @@ -164,7 +164,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) { @@ -175,9 +175,9 @@ public class MesPcnEnumUtil { } // 根据value返回枚举类型,主要在switch中使用 - public static MES_MATCH_TYPE getByValue(String value) { + public static MES_MATCH_TYPE getByValue(int value) { for (MES_MATCH_TYPE mesMatchType : values()) { - if (mesMatchType.getValue().equals(value)) { + if (mesMatchType.getValue() == value) { return mesMatchType; } } @@ -191,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; } @@ -211,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..a4862cb 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 @@ -2810,7 +2810,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"); + RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"); private int value; private String description; @@ -2850,8 +2850,9 @@ public class WmsEnumUtil { } + public enum WMS_PART_TYPE_STR { - RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"); + RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"),CONTAINER_PRODUCT("40", "容器"); private String value; private String description; @@ -3809,7 +3810,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-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 70ea929..c9618cd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -493,6 +493,21 @@ public class DdlPreparedPack { } /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and (model." + columnName + " in (:m_" + columnName + ") " + + "or model." + columnName + " is null)", data); + } + } + + + /** * 封装in查询语句 * * @param data 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/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java index 4ebc6e9..9b32ffa 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -124,7 +124,24 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="执行说明") private String executionDescription; + + @Transient + @ApiParam(value ="任务记录") + private LacCommandStackRecord record; + + @Transient + @ApiParam(value ="任务记录") + private LacCommandStackTemplate template; + + @Transient + @ApiParam(value ="任务步骤") + private LacCommandStackStep step; + + @Transient + @ApiParam(value ="任务记录") + private LacCommandStackStepTask stackStepTask; + @Transient - @ApiParam(value ="步骤列表") + @ApiParam(value ="执行任务参数") private List detailList; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java index d2b3cd2..fb27a2b 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -69,11 +69,6 @@ public class LacLogTaskDetail extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskTypeId; - @Column(name="TASK_NAME_TYPE") - @ApiParam(value ="任务类型") - @JsonSerialize(using = ToStringSerializer.class) - private Long taskNameType; - @Column(name="adapterId") @ApiParam(value ="适配器ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) 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/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index ca904d5..f21218e 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 @@ -100,16 +100,8 @@ public class MesPackage extends BaseBean { private String printStrStatus; @Transient - @ApiParam("客户代码名称") - private String custCodeName; - - @Transient - @ApiParam("包装层级名称") - private String packLevelName; - - @Transient - @ApiParam("是否封箱名称") - private String isSealedName; + @ApiParam("打印缓存id") + private String printId; public MesPackage() { } 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..1859025 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,17 +73,17 @@ public class MesPart extends BaseBean { @ApiParam("产品类型") private String produceCategory; - @Column(name = "PORCESS_MATCH_TYPE") + @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private String porcessMatchType; + private Integer processMatchType; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") - private String packageMatchType; + private Integer packageMatchType; @Column(name = "PRODUCT_MATCH_TYPE") @ApiParam("产品编码匹配类型") - private String productMatchType; + private Integer productMatchType; @Transient @ApiParam("分类名称") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java index e23ed67..89cad0e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java @@ -44,6 +44,10 @@ public class MesShift extends BaseBean { @ApiParam("开班时间") private String startTime; + @Column(name = "END_TIME") + @ApiParam("下班时间") + private String endTime; + @Column(name = "WORK_TIMES") @ApiParam("作业时长") private Double workTimes; 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 abc6f92..fc94a50 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 @@ -73,9 +73,6 @@ public class ProdPackageModel { @ApiParam("打印状态文字") private String printStrStatus; - @ApiParam("客户代码名称") - private String custCodeName; - @ApiParam("包装层级名称") private String packLevelName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index 2d627aa..5b3c105 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -53,4 +53,20 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("客户物料名称") private String customerPartName; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam("特殊批号") + private String fixLotNo; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("生产线代码") + private String workCenterCode; + } 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 36b3bf6..93339b7 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 @@ -99,16 +99,4 @@ public class MesPackage extends BaseBean { @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/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 7502dd2..216e157 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,15 +77,15 @@ public class MesPart extends BaseBean { @ApiParam("产品类型名称") private String produceCategoryName; - @Column(name = "PORCESS_MATCH_TYPE") + @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private String porcessMatchType; + private Integer processMatchType; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") - private String packageMatchType; + private Integer packageMatchType; @Column(name = "PRODUCT_MATCH_TYPE") @ApiParam("产品编码匹配类型") - private String productMatchType; + private Integer productMatchType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java index 5eac148..cd7e9ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java @@ -30,11 +30,11 @@ public class MesProductEncodeCfg extends BaseBean { @Column(name = "CODE_TYPE") @ApiParam("编码类型") - private String codeType; + private Integer codeType; @Column(name = "MATCH_TYPE") @ApiParam("匹配类型") - private String matchType; + private Integer matchType; @Column(name = "MATCH_VALUE") @ApiParam("匹配值") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 86c3aef..2a285ea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -44,6 +44,10 @@ public class MesShift extends BaseBean { @ApiParam("开班时间") private String startTime; + @Column(name = "END_TIME") + @ApiParam("下班时间") + private String endTime; + @Column(name = "WORK_TIMES") @ApiParam("作业时长") private Double workTimes; 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 9b67963..a9c0fd4 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 @@ -1700,10 +1700,10 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesProductEncodeCfg.getMatchValue(), "matchValue", packBean); } if (!StringUtils.isEmpty(mesProductEncodeCfg.getCodeType())) { - DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getCodeType(), "codeType", packBean); + DdlPreparedPack.getNumEqualPack(mesProductEncodeCfg.getCodeType(), "codeType", packBean); } if (!StringUtils.isEmpty(mesProductEncodeCfg.getMatchType())) { - DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getMatchType(), "matchType", packBean); + DdlPreparedPack.getNumEqualPack(mesProductEncodeCfg.getMatchType(), "matchType", packBean); } if (!StringUtils.isEmpty(mesProductEncodeCfg.getRuleCode())) { DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getRuleCode(), "ruleCode", 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-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index c23700e..dae7847 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsPart; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,4 +42,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { * 供应商批次 */ public String dateCode; + + @ApiParam(value = "物料信息") + public WmsPart wmsPart; } 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-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 79dfe71..e5063c6 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -82,7 +82,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); return ddlPackBean; } 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/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index d204e7e..591b77b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -104,7 +104,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; /** @@ -112,7 +112,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "IS_FREE") @ApiParam(value = "是否免费", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isFree; @Column(name = "REMARK") @@ -176,25 +176,25 @@ public class WmsDocMovementDetails extends BaseBean { public Double inputMoveQty; @Transient - @ApiParam(value ="标准包装",example = "1") + @ApiParam(value = "标准包装", example = "1") private Double snp; @Transient - @ApiParam(value ="条码总数量",example = "1") + @ApiParam(value = "条码总数量", example = "1") private Double detailsSnCount; @Transient - @ApiParam(value ="余数",example = "1") + @ApiParam(value = "余数", example = "1") private Double restQty; @Transient @ApiParam("任务状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") private Integer isTask; @Transient @ApiParam("主表单据状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer orderMasterStatus; @Transient @@ -206,17 +206,33 @@ public class WmsDocMovementDetails extends BaseBean { return recommondLot == null ? "无" : this.recommondLot; } - public Double getQty() {return qty == null ? 0D : this.qty.doubleValue(); } + public Double getQty() { + return qty == null ? 0D : this.qty.doubleValue(); + } + + public Double getOutQty() { + return outQty == null ? 0D : this.outQty.doubleValue(); + } - public Double getOutQty() {return outQty == null ? 0D : this.outQty.doubleValue(); } + public Double getPickQty() { + return pickQty == null ? 0D : this.pickQty.doubleValue(); + } - public Double getPickQty() {return pickQty == null ? 0D : this.pickQty.doubleValue(); } + public Double getActualQty() { + return actualQty == null ? 0D : this.actualQty.doubleValue(); + } - public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); } + public Double getRecQty() { + return recQty == null ? 0D : this.recQty.doubleValue(); + } - public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();} + public Integer getIsTaskVal() { + return isTask == null ? 0 : this.isTask.intValue(); + } - public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); } + public Integer getOrderMasterStatus() { + return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); + } @Version @Column(name = "LOCK_VERSION") @@ -229,7 +245,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") public Integer busiType; @Column(name = "IS_SN") 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/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/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index c39a72c..3bef737 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -47,7 +47,7 @@ public class WmsPackageSpec extends BaseBean { @Column(name = "SPEC_LEVEL") @ApiParam(value = "规格层级") - private String specLevel; + private Integer specLevel; @Column(name = "IS_MIXED") @ApiParam(value = "是否混包") 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 f4c6c39..aaf250d 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 @@ -142,6 +142,10 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "最晚收货时间") public String latestReceTime; + @Column(name = "FIX_LOT_NO", nullable = false) + @ApiParam(value = "特殊批次") + private String fixLotNo = ""; + public WmsPoSn(){} public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){ 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 e120ba0..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 @@ -61,6 +61,16 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目标存储区" , example = "2") private String destZoneNo; + @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; @@ -69,10 +79,6 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目标交易类型" , example = "1") private String destTransTypeCode; - @Column(name = "SRC_OP_TYPE_CODE") - @ApiParam(value = "源作业类型" , example = "2") - private String srcOpTypeCode; - @Column(name = "SRC_TRANS_TYPE_CODE") @ApiParam(value = "源交易类型" , example = "1") private String srcTransTypeCode; 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 75b3400..d405adc 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,7 +208,16 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); - DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", 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.getNotOrIsNull(numList, "priorRC", result); + }else{ + DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); + } + // 查询计划时间在指定范围的单号，查询这些单号的数据 if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { @@ -1511,7 +1520,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "sn", 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);