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 527cbea..1d24b39 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 @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_ASSIST_RESOURCE_SET_TIME") @Api("副资源设置时间") public class AssistResourceSetTime extends BaseAPS { + private static final long serialVersionUID = 901172392855536686L; @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) 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 7c2d0ac..e87a86a 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 @@ -34,6 +34,7 @@ import java.util.List; @ExcludeImportExport @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class BaseOrder extends BaseAPS { + private static final long serialVersionUID = -2571085172798608026L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) 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 a0f6d02..0142e58 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 @@ -24,6 +24,7 @@ import javax.persistence.MappedSuperclass; @Api("规则参数基类") @ExcludeImportExport public class BaseRule extends BaseAPS { + private static final long serialVersionUID = -1818853814377611968L; @Column(name="CODE") @ApiParam(value ="规则编码") @FieldAnnotation(popSearch = true, mainkey = true) 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 23159bc..5dc8c0c 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 @@ -22,6 +22,7 @@ import javax.persistence.Table; @Table(name = "APS_CANCEL_PLAN_RULE") @Api("取消计划规则") public class CancelPlanRule extends BaseRule { + private static final long serialVersionUID = 2674055522875545446L; @Column(name="WORK_FILTERS") @ApiParam(value ="工作筛选") private String workFilters; 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 aa07354..0d537d2 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 @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_DATA_LINK") @Api("数据集成数据连接信息") public class DataLink extends BaseAPS { + private static final long serialVersionUID = 8324774871058505466L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(notEmpty = true) 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 acdf7e4..c6dc31a 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("班次") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class DayShift extends BaseAPS { + private static final long serialVersionUID = 7964370027924366093L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) 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 156673e..ea42942 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 @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_DYNAMIC_SET_TIME") @Api("动态设置时间") public class DynamicSetTime extends BaseAPS { + private static final long serialVersionUID = -1696499471488104793L; @Column(name="RES_CODE") @ApiParam(value ="资源代码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) 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 31196db..e859fe8 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 @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("数据导出明细") public class ExportDetail extends BaseAPS { + private static final long serialVersionUID = -8898414164032180539L; @Column(name="OUT_NAME") @ApiParam(value ="外部表名") private String outName; 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 8183437..bf6ca40 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 @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_EXPORT_PROJECT") @Api("数据导出明细集合") public class ExportProject extends BaseAPS { + private static final long serialVersionUID = -7281303629295174330L; @Column(name="NAME") @ApiParam(value ="标识名") private String name; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java index 5ffa2de..cff475c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -23,6 +23,7 @@ import javax.persistence.Table; @Table(name = "APS_EXPRESSION_RECORD") @Api("表达式记录") public class ExpressionRecord extends BaseAPS { + private static final long serialVersionUID = 4038954046132896632L; @Column(name="BEAN_NAME") @ApiParam(value ="表名") private String beanName; 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 194075b..b8ed589 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 @@ -35,6 +35,7 @@ import java.sql.JDBCType; @Api("字段信息") @ExcludeImportExport public class FieldInfo extends BaseAPS { + private static final long serialVersionUID = -6195036426929675850L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) 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 00ba1ea..9a6c5e3 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 @@ -24,6 +24,7 @@ import javax.persistence.Table; @Table(name = "APS_FIELD_SET_RULE") @Api("属性赋值规则") public class FieldSetRule extends BaseRule { + private static final long serialVersionUID = 6880145972942618559L; @Column(name="BEAN") @ApiParam(value ="实体名") private ApsEnumUtil.FIELD_SET_BEAN bean; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java index 0d5f15e..57deab2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java @@ -31,6 +31,7 @@ import javax.validation.constraints.Min; @Api("炉容量") public class FurnaceCapacity extends BaseAPS { + private static final long serialVersionUID = -5657804042629460659L; @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index 9d8340d..ed046aa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -32,6 +32,7 @@ import java.util.List; @Api("炉资源计划") public class FurnacePlan extends BaseAPS { + private static final long serialVersionUID = 6816465736285211114L; @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") @ApiParam(value ="已占用的能力") private Double capacity; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java index 40835b2..d31c13f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("组炉设置") public class FurnaceSetting extends BaseAPS { + private static final long serialVersionUID = -4566911526487268870L; @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) 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 4199073..58997dc 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 @@ -24,6 +24,7 @@ import javax.persistence.Table; @Table(name = "APS_HEURISTIC_RULE") @Api("排程运算规则") public class HeuristicRule extends BaseRule { + private static final long serialVersionUID = -4856714428377308150L; @Column(name="WORK_FILTER") @ApiParam(value ="工作筛选") private String workFilter; 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 0eaaeaa..ecb13e1 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("数据导入明细") public class ImportDetail extends BaseAPS { + private static final long serialVersionUID = 1264030397500660450L; @Column(name="OUT_NAME") @ApiParam(value ="外部表名") private String outName; 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 6cc2b67..35aaf50 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 @@ -28,6 +28,7 @@ import java.util.List; @Table(name = "APS_IMPORT_PROJECT") @Api("数据导入明细集合") public class ImportProject extends BaseAPS { + private static final long serialVersionUID = -1899074765155621438L; @Column(name="NAME") @ApiParam(value ="标识名") private String name; 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 741324f..8fab6d1 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 @@ -26,6 +26,7 @@ import javax.persistence.Table; @Table(name = "APS_INVENTORY") @Api("库存") public class Inventory extends BaseOrder { + private static final long serialVersionUID = 2378846162007550439L; @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; 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 95baac0..a8a491e 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 @@ -24,6 +24,7 @@ import javax.persistence.Table; @Table(name = "APS_MAT_CALC_RULE") @Api("物料运算规则") public class MatCalcRule extends BaseRule { + private static final long serialVersionUID = 2102986260688118982L; @Column(name="MATERIAL_FILTER") @ApiParam(value ="物料筛选") private String materialFilter; 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 7c7c313..effc70e 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 @@ -34,6 +34,7 @@ import java.util.List; @Api("物料") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Material extends BaseAPS { + private static final long serialVersionUID = -7928225487946173108L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) 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 e362742..779b527 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 @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_MATERIAL_SET_TIME") @Api("物料设置时间") public class MaterialSetTime extends BaseAPS { + private static final long serialVersionUID = -7996431489447641539L; @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) 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 11cedff..2d389fa 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 @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_OPER_INPUT") @Api("工序输入") public class OperInput extends BaseAPS { + private static final long serialVersionUID = 6653235155693766804L; @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) 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 476d45b..e17e69d 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 @@ -28,6 +28,7 @@ import java.util.List; @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") public class OperOutput extends BaseAPS { + private static final long serialVersionUID = 3185682762290147209L; @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) 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 b6923c0..e054949 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 @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_OPER_RESOURCE") @Api("工序资源") public class OperResource extends BaseAPS { + private static final long serialVersionUID = -8683889582369342606L; @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) 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 274574b..218f7f3 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 @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_OPERATION") @Api("工序") public class Operation extends BaseAPS { + private static final long serialVersionUID = 4394179144091116858L; @Column(name="NUMBER") @ApiParam(value ="工序号") @FieldAnnotation(notEmpty = true) 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 0c6a9a5..b5dad6b 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 @@ -24,6 +24,7 @@ import java.util.Date; @Api("订单树") @ExcludeImportExport public class OrderTree extends BaseAPS { + private static final long serialVersionUID = -7505923374791695738L; @ApiParam(value ="物料编码") private String material; 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 0281199..2c394a3 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 @@ -26,6 +26,7 @@ import java.util.Date; @Table(name = "APS_OVERTIME_CALENDAR") @Api("加班日历") public class OvertimeCalendar extends BaseAPS { + private static final long serialVersionUID = -501715721073189464L; @Column(name="RES_CODES") @ApiParam(value ="资源代码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) 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 9756426..6fbd9d1 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 @@ -32,6 +32,7 @@ import java.util.List; @Api("父工作") @ExcludeImportExport public class ParentWork extends BaseAPS { + private static final long serialVersionUID = 8792781216193806606L; @Column(name="count", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") private Double count; 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 860e0a3..8855d00 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 @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("工作反馈") public class PlanFeedback extends BaseAPS { + private static final long serialVersionUID = 2520555825093741381L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(property = false) 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 37548d8..dee531b 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 @@ -30,6 +30,7 @@ import java.util.List; @Table(name = "APS_PRODUCT_ORDER") @Api("生产订单") public class ProductOrder extends BaseOrder { + private static final long serialVersionUID = 6900226668783662736L; @Column(name="EST") @ApiParam(value ="最早开始时间") private Date est; 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 06ac508..a109c6a 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 @@ -33,6 +33,7 @@ import java.util.List; @Api("工艺路线") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ProductRouting extends BaseAPS { + private static final long serialVersionUID = 4905294866468216722L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) 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 b6687d9..bee905c 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 @@ -27,6 +27,7 @@ import javax.persistence.Table; @Table(name = "APS_PURCHASE_ORDER") @Api("采购订单") public class PurchaseOrder extends BaseOrder { + private static final long serialVersionUID = 4699381603433121631L; @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; 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 96de9d2..d37f81a 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 @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_RES_CALENDAR") @Api("日历") public class ResCalendar extends BaseAPS { + private static final long serialVersionUID = 8338930205816433211L; @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) 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 515cd7b..7733715 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 @@ -33,6 +33,7 @@ import java.util.List; @Api("资源") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Resource extends BaseAPS { + private static final long serialVersionUID = 3304084329600816457L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) 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 df02228..31fb91b 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @ExcludeImportExport public class RuleDetail extends BaseAPS { + private static final long serialVersionUID = -6433950357039396107L; @Column(name="TYPE") @ApiParam(value ="规则类型") private ApsEnumUtil.RULE_TYPE type; 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 85b3191..28e424e 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 @@ -29,6 +29,7 @@ import java.util.List; @Api("规则组合") @ExcludeImportExport public class RuleGroup extends BaseAPS { + private static final long serialVersionUID = 4741897751041891075L; @Column(name="CODE") @ApiParam(value ="编码") private String code; 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 d973fb4..7baa32a 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 @@ -28,6 +28,7 @@ import java.util.Date; @Table(name = "APS_SALES_ORDER") @Api("销售订单") public class SalesOrder extends BaseOrder { + private static final long serialVersionUID = -511784925441907538L; @Column(name="LOW_EST") @ApiParam(value ="底阶最早开始时间") private Date lowEst; 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 fbe37f0..6d0f976 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 @@ -26,6 +26,7 @@ import javax.persistence.Table; @ExcludeImportExport public class SerialNumber extends BaseAPS { + private static final long serialVersionUID = 312483211086701109L; @Column(name="NUMBER") @ApiParam(value ="流水号") private Integer number; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index 6b83309..bc0ec95 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 @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("运输时间") public class ShippingTime extends BaseAPS { + private static final long serialVersionUID = -8698904420363808737L; @Column(name="PREV_RES_CODE") @ApiParam(value ="前资源编码") @FieldAnnotation(relation = "PrevRes") 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 b24c7aa..48ace75 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 @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("标准工序") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class StandOperation extends BaseAPS { + private static final long serialVersionUID = -6869403951765771775L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) 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 2a24fcb..669df55 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 @@ -26,6 +26,7 @@ import java.util.Date; @Table(name = "APS_SYS_PARAM") @Api("系统参数") public class SysParam extends BaseAPS { + private static final long serialVersionUID = 3115620726438869596L; @Column(name="BASE_TIME") @ApiParam(value ="基准时间") private Date baseTime; 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 472b69c..9b898b5 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 @@ -34,6 +34,7 @@ import java.util.List; @Api("工作") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Work extends BaseAPS { + private static final long serialVersionUID = 6471740978550523187L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true, modify = 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 94e1a71..4390af5 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 @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_WORK_INPUT") @Api("工作输入") public class WorkInput extends BaseAPS { + private static final long serialVersionUID = 2654389476284740183L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") 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 ef453ce..7f04aba 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 @@ -31,6 +31,7 @@ import java.util.List; @Api("工作输出") public class WorkOutput extends BaseAPS { + private static final long serialVersionUID = 6031001499619328313L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 455ae2c..53c1be7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -35,6 +35,7 @@ import java.util.List; @Api("工作计划") public class WorkPlan extends BaseAPS { + private static final long serialVersionUID = 5489548115780676195L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") 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 1bfbecf..607a948 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("工作关联") public class WorkRelation extends BaseAPS { + private static final long serialVersionUID = -5824884364328962956L; @Column(name="MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(relation = "Material", modify = false) 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 795117a..727c9a2 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 @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("工作资源") public class WorkResource extends BaseAPS { + private static final long serialVersionUID = 4791940404968841144L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") 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 96ba229..9c98bdb 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 @@ -25,6 +25,7 @@ import java.util.HashMap; @MappedSuperclass @ExcludeImportExport public abstract class BaseAPS extends BaseBean { + private static final long serialVersionUID = -8638842158403944318L; @JsonIgnore @Lob @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index c2732ee..58d22b3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -19,7 +19,7 @@ public class AndonEnumUtil { public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE { INNER(10, "内部处理"), OUTER(20, "外部处理"), - REVIEW(30, "人工审核"); + REVIEW(30, "人工确认"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 62b5ceb..b43dcc8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2519,4 +2519,12 @@ public class CommonEnumUtil { return tmp; } } + + /** + * 业务表：库存条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DYNAMIC_DATA_SOURCE_TYPE { + MASTER,NODE + } } 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 b6f8338..d115557 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 @@ -6148,4 +6148,50 @@ public class MesEnumUtil { return valueOf(val); } } + + /** + * 盲检类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOPIC_TYPE { + COLOUR(10, "颜色"), + GRADE(20, "等级"), + TO_CONFIGURE(30, "配置"); + + private int value; + private String description; + + TOPIC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + 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; + } + } } 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 534547d..abd8d53 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 @@ -612,6 +612,16 @@ public class MesPcnEnumUtil { return tmp; } + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + public static MES_MATCH_TYPE getByValue(int value) { for (MES_MATCH_TYPE mesMatchType : values()) { if (mesMatchType.getValue() == value) { @@ -2555,6 +2565,7 @@ public class MesPcnEnumUtil { CUSTOM_DIALOG("custom_dialog", "定制弹窗"), FORM("form", "文本按钮"), SPEC_TEXT("spec_text", "工步弹框文本"), + IMAGE_LIST("image_list", "图片列表"), SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"); private String value; @@ -4043,4 +4054,96 @@ public class MesPcnEnumUtil { } } + + /** + * 盲检类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOPIC_TYPE { + COLOUR(10, "零件颜色"), + GRADE(20, "等级"), + TO_CONFIGURE(30, "配置"); + + private int value; + private String description; + + TOPIC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + 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 STOP_MACHINE_TYPE { + TIMER_TIME_OUT(10, "计时器超时停机"), + DELAY_HELP(20, "延时帮助停机"), + URGENT_STOP(30, "急停停机"); + + private int value; + private String description; + + STOP_MACHINE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 8791cb5..679e650 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -14,6 +14,83 @@ import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_ public class PtlPcnEnumUtil { /** + * 状态机异常处理方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE { + INNER(10, "内部处理"), + OUTER(20, "外部处理"), + REVIEW(30, "人工确认"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 状态机异常处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS { + TRUE(10, "已处理"), + FALSE(20, "未处理"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 状态机异常缓存标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG { + FALSE(10, "否"), + TRUE(20, "是"), + ORIGINAL(30, "原先"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 控制器状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index dbf14e7..a427d3a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -589,7 +589,8 @@ public class SwebEnumUtil { UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), - LOADING_ORDER(530, "LOADING_ORDER", "装车单"); + LOADING_ORDER(530, "LOADING_ORDER", "装车单"), + SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"); private int value; private String code; private String description; 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 5fcd724..56d90d9 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 @@ -725,7 +725,8 @@ public class WmsEnumUtil { UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), - LOADING_ORDER(530, "LOADING_ORDER", "装车单"); + LOADING_ORDER(530, "LOADING_ORDER", "装车单"), + SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"); private int value; private String code; private String description; @@ -7397,4 +7398,153 @@ public class WmsEnumUtil { return null; } } + + /** + * 库位利用率 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCATE_PROPORTION { + ZERO(10, "ZERO", "0%"), + GENERAL(20, "GENERAL", "0%-30%"), + MEDIUM(30, "MEDIUM", "30%-60%"), + WELL(40, "WELL", "60%-100%"); + + private int value; + private String code; + private String description; + + LOCATE_PROPORTION(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static LOCATE_PROPORTION codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * BH同步标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_SUMMARY_IS_SYNC { + INIT(10, "INIT", "初始化"), + WAIT_SYNC(20, "WAIT_SYNC", "待同步"), + FINISH_SYNC(30, "FINISH_SYNC", "已同步"); + + private int value; + private String code; + private String description; + + BH_SUMMARY_IS_SYNC(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static BH_SUMMARY_IS_SYNC codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java new file mode 100644 index 0000000..fb1dcd3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :停机记录表 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-03 15:38 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_AGV_STOP_RECORD") +@Api("MES_停机记录表") +public class MesAgvStopRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182851767690154L; + @Column(name = "STOP_TYPE") + @ApiParam("停机类型") + private Integer stopType; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "STOP_START_TIME") + @ApiParam("停机开始时间") + private String stopStartTime; + + @Column(name = "STOP_END_TIME") + @ApiParam("停机结束时间") + private String stopEndTime; + + @Column(name = "STOP_REASON") + @ApiParam("停机原因") + private String stopReason; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java index cba882b..2f35bf8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java @@ -60,4 +60,8 @@ public class MesBlindHistory extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; + @Transient + @ApiParam("主队列编号") + private String orderNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java index 1d8bdde..147e91c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -62,4 +63,8 @@ public class MesBlindRule extends BaseBean implements Serializable { @ApiParam("零件颜色") private String partColor; + @Transient + @ApiParam("零件颜色") + private String rightKey; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java index 91ddc09..b82bbae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java @@ -51,7 +51,7 @@ public class MesBlindTopicSetting extends BaseBean implements Serializable { private Integer topicType; @Column(name = "QTY") - @ApiParam("答案数量") + @ApiParam("错误答案数量") private Integer qty; @Column(name = "WORK_CELL_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index fddbb26..cb0f1b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -44,6 +44,10 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("缺陷类型") private String defectType; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + @Transient @ApiParam("缺陷类型名称") private String defectTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 61a2dc8..90a96f1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -112,6 +112,9 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料零件名称") private String itemPartName; + @ApiParam("生产队列号") + private String orderNo; + public int getIsFeedVal() { return this.isFeed == null ? 0 : this.isFeed; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java index be8e632..5bcc4c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -81,4 +82,12 @@ public class MesProdModelCfg extends BaseBean implements Serializable { @Column(name = "PROCESS_LABEL_TEMPLATE") @ApiParam("过程标签模板") private String processLabelTemplate; + + @Transient + @ApiParam("产品颜色") + private String produceColor; + + @Transient + @ApiParam("Vin") + private String vinCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 26afb75..126dda8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -100,6 +100,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("发运时间") private String deliveryDate; + @Column(name = "CUST_DELIVERY_LOCATION") + @ApiParam("客户发往地") + private String custDeliveryLocation; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 57687ae..bd996b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("队列类型名称") private String queueTypeName; + @Transient + @ApiParam("产品颜色") + private String colorName; + public int getStatusVal() { return this.status == null ? 0 : this.status; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java index 6fe17fb..a37e754 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java @@ -99,7 +99,7 @@ public class MesInterfaceDataMapper extends BaseBean { /** * 接口分组名称 - * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS + * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS,WMS2MES */ @Column(name = "GROUP_NAME") public String groupName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java new file mode 100644 index 0000000..3620dd2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class DefectTypeModel implements Serializable { + + // 缺陷/维修 + @ApiParam("业务类型") + private String busiType; + + @ApiParam("List结果集") + private List resultList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 28b8235..c130f5b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -82,6 +82,12 @@ public class GenSerialNoModel { @ApiParam("当前编号") private String currentNumber; + @ApiParam("物料类型3") + private String categoryCode3; + + @ApiParam("零件号后4位") + private String partNoAfterFour; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java index af48ce8..01e2d64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java @@ -32,4 +32,11 @@ public class MesBlindProbleModel extends BaseBean { @ApiParam(value = "正确答案") private String rightKey; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam("序号") + private String topicId; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java new file mode 100644 index 0000000..247288e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RepairAndDefectModel implements Serializable { + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("面位") + private String sideLocation; + + @ApiParam("维修状态") + private Integer repairStatus; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("维修代码") + private String repairCode; + + @ApiParam("维修名称") + private String repairName; + + @ApiParam("缺陷原因代码") + private String dcCode; + + @ApiParam("缺陷原因描述") + private String dcName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java new file mode 100644 index 0000000..6fe1eaf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ScatterBomModel implements Serializable { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("个数") + private Double qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java new file mode 100644 index 0000000..1f6afc7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class SkinCheckModel implements Serializable { + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("生产号") + private String vinCode; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("车型") + private String prodCfgTypeCode; + + @ApiParam("等级") + private String gradeCode; + + @ApiParam("面位") + private String sideLocation; + + // 产品位置图片 + private List produceCtgyPictureList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java new file mode 100644 index 0000000..4acb5ea --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.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.MesAgvStopRecord; + +/** + * @Description: 停机记录数据操作层 + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020\06\03 10:34 + * @Modify: + **/ +public interface MesAgvStopRecordRepository 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 7ba5be9..07ac37c 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 @@ -2888,28 +2888,29 @@ public class MesHqlPack { return result; } -// public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) { -// DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode()); -// DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean); -// DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean); -// DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean); -// DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean); -// DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean); -// DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean); -// DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean); -// DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean); -// return packBean; -// } - -// public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) { -// DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode()); -// DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode()", packBean); -// DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean); -// DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean); -// DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean); -// DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean); -// return packBean; -// } + public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) { + DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean); + DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) { + DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getTopicType(), "topicType", packBean); + DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean); + return packBean; + } /** * MES 校枪记录 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 6c67531..ce8771b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -10,6 +10,9 @@ import cn.estsh.i3plus.pojo.mes.bean.*; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import java.util.ArrayList; +import java.util.List; + /** * @Description: * @Reference: Mes 条件封装 @@ -541,4 +544,58 @@ public class MesPcnHqlPack { return packBean; } + /** + * 得到分页后的数据 + * + * @return 分页数据 + */ + public static List getPage(List totalList, int currentPage, int pageSize, int totalPage) { + if (currentPage <= 0) { + currentPage = 1; + } + + if (currentPage >= totalPage) { + currentPage = totalPage; + } + + List subList = new ArrayList<>(); + if (null != totalList) { + subList.addAll(totalList.subList(getStartIndex(totalList, currentPage, pageSize, totalPage), + getEndIndex(totalList, currentPage, pageSize, totalPage))); + } + + return subList; + } + + private static int getStartIndex(List totalList, int currentPage, int pageSize, int totalRecord) { + if (null == totalList) { + return 0; + } + int startIndex = (currentPage - 1) * pageSize; + if (startIndex > totalRecord) { + startIndex = totalRecord; + } + if (startIndex < 0) { + startIndex = 0; + } + return startIndex; + } + + private static int getEndIndex(List totalList, int currentPage, int pageSize, int totalRecord) { + if (null == totalList) { + return 0; + } + int endIndex = getStartIndex(totalList, currentPage, pageSize, totalRecord) + pageSize; + if (endIndex < 0) { + endIndex = 0; + } + if (endIndex < getStartIndex(totalList, currentPage, pageSize, totalRecord)) { + endIndex = getStartIndex(totalList, currentPage, pageSize, totalRecord); + } + if (endIndex > totalRecord) { + endIndex = totalRecord; + } + return endIndex; + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java new file mode 100644 index 0000000..2244887 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-29 下午3:40 + * @Modify: + **/ +@Data +public class ThreadModel implements Serializable { + + @ApiParam(value ="自定义调用ID") + private Long requestId; + @ApiParam(value ="当前用户ID") + private Long userId; + @ApiParam(value ="当前用户名称") + private String userName; + @ApiParam(value ="用户登录IP") + private String userHost; + @ApiParam(value ="用户登录浏览器") + private String userBrowser; + @ApiParam(value ="用户登录操作系统") + private String userOs; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java new file mode 100644 index 0000000..3dbf05e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Mes电检检测实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-01 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class MesElectricDataModel implements Serializable { + + private static final long serialVersionUID = -6376845639646546495L; + + @ApiParam(value = "车型") + public String carType; + + @ApiParam(value = "颜色代码") + public String colorCode; + + @ApiParam(value = "日期时间") + private String dateTime; + + @ApiParam(value = "生产序号") + private String productSeq; + + @ApiParam(value = "车型信息") + private String carTypeInfo; + + @ApiParam(value = "生产模式") + private String productModel; + + @ApiParam(value = "产品生产号") + private String productNumber; + + @ApiParam(value = "备用") + private String spare; + + @ApiParam(value = "所有零件信息包括所有选配信息") + private String other; + + @ApiParam(value = "电检结果") + private String electricResult; + + @ApiParam(value = "文件名称") + private String ftpFileName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java new file mode 100644 index 0000000..70d7af5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : Mes电检检测补录数据实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-02 09:53 + * @Modify: + **/ +@Data +public class MesElectricMarkUpDataModel implements Serializable { + + private static final long serialVersionUID = -6376845779646546495L; + + @ApiParam(value = "工作中心代码") + public String workCenterCode; + + @ApiParam(value = "工作单元代码") + public String workCellCode; + + @ApiParam(value = "过程条码") + private String serialNumber; + + @ApiParam(value = "产品生产号") + private String productNumber; + + @ApiParam(value = "电检结果") + private String electricResult; + + @ApiParam(value = "测试时间") + private String testDateTime; + + @ApiParam(value = "是否补录") + private Integer isMarkUp; + + @ApiParam(value = "补录时间") + private String markUpDateTime; + + @ApiParam(value = "开始时间") + private String startDateTimeStr; + + @ApiParam(value = "结束时间") + private String endDateTimeStr; + + public MesElectricMarkUpDataModel(String workCenterCode, String workCellCode, String serialNumber, String productNumber, + String electricResult, String testDateTime, Integer isMarkUp, String markUpDateTime) { + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.serialNumber = serialNumber; + this.productNumber = productNumber; + this.electricResult = electricResult; + this.testDateTime = testDateTime; + this.isMarkUp = isMarkUp; + this.markUpDateTime = markUpDateTime; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java new file mode 100644 index 0000000..d3c3112 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-02 9:27 + * @Modify: + **/ +@Data +public class WmsLocateModel implements Serializable { + + private static final long serialVersionUID = 2433931236774158401L; + + @ApiParam(value = "箱数") + public Long snBoxQty; + + @ApiParam(value = "最大包装数量") + public Integer maxPackageQty; + + @ApiParam(value = "库位利用率值") + public Double proportionValue; + + @ApiParam(value = "库位代码") + public String locateNo; + + @ApiParam(value = "库位名称") + public String locateName; + + @ApiParam(value = "存储区代码") + public String zoneNo; + + @ApiParam(value = "存储区名称") + public String zoneName; + + @ApiParam(value = "仓库代码") + public String whNo; + + @ApiParam(value = "仓库名称") + public String whNoName; + + @ApiParam(value = "组织代码") + public String organizeCode; + + @ApiParam(value = "库位利用率查询") + public Integer proportion; + + @ApiParam(value = "库位利用率") + public String proportionValueStr; + + public WmsLocateModel() { + } + + public WmsLocateModel(Long snBoxQty, Integer maxPackageQty, Double proportionValue, + String locateNo, String locateName, String zoneNo, + String zoneName, String whNo, String whNoName, String organizeCode) { + this.snBoxQty = snBoxQty; + this.maxPackageQty = maxPackageQty; + this.proportionValue = proportionValue; + this.locateNo = locateNo; + this.locateName = locateName; + this.zoneNo = zoneNo; + this.zoneName = zoneName; + this.whNo = whNo; + this.whNoName = whNoName; + this.organizeCode = organizeCode; + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index b9e2fea..da9d71f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -47,6 +47,7 @@ public class SysLogConsole extends BaseBean { @Column(name="LOG_PID") @ApiParam(value ="应用PID") + @JsonSerialize(using = ToStringSerializer.class) private Long logPid; @Column(name="LOG_PORT") @@ -89,6 +90,10 @@ public class SysLogConsole extends BaseBean { private String userLoginName; /******** 日志信息 ********/ + @Column(name="REQUEST_ID") + @ApiParam(value ="请求ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long requestId; @Column(name="EXECUTE_THREAD_ID") @ApiParam(value ="执行线程") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java index ec94e86..1795f20 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -56,9 +55,16 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable @ApiParam(value = "缓存标识") private Integer cacheFlag; - @Lob - @Column(name = "CONTENT") - @ApiParam(value = "内容") - private String content; + @Column(name = "CACHE_KEY") + @ApiParam(value = "缓存KEY") + private String cacheKey; + + @Column(name = "HANDLE_TYPE") + @ApiParam(value = "处理方式") + private Integer handleType; + + @Column(name = "HANDLE_STATUS") + @ApiParam(value = "处理状态") + private Integer handleStatus; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index c079dc1..249a802 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -48,7 +48,10 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("外部触发事件") private String triggerEvent; - @ApiModelProperty("流程类型") - private Integer routeType; + @ApiModelProperty("缓存KEY") + private String cacheKey; + + @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") + private boolean errorInnerAction = false; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java new file mode 100644 index 0000000..05eb399 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_CSS_STYLE") +@Api(value="自定义样式") +public class BrCssStyle extends BaseBean { + + private static final long serialVersionUID = 8651392479116992679L; + + @Column(name="STYLE_CODE") + @ApiParam(value ="样式编码") + private String styleCode; + + @Column(name="STYLE_CONTENT") + @ApiParam(value ="样式内容") + private String styleContent; + + @Column(name="STYLE_DESCRIPTION") + @ApiParam(value ="样式描述") + private String styleDescription; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java new file mode 100644 index 0000000..6123774 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrCssStyle; +import cn.estsh.i3plus.pojo.report.bean.BrElement; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface BrCssStyleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index b06be17..a515e18 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -109,7 +109,7 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "是否推送MQ") private Integer isPushMQ; - @Column(name = "RESULT_SOFT_TYPE") + @Column(name = "RESULT_SOFT_TYPE",columnDefinition = "int default 0") @ApiParam(value = "同步调用微服务") private Integer resultSoftType; public String getResultSoftTypeTxt() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 184bdff..edb96e4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -113,6 +113,16 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemSeqNo; + @Column(name = "BOM_TYPE") @ApiParam(value = "BOM类型") 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 5398ffd..028c43f 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 @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -156,6 +158,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "任务生成数量", example = "1") private Double taskGenerateQty; + @Column(name = "PRINT_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "剩余打印数量") + private Double printGenerateQty; + @Column(name = "SRC_AREA_NO") @ApiParam("源库存地代码") public String srcAreaNo; @@ -184,6 +191,22 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "销售单据号") private String soOrderNo; + @Column(name = "MEL_TYPE") + @ApiParam(value = "材料类型") + private String melType; + + @Column(name = "PROJECT_NO") + @ApiParam(value = "项目号") + private String projectNo; + + @Column(name = "PRODUCTION_GROUP") + @ApiParam(value = "生产小组") + private String productionGroup; + + @Column(name = "CUST_PART_NO") + @ApiParam(value = "客户零件号") + private String custPartNo; + @Transient @ApiParam(value = "替代物料编码") private String subPartNo; @@ -324,6 +347,11 @@ public class WmsDocMovementDetails extends BaseBean { public Integer isSn; + @Column(name = "REF_SRC") + @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refSrc; + public WmsDocMovementDetails () { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 5128c4e..81578e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -188,30 +188,6 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "QAD发运单据类型") private String erpSrcType; - @Transient - @ApiParam(value = "发运单号") - private String shipOrderNo; - - @Transient - @ApiParam(value = "打印时间") - private String printDate; - - @Transient - @ApiParam("类型名称") - public String busiTypeName; - - @Transient - @ApiParam("物料编号") - public String partNo; - - @ApiParam(value = "标题") - @Transient - public String title; - - @Transient - @ApiParam("物料编号组") - public String[] partNos; - @ApiParam("是否正常运输") @Column(name = "IS_NORMAL_TRANSPORTATION") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") @@ -230,7 +206,7 @@ public class WmsDocMovementMaster extends BaseBean { //正常运输 和非正常运输 @Column(name = "BUSINESS_TYPE") - @ApiParam(value = "业务类型") + @ApiParam(value = "运输方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) private Integer businessType; @@ -242,11 +218,36 @@ public class WmsDocMovementMaster extends BaseBean { private Integer isTransportationCreation; @Column(name = "IS_GOOD_PRODUCT") - @ApiParam(value = "运输信息创建") + @ApiParam(value = "是否良品") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) private Integer isGoodProduct; + @Transient + @ApiParam(value = "发运单号") + private String shipOrderNo; + + @Transient + @ApiParam(value = "打印时间") + private String printDate; + + @Transient + @ApiParam("类型名称") + public String busiTypeName; + + @Transient + @ApiParam("物料编号") + public String partNo; + + @ApiParam(value = "标题") + @Transient + public String title; + + @Transient + @ApiParam("物料编号组") + public String[] partNos; + + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index b9bb342..efdb745 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -175,6 +175,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", private Integer destBoxQty; @Transient + @ApiParam(value = "库位利用率") + public Integer proportion; + + @Transient @ApiParam(value = "错误信息", example = "-1") private String errorMsg; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java index 1c7a2f8..0f53480 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java @@ -78,6 +78,7 @@ public class WmsLogisticExpenseRecords extends BaseBean { public WmsLogisticExpenseRecords(WmsDocMovementMaster docMovementMaster) { // this.organizeName = docMovementMaster.getorganizeName; this.orderNo = docMovementMaster.getOrderNo(); + this.organizeCode = docMovementMaster.getOrganizeCode(); this.shippingFlag = docMovementMaster.getFlagNo(); this.busiType = docMovementMaster.getBusiType(); this.transportType = docMovementMaster.getTransportType(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java index f2ffc17..711686f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -51,6 +53,11 @@ public class WmsLogisticExpenseRecordsDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; + @Column(name = "PART_UNIT") + @ApiParam(value = "物料单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partUnit; + @Column(name = "unit") @ApiParam(value = "计量单位") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, @@ -77,5 +84,11 @@ public class WmsLogisticExpenseRecordsDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String endTime; - + /** + * 状态:N=正常,C=行取消 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java index 6ae56d3..acc1cb6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java @@ -64,7 +64,7 @@ public class WmsLogisticsCosts extends BaseBean { private String salesUnit; @Column(name = "TRANSPORT_TYPE") - @ApiParam(value = "运输类型") + @ApiParam(value = "运输方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) private Integer transportType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java index 443acee..c641bc9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java @@ -102,6 +102,29 @@ public class WmsLogisticsFreightApproval extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isUrgent; + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String assignSrcWhNo; + + @Column(name = "REMAKE") + @ApiParam("备注") + public String remake; + + @Column(name = "DEST_WH_NO") + @ApiParam("目标仓库代码") + public String assignDestWhNo; + + @Column(name = "FLAG_NO") + @ApiParam(value = "客户发往地编号") + private String flagNo; + + //正常运输 和非正常运输 + @Column(name = "BUSINESS_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") + @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) + private Integer businessType; + public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) { this.orderNo = docMovementMaster.getOrderNo(); this.organizeCode = docMovementMaster.getOrganizeCode(); @@ -114,10 +137,12 @@ public class WmsLogisticsFreightApproval extends BaseBean { this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo(); this.transportType = docMovementMaster.getTransportType(); this.placeOfOriginCode = docMovementMaster.getFlagNo(); -// this.placeOfOriginDesc = placeOfOriginDesc; this.custDeliveryCode = docMovementMaster.getAssignSrcWhNo(); -// this.custDeliveryDesc = custDeliveryDesc; this.isUrgent = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + this.assignSrcWhNo = docMovementMaster.getAssignSrcWhNo(); + this.assignDestWhNo = docMovementMaster.getAssignDestWhNo(); + this.flagNo = docMovementMaster.getFlagNo(); + this.businessType = docMovementMaster.getBusinessType(); } public WmsLogisticsFreightApproval() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 0f8d64f..1f57cde 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -10,7 +10,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单处理成功后的记录，通过监听交易成功队列写入 @@ -191,6 +195,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("是否预收货") public Integer priorRC = 2; + @Column(name = "ERP_SRC_NO") + @ApiParam(value = "ERP单号") + private String erpSrcNo; + @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") @ApiParam(value = "QAD发运单据类型") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java index 793d252..928d2d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java @@ -69,7 +69,7 @@ public class WmsShortLogisticsCosts extends BaseBean { private String logisticsVendorNo; @Column(name = "TRANSPORT_TYPE") - @ApiParam(value = "运输类型") + @ApiParam(value = "运输方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) private Integer transportType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 253c121..ea17689 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -663,7 +663,7 @@ public class WmsStockSn extends BaseBean { String partNameRdd, String shippingFlag, String leftCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.organizeCode = organizeCode; - this.batchNo = partNo; + this.batchNo = batchNo; this.sn = sn; this.workCenterCode = workCenterCode; this.partNo = partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index d8f9637..29121cc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -79,6 +79,10 @@ public class WmsTestResultSummary extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer pickResult; + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description") + public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue(); @Transient @ApiParam("BH类型") @@ -128,8 +132,6 @@ public class WmsTestResultSummary extends BaseBean { this.bhType = bhType; } - public WmsTestResultSummary() { - - } + public WmsTestResultSummary() { } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index befe9e5..4b47141 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -106,10 +106,6 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam("物料编码") private String partNo; - @Transient - @ApiParam("关联单号") - private String refOrderNo; - @Column(name="PATH_URL") @ApiParam("回执单地址") private String pathUrl; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java index bc5e86b..1f49ba2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java @@ -60,9 +60,9 @@ public class WmsTmsShippingExtDetail extends BaseBean { @ApiParam("单位") public String unit; - @Column(name = "ORDER_NO") - @ApiParam("订单号") - public String orderNo; + @Column(name = "REF_ORDER_NO") + @ApiParam("关联单号") + private String refOrderNo; @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") @@ -308,7 +308,6 @@ public class WmsTmsShippingExtDetail extends BaseBean { this.item = docMovementDetails.getItem(); this.qty =docMovementDetails.getQty(); this.unit = docMovementDetails.getUnit(); - this.orderNo = docMovementDetails.getOrderNo(); this.srcWhNo = docMovementDetails.getSrcWhNo(); this.srcZoneNo = docMovementDetails.getSrcZoneNo(); this.srcLocateNo = docMovementDetails.getSrcLocateNo(); @@ -331,6 +330,7 @@ public class WmsTmsShippingExtDetail extends BaseBean { this.destAreaNo = docMovementDetails.getDestAreaNo(); this.lotNo = docMovementDetails.getLotNo(); this.srcItem = docMovementDetails.getSrcItem(); + this.refOrderNo = docMovementDetails.getOrderNo(); this.custOrderNo = docMovementDetails.getCustOrderNo(); this.assignDateCode = docMovementDetails.getAssignDateCode(); this.actualLot = docMovementDetails.getActualLot(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 2541e40..9dfdc8c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -104,7 +104,7 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 接口分组名称 - * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS + * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS,WMS2MES */ @Column(name = "GROUP_NAME") public String groupName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java index e1103b4..2ab29c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java @@ -127,7 +127,6 @@ public class WmsTmsShippingExtModel { this.shippingTime=wmsTmsShippingExt.getCreateDatetime(); this.shippingUser=wmsTmsShippingExt.getCreateUser(); this.defectiveAllocation=wmsTmsShippingExt.getDefectiveAllocation(); - this.refOrderNo=wmsTmsShippingExt.getRefOrderNo(); this.orderDate=wmsTmsShippingExt.getCreateDatetime(); } } 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 cf8d1d1..6d8b3d7 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 @@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; +import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; @@ -3371,6 +3372,22 @@ public class WmsHqlPack { return packBean; } + /** + * 装车单 传输类 + * + * @param model + * @return + */ + public static DdlPackBean packHqlTmsShip(WmsTmsShipDto model) { + + DdlPackBean packBean = WmsHqlPack.packHqlWms(model.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(model.getOrderStatus(), "orderStatus", packBean); + DdlPreparedPack.getStringEqualPack(model.getMoveNo(), "moveNo", packBean); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.FALSE}, + new String[]{"createDatetime"}, packBean); + return packBean; + } /** * BH检测大类表查询条件