diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java new file mode 100644 index 00000000..a7130927 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java @@ -0,0 +1,38 @@ +package org.nl.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; + +/* + * @author ZZQ + * @Date 2023/3/15 4:33 下午 + */ +@Getter +@AllArgsConstructor +public enum StatusEnum { + //枚举状态 + STATUS_TRUE("1","是",""), + STATUS_FLASE("0","否",""), + //锁状态 + LOCK_OFF("0","否",""), + LOCK_ON("1","是",""), + + //任务状态 + TASK_CrEATE("1","生成",""), + TASK_START_P("2","起点确认",""), + TASK_END_P("3","确定终点",""), + TASK_START_END_P("4","起点和终点确认",""), + TASK_PUBLISH("5","下发",""), + TASK_RUNNING("6","运行",""), + TASK_FINISH("7","完成",""), + ; + private String code; + private String desc; + private String ext; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls index 0755bfa0..f01aba31 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index f01a1e50..8e172954 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/cache_line.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/cache_line.wql new file mode 100644 index 00000000..7fb1e25b --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/cache_line.wql @@ -0,0 +1,136 @@ +[交易说明] + 交易名: 点位管理查询 + 所属模块: + 功能简述: + 版权所有: + 表引用: + 版本经历: + +[数据库] + --指定数据库,为空采用默认值,默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.search TYPEAS s_string + 输入.point_type TYPEAS s_string + 输入.area_type TYPEAS s_string + 输入.point_status TYPEAS s_string + 输入.lock_type TYPEAS s_string + 输入.is_used TYPEAS s_string + 输入.material_id TYPEAS s_string + 输入.vehicle_type TYPEAS s_string + 输入.device_code TYPEAS s_string + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + PAGEQUERY + SELECT + a.*,b.device_name + FROM + sch_base_point a + left join + pdm_base_device b on a.device_id = b.device_id + WHERE + a.is_delete = '0' + OPTION 输入.search <> "" + (a.point_code like 输入.search or + a.point_name like 输入.search) + ENDOPTION + OPTION 输入.point_type <> "" + a.point_type = 输入.point_type + ENDOPTION + OPTION 输入.area_type <> "" + a.area_type = 输入.area_type + ENDOPTION + OPTION 输入.point_status <> "" + a.point_status = 输入.point_status + ENDOPTION + OPTION 输入.lock_type <> "" + a.lock_type = 输入.lock_type + ENDOPTION + OPTION 输入.is_used <> "" + a.is_used = 输入.is_used + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "2" + PAGEQUERY + SELECT + a.*,b.sect_code + FROM + ST_IVT_StructAttr a + left join + ST_IVT_SectAttr b on a.sect_id = b.sect_id + WHERE + a.is_delete = '0' + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "3" + PAGEQUERY + SELECT DISTINCT + structattr.struct_id, + structattr.struct_code, + structattr.struct_name, + point.area_type, + point.point_type + FROM + st_ivt_structattr structattr + LEFT JOIN sch_base_point point ON point.point_id = structattr.struct_id + LEFT JOIN ST_IVT_StructRelaVehicleType rulevehicle ON rulevehicle.struct_id = structattr.struct_id + LEFT JOIN ST_IVT_StructAttributeRules ruledis ON ruledis.struct_id = structattr.struct_id + WHERE + point.lock_type = '00' + AND (point.vehicle_code = '' or point.vehicle_code is null) + AND point.point_status = '00' + AND point.area_type = 输入.area_type + AND rulevehicle.vehicle_type = 输入.vehicle_type + OPTION 输入.search <> "" + (structattr.struct_code like 输入.search or + structattr.struct_name like 输入.search) + ENDOPTION + OPTION 输入.loadSeries <> "" + ruledis.load_series >= 输入.loadSeries + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "4" + PAGEQUERY + select ca.* from St_CacheLine_Position ca + inner join MD_PB_StorageVehicleExt ve on ca.vehicle_code = ve.storagevehicle_code + inner PDM_BI_Device dev on dev.cacheLine_code = ca.cacheLine_code + where dev.material_id = 输入.material_id + and dev.is_delete = 0 + and ca.is_active =1 + and dev.is_delete = 0 + ENDPAGEQUERY + ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index 164cd378..02c0b53e 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch_point.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch_point.wql new file mode 100644 index 00000000..81a6dfd9 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch_point.wql @@ -0,0 +1,124 @@ +[交易说明] + 交易名: 点位管理查询 + 所属模块: + 功能简述: + 版权所有: + 表引用: + 版本经历: + +[数据库] + --指定数据库,为空采用默认值,默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.search TYPEAS s_string + 输入.point_type TYPEAS s_string + 输入.area_type TYPEAS s_string + 输入.point_status TYPEAS s_string + 输入.lock_type TYPEAS s_string + 输入.is_used TYPEAS s_string + 输入.material_id TYPEAS s_string + 输入.vehicle_type TYPEAS s_string + 输入.device_code TYPEAS s_string + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + PAGEQUERY + SELECT + a.*,b.device_name + FROM + sch_base_point a + left join + pdm_base_device b on a.device_id = b.device_id + WHERE + a.is_delete = '0' + OPTION 输入.search <> "" + (a.point_code like 输入.search or + a.point_name like 输入.search) + ENDOPTION + OPTION 输入.point_type <> "" + a.point_type = 输入.point_type + ENDOPTION + OPTION 输入.area_type <> "" + a.area_type = 输入.area_type + ENDOPTION + OPTION 输入.point_status <> "" + a.point_status = 输入.point_status + ENDOPTION + OPTION 输入.lock_type <> "" + a.lock_type = 输入.lock_type + ENDOPTION + OPTION 输入.is_used <> "" + a.is_used = 输入.is_used + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "2" + PAGEQUERY + SELECT + a.*,b.sect_code + FROM + ST_IVT_StructAttr a + left join + ST_IVT_SectAttr b on a.sect_id = b.sect_id + WHERE + a.is_delete = '0' + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "3" + PAGEQUERY + SELECT DISTINCT + structattr.struct_id, + structattr.struct_code, + structattr.struct_name, + point.area_type, + point.point_type + FROM + st_ivt_structattr structattr + LEFT JOIN sch_base_point point ON point.point_id = structattr.struct_id + LEFT JOIN ST_IVT_StructRelaVehicleType rulevehicle ON rulevehicle.struct_id = structattr.struct_id + LEFT JOIN ST_IVT_StructAttributeRules ruledis ON ruledis.struct_id = structattr.struct_id + WHERE + point.lock_type = '00' + AND (point.vehicle_code = '' or point.vehicle_code is null) + AND point.point_status = '00' + AND point.area_type = 输入.area_type + AND rulevehicle.vehicle_type = 输入.vehicle_type + OPTION 输入.search <> "" + (structattr.struct_code like 输入.search or + structattr.struct_name like 输入.search) + ENDOPTION + OPTION 输入.loadSeries <> "" + ruledis.load_series >= 输入.loadSeries + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF