diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java index 9088a41..bf3532b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java @@ -13,4 +13,5 @@ public class MdBaseMaterialQuery implements Serializable { private String blurry; private String material_spec; private String material_model; + private String material_code; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml index 53f9430..b35852f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml @@ -19,7 +19,6 @@ `sch_base_point` p LEFT JOIN sch_base_vehiclematerialgroup vg ON p.vehicle_code = vg.vehicle_code AND p.vehicle_type = vg.vehicle_type AND vg.group_bind_material_status = '2' - LEFT JOIN pdm_bd_workorder w ON w.workorder_code = vg.workorder_code WHERE (p.ing_task_code = '' OR p.ing_task_code IS NULL) AND p.point_status = '3' AND vg.group_id IS NOT NULL AND vg.material_id = #{materialId} AND p.region_code IN diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/sortedOrder.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/sortedOrder.vue index b50c4dc..992e11a 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/sortedOrder.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/sortedOrder.vue @@ -163,18 +163,28 @@ - - + + + - - + + - - + + - - + + + + + + + + + + + - - - + + + + + + + + + + + + + + + this.dict.label.vehicle_type[key] === row.pack_palletspec) if (result) { this.form.vehicle_type = result