Skip to content

H
hg-smart
Commit bf921dc4 by 宋祥
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 371bdfd7 10b8d496
Showing with 10 additions and 339 deletions
src/main/java/com/baosight/hggp/common/DdynamicEnum.java
......@@ -16,13 +16,12 @@ package com.baosight.hggp.common;
public enum DdynamicEnum {
//------------------------------------配置管理-----------------------------------
/**
* 模块：供应商档案
* 用途：供应商档案下拉框
* 模块：项目性质
* 用途：项目性质下拉框
* 编写：wwl
*/
SUPPLIER_RECORD_BLOCK_ID("supplier_record_block_id","custCode","custName","HPPZ002.queryComboBox"),
/**
PROJ_TYPE_BLOCK_ID("proj_type_block_id","natCode","natName","HGPZ008.queryComboBox"),
/** TODO
* 模块：客户档案
* 用途：客户档案下拉框
* 编写：wwl
......@@ -30,100 +29,13 @@ public enum DdynamicEnum {
CUSTOMER_RECORD_BLOCK_ID("customer_record_block_id","custCode","custName","HPPZ003.queryComboBox"),
/**
* 模块：存货名称
* 用途：存货名称下拉框
* 编写：wwl
*/
INVENT_NAME_BLOCK_ID("invent_name_block_id","inventCode","inventName","HPPZ004.queryComboBox"),
/**
* 模块：存货档案（存货名称）
* 用途：存货档案下拉框
* 编写：jhs
*/
MATERIAL_RECORD_BLOCK_ID("material_record_block_id","inventCode","inventName","HPPZ006.queryMaterialComboBox"),
/**
* 模块：存货档案（规格）
* 用途：存货档案下拉框
* 编写：wwl
*/
INVENT_SPEC_BLOCK_ID("invent_spec_block_id", "id", "spec", "HPPZ006.queryComboBoxSpec"),
/**
* 模块：存货档案（ALL）
* 用途：存货档案下拉框
* 编写：wwl
*/
INVENT_ALL_BLOCK_ID("invent_all_block_id", "id", "spec", "material", "unit", "length", "width", "thick",
"coefficient", "HPPZ006.queryComboBoxAll"),
/**
* 模块：存货档案（ALL）
* 用途：存货档案下拉框
* 编写：wwl
*/
INVENT_SPEC_ALL_BLOCK_ID("invent_spec_all_block_id", "inventCode", "inventNameSpec","inventName","spec", "material", "unit", "length", "width", "thick",
"coefficient","id", "HPPZ006.queryComboBox"),
/**
* 模块：存货档案部件名称
* 用途：存货档案部件名称下拉框
* 编写：wwl
*/
INVENT_PRDT_NAME_BLOCK_ID("invent_prdt_name_block_id", "id", "inventCode", "inventName",
"HPPZ006.queryPrdtComboBoxAll"),
/**
* 模块：存货档案（规格）
* 用途：存货档案下拉框
* 编写：wwl
*/
SPEC_NAME_BLOCK_ID("spec_name_block_id", "spec", "spec", "HPPZ006.queryComboBoxSpecName"),
/**
* 模块：存货档案（单位）
* 用途：存货档案下拉框
* 编写：wwl
*/
UNIT_NAME_BLOCK_ID("unit_name_block_id", "unit", "unit", "HPPZ006.queryComboBoxUnit"),
/**
* 模块：仓库档案
* 用途：仓库档案下拉框
* 编写：wwl
*/
WH_RECORD_BLOCK_ID("wh_record_block_id","whCode","whName","HPPZ007.queryComboBox"),
/**
* （废弃）
* 模块：存货类型
* 用途：存货类型下拉框
* 编写：yk
*/
MAT_TYPE_BLOCK_ID("mat_type_block_id","matType","matType","HPPZ007.queryMatTypeComboBox"),
/**
* 模块：存货编码
* 用途：存货编码下拉框
* 编写：yk
*/
MAT_CODE_BLOCK_ID("mat_code_block_id","matCode","matCode","HPPZ007.queryMatCodeComboBox"),
/**
* 模块：用户
* 用途：用户下拉框
* 编写：yk
*/
USER_BLOCK_ID("user_block_id","loginName","userName","HPXSUser.queryComboBox"),
/**
* 模块：厂区管理
* 用途：厂区管理下拉框
* 编写：songx
*/
FACTORY_RECORD_BLOCK_ID("factory_record_block_id","orgId","orgCname","HPXSOrg.queryFactoryComboBox"),
/**
* 模块：组管理
* 用途：组管理下拉框
......@@ -139,92 +51,6 @@ public enum DdynamicEnum {
USER_GROUP_BLOCK_ID("user_group_block_id","groupCode","groupName","factoryCode","HPXSOrg.queryAppGroup"),
/**
* 模块：组管理
* 用途：组管理下拉框
* 编写：w
*/
SALE_NO_BLOCK_ID("sale_no_block_id","saleNo","saleNo","HPXS007.getSaleCode"),
/**
* 分厂与组一起查出，用于生产任务分派
*/
FACTORY_GROUP_ECORD_BLOCK_ID("factory_group_ecord_block_id","factoryCode","factoryName","groupCode","groupName","HPPZ011.queryComboBoxAll"),
/**
* 模块：组管理
* 用途：组管理下拉框
* 编写：ll
*/
GROUP_PRO_BLOCK_ID("group_pro_block_id","groupCode","groupName","HPXSOrg.queryList"),
/**
* 模块：巡检移动端
* 用途：不良品类下拉
* 编写：ll
*/
POOR_TYPE_BLOCK_ID("poor_type_block_id","itemCode","itemCname","HPXSOrg.queryTedcm01"),
//------------------------------------生产管理-----------------------------------
/**
* 模块：项目档案
* 用途：项目档案下拉框
* 编写：wwl
*/
PROJ_RECORD_BLOCK_ID("proj_record_block_id","projCode","projName","HPSC001.queryComboBox"),
/**
* 模块：部件档案
* 用途：项目档案下拉框
* 编写：wwl
*/
INVENT_RECORD_BLOCK_ID("invent_record_block_id","prdtCode","prdtName","HPSC003.queryInventComboBox"),
/**
* 模块：零件档案
* 用途：项目档案下拉框
* 编写：wwl
*/
SUB_INVENT_RECORD_BLOCK_ID("sub_invent_record_block_id","prdtCode","prdtName","HPSC004.queryInventComboBox"),
/**
* 模块：生产组
* 用途：项目档案下拉框
* 编写：wwl
*/
@Deprecated
ORG_PROD_BLOCK_ID("org_prod_block_id","orgNo","orgName","HPSC005.queryOrgComboBox"),
/**
* 模块：项目档案(生产中)
* 用途：项目档案下拉框
* 编写：wwl
*/
PROJ_PROD_BLOCK_ID("proj_prod_block_id","projCode","projName","HPSC005.queryProjComboBox"),
/**
* 模块：项目档案(通过工厂、生产组)
* 用途：项目档案下拉框
* 编写：ll
*/
PROJ_PRODQUERY_BLOCK_ID("proj_prodQuery_block_id","projCode","projName","HPSC005.queryProjComboBox2"),
/**
* 模块：项目档案(通过工厂、生产组、项目号)
* 用途：移动端任务号、生产订单号
* 编写：ll
*/
PROJ_QUERYPROD_BLOCK_ID("proj_queryProd_block_id","prodOrderNo","prodTaskNo","HPSC005.queryProjComboBox2"),
//------------------------------------用户管理-----------------------------------
/**
* 模块：组织机构
* 用途：项目档案下拉框
* 编写：wwl
*/
ORG_RECORD_BLOCK_ID("org_record_block_id","orgId","orgCname","HPXSOrg.queryAll"),
/**
* 模块：用户企业
* 用途：项目档案下拉框
* 编写：wwl
......@@ -232,33 +58,11 @@ public enum DdynamicEnum {
COMPANY_RECORD_BLOCK_ID("company_record_block_id","companyCode","companyName","HPXSUser.queryCompanyComboBox"),
/**
* 模块：物料清单
* 用途：物料清单部件类型 耗材 零件 部件
* 编写：ly
*/
CODESET_CODE_BLOCK_ID("codeset_code_block_id","itemCode","itemCname","HPSC002.querySmallCode"),
/**
* 模块：日志管理
* 用途：日志查询
* 编写：wan
*/
OPER_MODUL_BLOCK_ID("oper_modul_block_id","operModul","operModul","HPRZ001.queryOperModulComboBox"),
/**
* 模块：日志管理
* 用途：日志查询
* 编写：wan
*/
OPER_TYPE_BLOCK_ID("oper_type_block_id","operType","operType","HPRZ001.queryOperTypeComboBox"),
/**
* 模块：系统管理
* 用途：用户查询
* 编写：ly
* 模块：用户
* 用途：用户下拉框
* 编写：yk
*/
USER_ID_BLOCK_ID("user_id_block_id","userId","userName","factoryCode","groupCode", "HPSC008.queryUserId"),
USER_BLOCK_ID("user_block_id","loginName","userName","HPXSUser.queryComboBox"),
/**
* 模块：系统管理
......@@ -266,142 +70,9 @@ public enum DdynamicEnum {
* 编写：ly
*/
DEPT_CODE_BLOCK_ID("dept_code_block_id", "orgId", "orgCname", "factoryCode", "factoryName", "companyCode",
"companyName", "HGXSOrg.queryAll"),
"companyName", "HGXSOrg.queryAll");
/**
* 模块：系统管理
* 用途：生产组查询
* 编写：ly
*/
GROUP_CODE_BLOCK_ID("group_code_block_id","groupCode","groupName","factoryCode", "HPSC008.queryGroupCode"),
/**
* 模块：系统管理
* 用途：厂区查询
* 编写：ly
*/
FACTORY_CODE_BLOCK_ID("factory_code_block_id","factoryCode","factoryName","HPSC008.queryFactoryCode"),
/**
* 模块：系统管理
* 用途：用户查询
* 编写：ly
*/
USER_ID1_BLOCK_ID("user_id1_block_id","userId","userName","factoryCode","groupCode", "HPSC008.queryUserId"),
/**
* 模块：维修人员
* 用途：用户查询
* 编写：w
*/
REP_USER_ID_BLOCK_ID("rep_user_id_block_id","userId","userName", "HPXS006.queryUserId"),
/**
* 模块：系统管理
* 用途：生产组查询
* 编写：ly
*/
GROUP_CODE1_BLOCK_ID("group_code1_block_id","groupCode","groupName","factoryCode", "HPSC008.queryGroupCode"),
/**
* 模块：系统管理
* 用途：厂区查询
* 编写：ly
*/
FACTORY_CODE1_BLOCK_ID("factory_code1_block_id","factoryCode","factoryName", "HPSC008.queryFactoryCode"),
/**
* 模块：系统管理
* 用途：用户查询
* 编写：ly
*/
USER_NAME_BLOCK_ID("user_name_block_id","userId","userName","factoryCode","groupCode", "HPSC008.queryUserName"),
/**
* 模块：系统管理
* 用途：生产组查询
* 编写：ly
*/
GROUP_NAME_BLOCK_ID("group_name_block_id","groupCode","groupName","factoryCode", "HPSC008.queryGroupName"),
/**
* 模块：系统管理
* 用途：厂区查询
* 编写：ly
*/
FACTORY_NAME_BLOCK_ID("factory_name_block_id","factoryCode","factoryName", "HPSC008.queryFactoryCode"),
/**
* 模块：巡检填报APP下拉
* 用途：巡检填报APP下拉查询
* 编写：ll
*/
APP_MAP_BLOCK_FACTORY("app_map_block_factory","factoryCode","factoryName","HPMT002.queryFactory"),
/**
* 模块：巡检填报APP下拉
* 用途：巡检填报APP下拉查询
* 编写：ll
*/
APP_MAP_BLOCK_ORG_NO("app_map_block_org_no","orgNo","orgName","HPMT002.queryOrgNo"),
/**
* 模块：巡检填报APP下拉
* 用途：巡检填报APP下拉查询
* 编写：ll
*/
APP_MAP_BLOCK_PROJCODE("app_map_block_projcode","projCode","projName","HPMT002.queryProjCode"),
/**
* 模块：巡检填报APP下拉
* 用途：巡检填报APP下拉查询
* 编写：ll
*/
APP_MAP_BLOCK_PRDTCODE("app_map_block_prdtcode","prdtCode","prdtName","prdtSpec","HPMT002.queryPrdtCode"),
/**
* 模块：巡检填报APP下拉
* 用途：巡检填报APP下拉查询
* 编写：ll
*/
APP_MAP_BLOCK_PARTCODE("app_map_block_partcode","partCode","partName","partSpec","HPMT002.queryPartCode"),
/**
* 模块：巡检填报APP下拉
* 用途：巡检填报APP下拉查询
* 编写：ll
*/
APP_MAP_BLOCK_PRODTASKNO("app_map_block_prodtaskno","prodTaskNo","prodorderNo","HPMT002.queryProdTaskNo"),
/**
* 模块：组管理
* 用途：组管理下拉框
* 编写：songx
*/
GROUP_RECORD1_BLOCK_ID("group_record_block_id","orgId","orgCname","HPSC010.queryGroupComboBox"),
FACTORY_CODE_BOX_BLOCK_ID("factoryCodeBox_block_id","factoryCode","factoryName","HPSB003.queryFactoryCodeBox"),
GROUP_CODE_BOX_BLOCK_ID("groupCodeBox_block_id","groupCode","groupName","factoryCode","factoryName","HPSB003.queryGroupCodeBox"),
USER_ID_BOX_BLOCK_ID("userIdBox_block_id","userId","userName","HPSB003.queryUserIdBox"),
/**
* 模块：工人管理
* 用途：工人管理下拉框
* 编写：wwl
*/
WORKER_BLOCK_ID("worker_block_id","userId","userName","HPPZ013.queryComboBox"),
PLAN_SALES_CODE_BLOCK_ID("planSalesCode_block_id","planSalesCode","yearMonth","HPPZ018.queryPlanSalesCode"),
/**
* 模块：设备编码
* 用途：设备日志下拉框
* 编写：ly
*/
DEVICE_CODE_BLOCK_ID("deviceCode_block_id","deviceCode","deviceName","HPSB003.queryDeviceCode"),
;
/** 将结果集放入的块名 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment