diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql index 85a1df8..9f04bfb 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql @@ -386,6 +386,7 @@ IF 输入.flag = "13" point.area_type = '07' AND device_point_type = '01' AND point.MODE <> '0' + AND point.point_status='00' AND ( point.vehicle_code = '' OR point.vehicle_code IS NULL ) AND task.task_code IS NULL ENDSELECT @@ -419,6 +420,9 @@ IF 输入.flag = "14" OPTION 输入.area_type <> "" point.area_type = 输入.area_type ENDOPTION + OPTION 输入.material_type <> "" + material.material_type = 输入.material_type + ENDOPTION order by ruledis.out_seq_no ENDSELECT ENDQUERY