diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/check/service/impl/PdaCheckServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/check/service/impl/PdaCheckServiceImpl.java index 0a8e8ee..7462585 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/check/service/impl/PdaCheckServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/check/service/impl/PdaCheckServiceImpl.java @@ -44,7 +44,8 @@ public class PdaCheckServiceImpl implements PdaCheckService { int page = Integer.valueOf(jsonObject.get("page")); int size = Integer.valueOf(jsonObject.get("size")); Pageable pageable = PageRequest.of(page - 1, size); - JSONObject materialja = WQL.getWO("QPADSERVICE").addParam("flag", "15").pageQuery(WqlUtil.getHttpContext(pageable), ""); + String searchbar = jsonObject.get("searchbar"); + JSONObject materialja = WQL.getWO("QPADSERVICE").addParam("searchbar",searchbar).addParam("flag", "15").pageQuery(WqlUtil.getHttpContext(pageable), ""); returnjo.put("code", "1"); returnjo.put("desc", "确认成功！"); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/check/wql/QPADSERVICE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/check/wql/QPADSERVICE.wql deleted file mode 100644 index f2c7129..0000000 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/check/wql/QPADSERVICE.wql +++ /dev/null @@ -1,366 +0,0 @@ -[交易说明] - 交易名： 库区分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.name TYPEAS s_string - 输入.label_code TYPEAS s_string - 输入.buss_type TYPEAS s_string - 输入.sect_uuid TYPEAS s_string - 输入.material_uuid TYPEAS s_string - 输入.struct_uuid TYPEAS s_string - 输入.real_qty TYPEAS s_string - 输入.barcode TYPEAS s_string - 输入.bussdtl_type TYPEAS s_string - 输入.bill_uuid TYPEAS s_string - 输入.pcsn TYPEAS s_string - 输入.search_bar TYPEAS s_string - 输入.buss_area_type TYPEAS s_string - 输入.height TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - dtl.billdtl_uuid, - mst.bill_code, - material.material_code, - material.material_name, - material.material_uuid, - material.material_spec, - customer.customer_uuid, - customer.customer_uuid, - customer.customer_name, - dtl.pcsn, - ROUND(dtl.qty,5)AS plan_qty, - ROUND(dtl.qty,5)AS real_qty - FROM - st_buss_iostoredtl dtl - LEFT JOIN st_buss_iostoremst mst ON dtl.bill_uuid = mst.bill_uuid - LEFT JOIN md_base_material material ON dtl.material_uuid = material.material_uuid - LEFT JOIN md_base_customer customer ON dtl.customer_uuid = customer.customer_uuid - where - dtl.bill_status <>'40' - and dtl.bill_status<>'30' - and is_select_group='0' - and mst.is_delete='0' - OPTION 输入.buss_type <> "" - dtl.buss_type = 输入.buss_type - ENDOPTION - OPTION 输入.bussdtl_type <> "" - dtl.bussdtl_type = 输入.bussdtl_type - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "2" - QUERY - SELECT - mst.material_spce, - mst.material_class - FROM - md_base_materialLabelDtl dtl - LEFT JOIN md_base_materialLabelMst mst ON mst.label_uuid = dtl.label_uuid - WHERE - 1=1 - OPTION 输入.label_code <> "" - dtl.label_code = 输入.label_code - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - struct.struct_uuid, - struct.struct_code, - struct.struct_name - FROM - st_buss_checkmst mst - LEFT JOIN st_buss_checkdtl dtl ON dtl.bill_uuid = mst.bill_uuid - LEFT JOIN st_base_struct struct ON struct.struct_uuid = dtl.struct_uuid - WHERE - mst.is_delete = '0' - AND bill_status <> '04' - OPTION 输入.sect_uuid <> "" - struct.sect_uuid = 输入.sect_uuid - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "4" - QUERY - SELECT - dtl.billdtl_uuid, - struct.struct_code, - dtl.vehicle_code, - dtl.material_uuid, - material.material_name, - material.material_code, - ROUND(dtl.ivt_qty,0)AS canuse_qty, - ROUND(dtl.ivt_qty,0)AS check_qty - FROM - st_buss_checkmst mst - LEFT JOIN st_buss_checkdtl dtl ON dtl.bill_uuid = mst.bill_uuid - LEFT JOIN st_base_struct struct ON struct.struct_uuid = dtl.struct_uuid - LEFT JOIN md_base_material material ON material.material_uuid = dtl.material_uuid - WHERE - mst.is_delete = '0' - AND dtl.dtl_status ='02' - OPTION 输入.sect_uuid <> "" - struct.sect_uuid = 输入.sect_uuid - ENDOPTION - OPTION 输入.material_uuid <> "" - material.material_uuid = 输入.material_uuid - ENDOPTION - OPTION 输入.struct_uuid <> "" - struct.struct_uuid = 输入.struct_uuid - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "5" - QUERY - SELECT - point.area_type, - point.point_uuid, - point.point_code AS struct_code, - point.vehicle_code, - ivt.barcode, - ivt.canuse_qty - FROM - st_ivt_structivt ivt - LEFT JOIN sch_base_point point ON point_uuid = ivt.struct_uuid - where - 1=1 - and ivt.canuse_qty>0 - OPTION 输入.material_uuid <> "" - ivt.material_uuid = 输入.material_uuid - ENDOPTION - OPTION 输入.real_qty <> "" - ivt.canuse_qty <= 输入.real_qty - ENDOPTION - order by instorage_time - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "6" - QUERY - SELECT - st.bill_code, - st.bill_uuid AS billdtl_uuid, - material.material_code, - material.material_name, - material.material_spec, - material.material_uuid, - ivt.quality_status, - ivt.canuse_qty AS real_qty , - unit.unit_name AS unit_Name, - st.vehicle_code - FROM - st_buss_OutStByVehicle st - LEFT JOIN md_base_material material ON st.material_uuid = material.material_uuid - LEFT JOIN st_ivt_structIvt ivt ON ivt.vehicle_code = st.vehicle_code - LEFT JOIN md_base_unit unit ON ivt.qty_unit_uuid = unit.unit_uuid - where - st.bill_status='01' - OPTION 输入.bussdtl_type <> "" - st.bill_type = 输入.bussdtl_type - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "7" - QUERY - SELECT - * - FROM - V_JM_BarCodeForAGV agv - where - 1=1 - OPTION 输入.barcode <> "" - agv.barcode = 输入.barcode - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "8" - QUERY - SELECT - point.area_type, - point.point_uuid, - point.point_code AS struct_code, - point.vehicle_code, - ivt.barcode, - ivt.canuse_qty - FROM - st_ivt_structivt ivt - LEFT JOIN sch_base_point point ON point_uuid = ivt.struct_uuid - where - ivt.quality_status in(1,2) - and ivt.canuse_qty>0 - OPTION 输入.material_uuid <> "" - ivt.material_uuid = 输入.material_uuid - ENDOPTION - OPTION 输入.real_qty <> "" - ivt.canuse_qty <= 输入.real_qty - ENDOPTION - order by instorage_time - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "9" - QUERY - SELECT - * - FROM - st_buss_iostoredis dis - LEFT JOIN st_buss_iostoredtl dtl ON dis.billdtl_uuid = dtl.billdtl_uuid - WHERE - dtl.bill_status <> '40' - and dis.vehicle_code<>'' - and dis.is_delete='0' - OPTION 输入.barcode <> "" - dis.barcode = 输入.barcode - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF - - - - IF 输入.flag = "10" - QUERY - SELECT - * - FROM - st_buss_iostoremst mst - LEFT JOIN st_buss_iostoredtl dtl ON dtl.bill_uuid = mst.bill_uuid - LEFT JOIN st_buss_iostoredis dis ON dis.billdtl_uuid = dtl.billdtl_uuid - AND dis.is_delete = '0' - LEFT JOIN sch_base_task task ON task.task_uuid = dis.task_uuid - WHERE - dis.vehicle_code <> '' - AND dis.barcode <> '' - AND dis.task_uuid = '' - OPTION 输入.bill_uuid <> "" - mst.bill_uuid = 输入.bill_uuid - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - -IF 输入.flag = "11" - QUERY - SELECT - * - FROM - st_buss_iostoremst mst - LEFT JOIN st_buss_iostoredtl dtl ON dtl.bill_uuid = mst.bill_uuid - LEFT JOIN st_buss_iostoredis dis ON dis.billdtl_uuid = dtl.billdtl_uuid - AND dis.is_delete = '0' - LEFT JOIN sch_base_task task ON task.task_uuid = dis.task_uuid - WHERE - dis.task_uuid <> '' - AND task.task_status <> '06' - OPTION 输入.bill_uuid <> "" - mst.bill_uuid = 输入.bill_uuid - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - -IF 输入.flag = "12" - QUERY - SELECT - * - FROM - st_buss_iostoremst mst - LEFT JOIN st_buss_iostoredtl dtl ON dtl.bill_uuid = mst.bill_uuid - LEFT JOIN st_buss_iostoredis dis ON dis.billdtl_uuid = dtl.billdtl_uuid - AND dis.is_delete = '0' - LEFT JOIN sch_base_task task ON task.task_uuid = dis.task_uuid - WHERE - dis.task_uuid <> '' - OPTION 输入.bill_uuid <> "" - mst.bill_uuid = 输入.bill_uuid - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - -IF 输入.flag = "13" - QUERY - SELECT - point.point_uuid as struct_uuid, - point.point_code as struct_code, - point.point_name as struct_name - FROM - sch_base_point point - left join st_rule_indisstruct rule on rule.struct_uuid = point.point_uuid - WHERE - 1 =1 - and point.lock_type='00' - and point.point_status='00' - and point.is_active='1' - OPTION 输入.buss_area_type <> "" - point.area_type = 输入.buss_area_type - ENDOPTIONR - OPTION 输入.height <> "" - rule.height <= 输入.height - ENDOPTION - OPTION 输入.search_bar <> "" - (point.point_code like "%" 输入.search_bar "%" or point.point_name like "%" 输入.search_bar "%") - ENDOPTION - order by point_code - ENDSELECT - ENDQUERY - ENDIF \ No newline at end of file diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql index c208427..328d2c5 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql @@ -28,6 +28,7 @@ 输入.search_bar TYPEAS s_string 输入.buss_area_type TYPEAS s_string 输入.height TYPEAS s_string + 输入.searchbar TYPEAS s_string [临时表] @@ -384,6 +385,10 @@ IF 输入.flag = "13" material.material_spec FROM md_me_material material + where 1=1 + OPTION 输入.searchbar <> "" + (material.material_code like "%" 输入.searchbar "%" OR material.material_name like "%" 输入.searchbar "%") + ENDOPTION ENDSELECT ENDPAGEQUERY ENDIF