diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterPartRelationService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterPartRelationService.java index c02adf4..5046f7c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterPartRelationService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterPartRelationService.java @@ -1,13 +1,12 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCenterPartRelationService; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesPartSap; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenterPartRelation; +import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.repository.MesPartSapRepository; import cn.estsh.i3plus.pojo.mes.repository.MesWorkCenterRepository; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -38,6 +37,13 @@ public class MesWorkCenterPartRelationService extends BaseMesService onBeforeInsertBean(List beanList) { String organizeCode = AuthUtil.getOrganizeCode(); diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index ec95fe4..5e7d99c 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -8,20 +8,11 @@ package cn.estsh.i3plus.ext.mes.pojo.util; * @Modify: **/ public class MesExtConstWords { - //松下工厂代码 - public static final String SX_ORGANIZE_CODE = "CKF1"; - //松下BU - public static final String CK = "CK"; - //松下EP - public static final String CJ = "CJ"; - //嘉兴松下 - public static final String JX = "JX"; + //JOB public static final String JOB = "JOB"; //MES_REDIS public static final String REDIS_MES = "redisMes"; - // 类型代码 - public static final String TYPE_CODE = "typeCode"; // id常量 public static final String ID = "id"; // pid常量 @@ -36,8 +27,6 @@ public class MesExtConstWords { public static final String WORK_CENTER_CODE = "workCenterCode"; // 产线名称 public static final String WORK_CENTER_NAME = "workCenterName"; - // 产线描述 - public static final String WORK_CENTER_DESC = "workCenterDesc"; // 工位常量 public static final String WORK_CELL_CODE = "workCellCode"; // 工位名称 @@ -54,8 +43,6 @@ public class MesExtConstWords { public static final String CREATE_DATE_TIME = "createDatetime"; // 修改时间 public static final String MODIFY_DATE_TIME = "modifyDatetime"; - // 修改时间扩展 - public static final String MODIFY_DATE_TIME_EXT = "modifyDatetimeExt"; // 创建人 public static final String CREATE_USER = "createUser"; // 修改人 @@ -64,50 +51,14 @@ public class MesExtConstWords { public static final String PART_NO = "partNo"; //零件名称 public static final String PART_NAME = "partName"; - //零件名称 - public static final String PART_NAME_RDD = "partNameRdd"; - //零件描述 - public static final String PART_DESC = "partDesc"; - //标准工数 - public static final String STANDARD_WORK = "standardWork"; - //产品编码匹配类型 - public static final String PROCESS_MATCH_TYPE = "processMatchType"; - //产品编码匹配类型 - public static final String PACKAGE_MATCH_TYPE = "packageMatchType"; - //大本体条码匹配类型 - public static final String BIG_PROCESS_MATCH_TYPE = "bigProcessMatchType"; - //本体条码打印张数 - public static final String SN_PRINT_TIMES = "snPrintTimes"; - //本体条码打印列数 - public static final String SN_PRINT_COLUMN_NUMBER = "snPrintColumnNumber"; - //包装条码打印张数 - public static final String PACK_NOPRINT_TIMES = "packNoPrintTimes"; - //下线时间 - public static final String OUT_WORK_CENTER_TIME = "outWorkCenterTime"; - //是否出货检验 - public static final String IS_OQC = "isOqc"; - //是否生成条码 - public static final String IS_CREATE_SN = "isCreateSn"; - //是否PS部件 - public static final String IS_PS_PARTS = "isPSParts"; //产品生产类型代码 public static final String PPT_CODE = "pptCode"; //生产工单号 - public static final String ORDER_NO = "orderNo"; - //生产工单号 public static final String WORK_ORDER_NO = "workOrderNo"; //工单状态 public static final String WORK_ORDER_STATUS = "workOrderStatus"; //工单类型 public static final String WORK_ORDER_TYPE = "workOrderType"; - //Erp库存地 - public static final String ERP_WARE_HOUSE = "erpWarehouse"; - //sap工单顺序 - public static final String SAP_SEQ = "sapSeq"; - //sap - public static final String SAP = "sap"; - //生产版本 - public static final String WORK_VER = "workVer"; //质量状态 public static final String QC_STATUS = "qcStatus"; //条码状态 @@ -118,70 +69,14 @@ public class MesExtConstWords { public static final String SEQ = "seq"; // 数量 public static final String COUNT = "count"; - // 序号 - public static final String WORK_ORDER_MAX_SEQ = "WORK_ORDER_MAX_SEQ"; //工序代码 public static final String PROCESS_CODE = "processCode"; //工序名称 public static final String PROCESS_NAME = "processName"; - //作业类型 - public static final String TASK_TYPE = "taskType"; - //创建规则 - public static final String CREATE_RULE = "createRule"; - //匹配规则 - public static final String MATCH_RULE = "matchRule"; - //单据类型 - public static final String ORDER_TYPE = "orderType"; - //单据状态 - public static final String ORDER_STATUS = "orderStatus"; - //点检时间 - public static final String CHECK_TIME = "checkTime"; - //点检开始时间 - public static final String CHECK_START_TIME = "checkStartTime"; - //点检结束时间 - public static final String CHECK_END_TIME = "checkEndTime"; - //点检结果 - public static final String CHECK_RESULT = "checkResult"; - //点检信息 - public static final String CHECK_INFO= "checkInfo"; - //作业时间 - public static final String WORK_TIME = "workTime"; - //班组确认 - public static final String SHIFT_GROUP_CHECK = "shiftGroupCheck"; - //班组确认人 - public static final String SHIFT_GROUP_CHECK_USER = "shiftGroupCheckUser"; - //班组确认时间 - public static final String SHIFT_GROUP_CHECK_TIME = "shiftGroupCheckTime"; - //品质确认 - public static final String QUALITY_CHECK = "qualityCheck"; - //品质确认人 - public static final String QUALITY_CHECK_USER = "qualityCheckUser"; - //品质确认时间 - public static final String QUALITY_CHECK_TIME = "qualityCheckTime"; - //原材料编号 - public static final String ITEM_PART_NO = "itemPartNo"; - //生成时间 - public static final String GENERATE_TIME = "generateTime"; - //管理项目 - public static final String MANAGE_PROJECTS = "manageProjects"; - //管理内容 - public static final String SCREW_TYPE = "screwType"; //数量 public static final String QTY = "qty"; //完成数量 public static final String COMPLET_QTY = "completeQty"; - //是否绑定 - public static final String IS_BIND = "isBind"; - //是否绑定关键键 - public static final String IS_BIND_KEY = "isBindKey"; - //是否可重复 - public static final String IS_REPEAT = "isRepeat"; - //是否检查 - public static final String IS_CHECK = "isCheck"; - //播放顺序 - public static final String BC_SEQ = "bcSeq"; - //播放时长 - public static final String BC_TIMES = "bcTimes"; //区域代码 public static final String AREA_CODE = "areaCode"; //区域代码 @@ -194,292 +89,32 @@ public class MesExtConstWords { public static final String START_TIME = "startTime"; //下班时间 public static final String END_TIME = "endTime"; - //作业人数 - public static final String WORKER_QTY = "workerQty"; - //作业内容代码 - public static final String PROD_CODE = "prodCode"; - //作业内容名称 - public static final String PROD_NAME = "prodName"; - //是否作业时间 - public static final String IS_PROD_TIME = "isProdTime"; - //作业内容分类 - public static final String PROD_CATEGORY = "prodCategory"; - //作业类型 - public static final String PROD_TYPE = "prodType"; - public static final String PROD_TYPE2 = "prodType2"; - public static final String PROD_TYPE_NAME = "prodTypeName"; - //不良维护措施 - public static final String BAD_MAINTAIN_MEASURE = "badMaintainMeasure"; - //包装规格 - public static final String PACK_SPEC = "packSpec"; //客户编码 public static final String CUSTOMER_CODE = "customerCode"; - //包装标签模板 - public static final String PACK_LABEL_TEMPLATE = "packLabelTemplate"; - //产品标签模板 - public static final String PROCESS_LABEL_TEMPLATE = "processLabelTemplate"; - //质保书标签模板 - public static final String QUALITY_ASSURE_TEMPLATE = "qualityAssureTemplate"; - //大本体条码标签模板 - public static final String BIG_PROCESS_LABEL_TEMPLATE = "bigProcessLabelTemplate"; - //编码类型 - public static final String CODE_TYPE = "codeType"; - //匹配类型 - public static final String MATCH_TYPE = "matchType"; - //匹配值 - public static final String MATCH_VALUE = "matchValue"; - //规则代码 - public static final String RULE_CODE = "ruleCode"; - //编码规则 - public static final String NUMBER_RULE = "numberRule"; - //拼接固定字符 - public static final String SPILT_RULE = "spiltRule"; - //序号长度 - public static final String SERIALNO_LENGTH = "serialnoLength"; - //增量 - public static final String SERIALNO_INCREMENT = "serialnoIncrement"; - //起始值 - public static final String BEGIN_VAL = "beginVal"; - //最大值后是否循环 - public static final String IS_CYCLE = "isCycle"; - //前缀 - public static final String PREFIX = "prefix"; - //成功 - public static final String success = "success"; - //错误 - public static final String FALSE = "false"; - //信息 - public static final String MSG = "msg"; - //包装规格代码 - public static final String SPEC_CODE = "specCode"; - //模板代码 - public static final String TEMPLATE_CODE = "templateCode"; - //打印机编号 - public static final String PRINTER_NO = "printerNo"; - //打印机名称 - public static final String PRINTER_NAME = "printerName"; - //容器位置编号 - public static final String CT_LOCATION_NO = "ctLocationNo"; - //位置类型 - public static final String LOCATION_TYPE = "locationType"; - //系别 - public static final String IS_DONT = "isDont"; - //班别 - public static final String DONT_CLASS = "dontClass"; - //查询维度 - public static final String DIMENSION = "dimension"; - //查询维度 - public static final String DIMENSION_1 = "dimension1"; - //管理类型 - public static final String MANAGE_TYPE = "manageType"; - //重要安全部品 - public static final String IMPORTANCE_SAFE_PART_NO = "importanceSafePartNo"; - //批次号 - public static final String LOT_NO = "lotNo"; - //模块 - public static final String MODULE = "module"; - //项目分类代码 - public static final String PROJECT_SORT_NO = "projectSortNo"; //模块代码 public static final String MODULE_CODE = "moduleCode"; //模块名称 public static final String MODULE_NAME = "moduleName"; - //文件地址 - public static final String FILE_URL = "fileUrl"; - //文件原名 - public static final String FILE_ORIGIN_NAME = "fileOriginName"; - //同步状态 - public static final String SYNC_STATUS = "syncStatus"; - //包装编号 - public static final String PACKAGENO = "packageNo"; - //对象代码 - public static final String OBJECT_CODE = "objectCode"; - //对象名称 - public static final String OBJECT_NAME = "objectName"; - //字段代码 - public static final String FIELD_CODE = "fieldCode"; - //字段名称 - public static final String FIELD_NAME = "fieldName"; - //字段类型 - public static final String FIELD_TYPE = "fieldType"; - //PLC代码 - public static final String PLC_CODE = "plcCode"; - //是否显示 - public static final String IS_SHOW = "isShow"; - //显示顺序 - public static final String SHOW_SEQ = "showSeq"; - //出货检验单号 - public static final String OQC_NO = "oqcNo"; - //检验项目 - public static final String OQC_PROJECT = "oqcProject"; - //检验基准 - public static final String STANDARD = "standard"; - //检验类型 - public static final String OQC_TYPE = "oqcType"; //检验类型 public static final String REMARK = "remark"; - //总检测单号 - public static final String CHECK_NO = "checkNo"; - //页面区分 - public static final String PAGE_TYPE = "pageType"; //状态 public static final String STATUS = "status"; //检验结果 public static final String RESULT = "result"; //检验结果 public static final String RESULT_BIG = "RESULT"; - //缺陷代码 - public static final String DEFECT_CODE = "defectCode"; - //缺陷名称 - public static final String DEFECT_NAME = "defectName"; - //不良类型代码 - public static final String DEFECT_TYPE = "defectType"; - //维修状态 - public static final String REPAIR_STATUS = "repairStatus"; - //缺陷原因代码 - public static final String DC_CODE = "dcCode"; - //维修措施代码 - public static final String REPAIR_CODE = "repairCode"; - //维修判定 - public static final String REPAIR_JUDGE = "repairJudge"; - //内容 - public static final String CONTENT = "content"; - //是否班组确认 - public static final String IS_TEAM_CONFIRM = "isTeamConfirm"; - //是否品质确认 - public static final String IS_QUALITY_CONFIRM = "isQualityConfirm"; - //纸箱确认 - public static final String CARTON_CONFIRM_CHECK = "cartonConfirmCheck"; - //长度 - public static final String LENGTH = "length"; - //from1 - public static final String FROM1 = "from1"; - //to1 - public static final String TO1 = "to1"; - //fix1 - public static final String FIX1 = "fix1"; - //from2 - public static final String FROM2 = "from2"; - //to2 - public static final String TO2 = "to2"; - //WMS库存地 - public static final String ZONE_NO = "zoneNo"; - //单据编号 - public static final String ORDER_JOB_NO = "orderJobNo"; - //单据编号 - public static final String EQU_NO = "equNo"; - //点检类型 - public static final String CHECK_TYPE = "checkType"; - //点检时间 - public static final String SPOT_CHECK_TIME = "spotCheckTime"; - //检测信息 - public static final String CHECK_MESSAGE = "checkMessage"; - //检测标准 - public static final String CHECK_STAND = "checkStand"; - //补件状态 - public static final String FRE_STATUS = "freStatus"; - //确认状态 - public static final String CONFIRM_STATUS = "confirmStatus"; - //下线时间 - public static final String OUT_WC_TIME = "outWcTime"; - //补件时间 - public static final String FRE_TIME = "freTime"; - //确认时间 - public static final String CONFIRM_TIME = "confirmTime"; - //剩余数量 - public static final String REMAIN_QTY = "remainQty"; - //级别 - public static final String LEVEL = "level"; - //软适配代码 - public static final String SUIT_CASE_CODE = "suitCaseCode"; - //援入援出明细项 - public static final String ASSIST_OUT_AND_ENTER_DETAIL = "assistOutAndEnterDetail"; - //责任部门 - public static final String OWNER_DEPARTMENT = "ownerDepartment"; - //责任部门 - public static final String OWNER_DEPARTMENT_ARR = "ownerDepartmentArr"; - //责任部门配置 - public static final String OWNER_DEPARTMENT_CFG = "OWNER_DEPARTMENT_CFG"; - //责任部门权限配置 - public static final String OWNER_DEPARTMENT_AUTH_CFG = "OWNER_DEPARTMENT_AUTH_CFG"; - //工作内容 - public static final String WORK_CONTENT = "workContent"; - //影响人数 - public static final String INFLUENCE_NUMBER = "influenceNumber"; - //影响日期 - public static final String INFLUENCE_DATE = "influenceDate"; - //影响日期 - public static final String INFLUENCE_DATE_START = "influenceDateStart"; - //影响日期 - public static final String INFLUENCE_DATE_END = "influenceDateEnd"; - //标题 - public static final String TITLE = "title"; - //仕损年月 - public static final String LOSS_DATE = "lossDate"; - //仕损类型 - public static final String LOSS_TYPE = "lossType"; - //仕损明细 - public static final String LOSS_ITEM = "lossItem"; - //合计 - public static final String TOTAL = "total"; //序号 public static final String INDEX = "index"; - //担当 - public static final String TAKE_ON = "takeOn"; - //责任人 - public static final String PERSON_RESPONSIBLE = "personResponsible"; - //责任部长 - public static final String RESPONSIBLE_MINISTER = "responsibleMinister"; - //责任归属 - public static final String LIABILITY_ATTRIBUTION = "liabilityAttribution"; - //担当确认 - public static final String TAKE_ON_CONFIRM = "takeOnConfirm"; - //责任人确认 - public static final String PERSON_RESPONSIBLE_CONFIRM = "personResponsibleConfirm"; - //责任部长确认 - public static final String RESPONSIBLE_MINISTER_CONFIRM = "responsibleMinisterConfirm"; - //担当用户名 - public static final String TAKE_ON_USER_NAME = "takeOnUserName"; - //责任人用户名 - public static final String PERSON_RESPONSIBLE_USER_NAME = "personResponsibleUserName"; - //责任部长用户名 - public static final String RESPONSIBLE_MINISTER_USER_NAME = "responsibleMinisterUserName"; - //分组号 - public static final String GROUP_NO = "groupNo"; - //时间[开始/结束]条件 public static final String START_TIME_START = "startTimeStart"; public static final String START_TIME_END = "startTimeEnd"; public static final String END_TIME_START = "endTimeStart"; public static final String END_TIME_END = "endTimeEnd"; - public static final String WORK_TIME_START = "workTimeStart"; - public static final String WORK_TIME_END = "workTimeEnd"; public static final String CREATE_DATE_TIME_START = "createDatetimeStart"; public static final String CREATE_DATE_TIME_END = "createDatetimeEnd"; public static final String MODIFY_DATE_TIME_START = "modifyDatetimeStart"; public static final String MODIFY_DATE_TIME_END = "modifyDatetimeEnd"; - public static final String OUT_WORK_CENTER_TIME_START = "outWorkCenterTimeStart"; - public static final String OUT_WORK_CENTER_TIME_END = "outWorkCenterTimeEnd"; - public static final String SPOT_CHECK_TIME_START = "spotCheckTimeStart"; - public static final String SPOT_CHECK_TIME_END = "spotCheckTimeEnd"; - public static final String REUSE_PLAN_DATETIME_START = "reusePlanDatetimeStart"; - public static final String REUSE_PLAN_DATETIME_END = "reusePlanDatetimeEnd"; - public static final String HAPPEN_TIME_START = "happenTimeStart"; - public static final String HAPPEN_TIME_END = "happenTimeEnd"; - - //文件字节 - public static final String FILE_BYTE = "FILE_BYTE"; - //文件名称 - public static final String FILE_NAME = "FILE_NAME"; - //文件原名称 - public static final String ORIGINAL_FILE_NAME = "ORIGINAL_FILE_NAME"; - - //作业单号生成规则 - public static final String ORDER_NO_RULE = "ORDER_NO_RULE"; - - //包装编号 - public static final String PACKAGE_NO = "PACKAGE_NO"; //0 public static final int ZERO = 0; @@ -539,421 +174,18 @@ public class MesExtConstWords { public static final String DATE_DD_01 = "-01"; //日期类型 public static final String DATE_DD_31 = "-31"; - //日期类型 - public static final String DATE_MM_DD_01_01 = "-01-01"; - //日期类型 - public static final String DATE_MM_DD_03_31 = "-03-31"; - //日期类型 - public static final String DATE_MM_DD_04_01 = "-04-01"; - //日期类型 - public static final String DATE_MM_DD_06_30 = "-06-30"; - //日期类型 - public static final String DATE_MM_DD_07_01 = "-07-01"; - //日期类型 - public static final String DATE_MM_DD_09_30 = "-09-30"; - //日期类型 - public static final String DATE_MM_DD_10_01 = "-10-01"; - //日期类型 - public static final String DATE_MM_DD_12_31 = "-12-31"; + //日期类型 public static final String DATE_SERIAL_FORMAT = "yyyyMMdd"; - //项目分类 - public static final String PROD_CFG_TYPE_CLASSIFY = "prodCfgTypeClassify"; - //项目代码 - public static final String PROD_CFG_TYPE_CODE = "prodCfgTypeCode"; - //计划比例 - public static final String PLAN_RATE = "planRate"; - //事业别 - public static final String CAREER_CODE = "careerCode"; - //事业别 - public static final String CAREER_NAME = "careerName"; - //数据key - public static final String DATA_KEY = "dataKey"; //月 public static final String MONTH = "month"; //日 public static final String DAY = "day"; - //统计方式 - public static final String STATISTICS_TYPE = "statisticsType"; - //统计日期 - public static final String STATISTICS_DATE = "statisticsDate"; - //统计日期 - public static final String FLAG = "flag"; - //周数量 - public static final String WEEK_COUNT = "weekCount"; - //推送名称 - public static final String PUSH_NAME = "pushName"; - //推送参数 - public static final String PUSH_PARAM = "pushParam"; - //推送方式 - public static final String PUSH_TYPE = "pushType"; - - //分类 - public static final String CATEGORY_NAME = "categoryName"; - //分类 - public static final String CATEGORY_CODE = "categoryCode"; - //分类1 - public static final String CATEGORY_CODE1 = "categoryCode1"; - //分类2 - public static final String CATEGORY_CODE2 = "categoryCode2"; - //分类3 - public static final String CATEGORY_CODE3 = "categoryCode3"; - //分类类型 - public static final String CATEGORY_TYPE = "categoryType"; - - //一致性确认物料 生成规律 - public static final String ESSENCES = "essences"; - //一致性确认项目 项目描述 - public static final String ITEM_DESCRIPTION = "itemDescription"; - //-----------------容器-------------------------- - public static final String CT_NO = "ctNo"; - public static final String CT_CODE = "ctCode"; - public static final String USE_LIMIT = "useLimit"; - public static final String CT_NAME = "ctName"; - public static final String CT_QTY = "ctQty"; - public static final String USE_STATUS = "useStatus"; - public static final String CONTAINER_USE_STATUS = "containerUseStatus"; - - //----------------- EP -------------------------- - public static final String PROJECT_CONTENT = "projectContent"; - public static final String CHECK_METHOD = "checkMethod"; - public static final String EQU_NAME = "equName"; - public static final String RESULT_TYPE = "resultType"; - public static final String EQUIPMENT_CODE = "equipmentCode"; - public static final String EQUIPMENT_NAME ="equipmentName"; - public static final String ORDER_BY_SPOTCHECKTIME_DESC = " order by spotCheckTime desc "; - public static final String HAPPEN_STATION = "happenStation"; - public static final String EP_EXT = "/ep-ext"; - public static final String DATA_TYPE = "dataType"; - public static final String CHANGE_ORDER_SEQ_UN_CHECK_SN_CREATE_STATUS = "CHANGE_ORDER_SEQ_UN_CHECK_SN_CREATE_STATUS"; - public static final String ONTOLOGY_LINE_ORGANIZECODE_CONFIG_CODE = "ONTOLOGY_LINE_ORGANIZECODE_CONFIG_CODE"; - - //净重 - public static final String NET_WEIGHT = "netWeight"; - //毛重 - public static final String ROUGH_WEIGHT = "roughWeight"; - //包装尺寸 - public static final String PACKAGE_SIZE = "packageSize"; //系统同步状态 public static final String SYSTEM_SYNC_STATUS = "systemSyncStatus"; - //系统同步状态 - public static final String SYSTEM_SYNC_STATUS_EXT = "systemSyncStatusExt"; - - //产生时间 - public static final String PRODUCE_TIME = "produceTime"; - //员工编码 - public static final String EMPLOYEE_CODE = "employeeCode"; - //员工名称 - public static final String EMPLOYEE_NAME = "employeeName"; - //员工名称 - public static final String PROCESS_LABEL_CODE = "processLabelCode"; - - //新增 - public static final String INSERT = "insert"; - //修改 - public static final String UPDATE = "update"; - - //修改 - public static final String LINE_TYPE = "lineType"; - - //配置表编号 - public static final String CFG_CODE = "cfgCode"; - //业务配置表名称 - public static final String CFG_NAME = "cfgName"; - //业务配置值 - public static final String CFG_VALUE = "cfgValue"; - //业务配置值 - public static final String CFG_VALUE_SEQ = "cfgValueSeq"; - //安全事故日期 - public static final String ACCIDENT_DATE = "accidentDate"; - - //审批状态 - public static final String APPROVAL_STATUS = "approvalStatus"; - - //不良部品编码 - public static final String BAD_PART_NO = "badPartNo"; - //不良部品名称 - public static final String BAD_PART_NAME = "badPartName"; - //不良部品厂家 - public static final String BAD_PART_VENDER = "badPartVender"; - - //返修日期 - public static final String REPAIR_DATE = "repairDate"; - - //安灯队列编号 - public static final String ANDON_ORDER_NO = "andonOrderNo"; - - //备注 - public static final String MEMO = "memo"; - - /******* 履历菜单字段配置表字段 *********/ - //菜单代码 - public static final String MENU_CODE = "menuCode"; - //变更前 - public static final String BEFORE_CHANGE = "beforeChange"; - //变更后 - public static final String AFTER_CHANGE = "afterChange"; - //凭证 - public static final String VOUCHER = "voucher"; - //首件编号 - public static final String INITIAL_WORKPIECE_NO = "initialWorkpieceNo"; - //工技是否确认 - public static final String SKILL_IS_CONFIRM = "skillIsConfirm"; - //制造是否确认 - public static final String MANUFACTURING_IS_CONFIRM = "manufacturingIsConfirm"; - /******* 履历菜单字段配置表字段 *********/ //英文逗号 public static final String COMMA = ","; - //打印类型 - public static final String PRINT_TYPE = "printType"; - //打印类型 - public static final String PRINT_MODE = "printMode"; - - //大包装条码 - public static final String OUTER_PACKAGE_NO = "outerPackageNo"; - //小包装条码 - public static final String INNER_PACKAGE_NO = "innerPackageNo"; - //绑定状态 - public static final String BIND_STATUS = "bindStatus"; - - //复用计划时间 - public static final String REUSE_PLAN_DATE_TIME = "reusePlanDatetime"; - //纸箱确认开始 - public static final String CARTON_CONFIRM_TIME = "cartonConfirmTime"; - - //IOT工厂配置 - public static final String IOT_ORG_CFG = "IOT_ORG_CFG"; - //日期年月日 - public static final String DATE_YMD = "dateYmd"; - //时间时分秒 - public static final String TIME_HMS = "timeHms"; - //IOT数据回传通用策略实现类 - public static final String IOT_COMMON_STRATEGY = "cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi.bu3.SxProdDataToSoftAdapterStrategyCommonService"; - - //日常点检班次时间配置 - public static final String DAILY_CHECK_SHIFT_TIME_CFG = "DAILY_CHECK_SHIFT_TIME_CFG"; - - //返工工单号 - public static final String REWORK_ORDER_NO = "reworkOrderNo"; - - //上岗证编码 - public static final String WORK_LICENSE_CODE = "workLicenseCode"; - //用户名 - public static final String USER_NAME = "userName"; - //用户登录名 - public static final String USER_LOGIN_NAME = "userLoginName"; - //用户名 - public static final String USER_NAME_RDD = "userNameRdd"; - //有效期 - public static final String VALIDITY_DATE = "validityDate"; - - //事业别配置 - public static final String SX_CATEGORY_CFG = "SX_CATEGORY_CFG"; - //事业别配置 - public static final String SX_CAREER_CFG = "SX_CAREER_CFG"; - - //仕损明细记录类型明细配置 - public static final String SX_OFFICIAL_LOSS_TYPE_ITEM_CFG = "SX_OFFICIAL_LOSS_TYPE_ITEM_CFG"; - - //松下报表松下年业务标志 - public static final String SX_REPORT_IS_PANASONIC_YEAR = "SX_REPORT_IS_PANASONIC_YEAR"; - public static final String OUT_WC_TIME_START = "outWcTimeStart"; - public static final String OUT_WC_TIME_END = "outWcTimeEnd"; - - //净水器线配置代码 - public static final String WATER_PURIFIER_CODE = "WATER_PURIFIER_CODE"; - - //松下报表OKR实绩 - public static final String SX_REPORT_OKR_CFG = "SX_REPORT_OKR_CFG"; - - //松下援交报表通知附件模版 - public final static String SX_ASSIST_PUSH_NOTIFY_REPORT = "SX_ASSIST_PUSH_NOTIFY_REPORT"; - - //MES 调 PCN 更改返工工单状态 - public static final String PCN_UPDATE_REWORK_ORDER_STATUS_URL = "PCN_UPDATE_REWORK_ORDER_STATUS_URL"; - - //PCN网关 - public static final String BU_GATEWAY_HOST_PCN = "BU_GATEWAY_HOST_PCN"; - - //MES 调 PCN 获取返工条码 - //public static final String PCN_GET_REPAIR_SN_BY_WO_URL = "PCN_GET_REPAIR_SN_BY_WO_URL"; - - //MES 调 PCN 修改返工单相关关联数据 - public static final String PCN_UPDATE_REWORK_ORDER_WITH_DATA_URL = "PCN_UPDATE_REWORK_ORDER_WITH_DATA_URL"; - - //援进援出推送名称 - public static final String ASSIST_OUT_AND_ENTER_CONFIRM_PUSH_NAME = "MES:CKF1:援进援出确认推送"; - - //援进援出担当确认默认归属 - public static final String TAKE_ON_CONFIRM_DEFAULT_LIABILITY_ATTRIBUTION = "TAKE_ON_CONFIRM_DEFAULT_LIABILITY_ATTRIBUTION"; - - //完结率达成率产品类型3配置 - public static final String COMPLETE_RATE_CATEGORY3_CFG = "COMPLETE_RATE_CATEGORY3_CFG"; - - - //拼接0点 - public static final String APPEND_ONE_DAY_ZERO_HH_MM_SS = "-01 00:00:00"; - - //MES 调 PCN 根据工单号解绑条码相关关联数据 - public static final String PCN_UNBIND_SN_BY_WORK_ORDER_WITH_DATA_URL = "PCN_UNBIND_SN_BY_WORK_ORDER_WITH_DATA_URL"; - - //最终工单号 - public static final String LAST_WORK_ORDER_NO = "lastWorkOrderNo"; - - //数据维度 - public static final String DATA_DIMENSION = "dataDimension"; - - //紧固部位 - public static final String FASTENING_POSITION = "fasteningPosition"; - - //规格 - public static final String SPECIFICATION = "specification"; - - //管理码 - public static final String MANAGE_CODE = "manageCode"; - - //产品条码 - public static final String PRODUCT_SN = "productSn"; - - //嘉兴MES URL - public static final String BASE_URL_MES_JX = "/mes/jx"; - - /*BU 出货检验 START*/ - //销售向 - public static final String SALES_TO = "salesTo"; - //销售向 - public static final String SALES_TO_NAME = "salesToName"; - // 值类型 - public static final String VALUE_TYPE = "valueType"; - //状态 - public static final String STATUS_LOWER_CASE = "status"; - //不良类型编码 - public static final String BADNESS_TYPE_CODE = "badnessTypeCode"; - //不良类型名称 - public static final String BADNESS_TYPE_NAME = "badnessTypeName"; - //颜色 - public static final String COLOR = "color"; - //不良分类代码 - public static final String BADNESS_CLASSIFY_CODE = "badnessClassifyCode"; - //不良分类名称 - public static final String BADNESS_CLASSIFY_NAME = "badnessClassifyName"; - //不良分类明细编码 - public static final String BADNESS_CLASSIFY_DETAIL_CODE = "badnessClassifyDetailCode"; - //不良分类明细名称 - public static final String BADNESS_CLASSIFY_DETAIL_NAME = "badnessClassifyDetailName"; - - //商品码 - public static final String GOODS_CODE = "goodsCode"; - //商品码2 - public static final String GOODS_CODE2 = "goodsCode2"; - //BU出货检验锁 - public static final String BU_OQC_MANAGE_LOCK = "BU_OQC_MANAGE:LOCK"; - //EP出货检验锁 - public static final String EP_OQC_MANAGE_LOCK = "EP_OQC_MANAGE:LOCK"; - // 总检验单号 TOQC条码 - public static final String BU_OQC_TOTAL_CHECK_NO = "BU_OQC_TOTAL_CHECK_NO"; - //EP出货停止锁 - public static final String EP_OQC_STOP_LOCK = "EP_OQC_STOP_LOCK"; - //出货检验类型 - public static final String OQC_NO_TYPE = "oqcNoType"; - //检查项目 - public static final String CHECK_ITEM = "checkItem"; - //检查内容 - public static final String CHECK_ITEM_DESC = "checkItemDesc"; - //检测值 - public static final String CHECK_VALUE = "checkValue"; - //生产批量数 - public static final String WORK_TIMES_QTY = "workTimesQty"; - //检验批量数 - public static final String LAST_CHECKED_QTY = "lastCheckedQty"; - //检验台数 - public static final String CHECK_AMOUNT_QTY = "checkAmountQty"; - //抽样率 - public static final String SAMPLE_RATE = "sampleRate"; - //不良率 - public static final String UN_QC_RATE = "unQcRate"; - //缺点数 - public static final String UN_QC_QTY = "unQcQty"; - //明细集合 - public static final String DETAIL_LIST = "detailList"; - //发生时间 - public static final String HAPPEN_TIME = "happenTime"; - /*BU 出货检验 END*/ - - public static final String ORDER_BY_MDT_DESC = " order by modifyDatetime desc "; - // id常量 - public static final String ID_STR = "idStr"; - //拼接24点 - public static final String APPEND_24_HH_MM_SS = " 23:59:59"; - //MODEL - public static final String MODEL = "MODEL"; - //检查数量 - public static final String OQC_QTY = "oqcQty"; - - //维修判定代码 - public static final String REPAIR_JUDGE_CODE = "repairJudgeCode"; - //维修判定名称 - public static final String REPAIR_JUDGE_NAME = "repairJudgeName"; - - //总不良率 - public static final String AMOUNT_BAD_RATE = "amountBadRate"; - - public static final String BOARD_WORK_SHOW_FLAG = "BOARD_WORK_SHOW_FLAG"; - - //节拍限制值配置 - public static final String SX_WORK_CELL_TAKT_LIMIT_CFG = "SX_WORK_CELL_TAKT_LIMIT_CFG"; - - public static final String NUMBER_RULE_EXT = "NUMBER_RULE_EXT"; - //前缀 - public static final String PREFIX_BIG = "PREFIX"; - //物料号 - public static final String PARTNO = "PARTNO"; - //年 - public static final String YEAR = "YEAR"; - //月 - public static final String MONTH_UPPER_CASE = "MONTH"; - //日 - public static final String DAY_UPPER_CASE = "DAY"; - //时 - public static final String HOUR = "HOUR"; - //分 - public static final String MINUTE = "MINUTE"; - //秒 - public static final String SECOND = "SECOND"; - //日文 - public static final String J = "J"; - //物料号长度代号P - public static final String P = "P"; - //变更号长度代号L - public static final String L = "L"; - //数量代号 - public static final String N = "N"; - //供应商码 - public static final String SUPPLIERRULE = "SUPPLIERRULE"; - //流水号 - public static final String SERIALNO = "SERIALNO"; - public static final String SERIALNO2 = "SERIALNO2"; - public static final String SEQNO = "SEQNO"; - public static final String SEQNO2 = "SEQNO2"; - //不携带流水号 - public static final String SN_WITHOUT_SEQNO = "SN_WITHOUT_SEQNO"; - //固定拼接字符 - public static final String SPILTRULE = "SPILTRULE"; - //动态拼接字符 - public static final String DYNAMICRULE = "DYNAMICRULE"; - //PART - public static final String PART_EXT = "PART_EXT"; - public static final String LEFT_BRACE = "{"; - public static final String RIGHT_BRACE = "}"; - //流水号起始位置 - public static final String SEQNO_START_INDEX = "SEQNO_START_INDEX"; - //流水号截至位置 - public static final String SEQNO_END_INDEX = "SEQNO_END_INDEX"; - - //标准综合能率配置 - public static final String SX_STANDARD_RATE_CFG = "SX_STANDARD_RATE_CFG"; - }