From 384c1bc5894c22526ae0618c0af57f57859b4f48 Mon Sep 17 00:00:00 2001 From: yanps Date: Tue, 8 Oct 2024 09:11:17 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20sorting=E4=BA=A4=E4=BA=92=E4=BC=98?= =?UTF-8?q?=E5=8C=96,=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=9B=98=E8=AE=A2?= =?UTF-8?q?=E5=8D=95,=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SortingServiceImpl.java | 7 ++-- .../SchBaseVehiclematerialgroupMapper.xml | 6 ++++ .../dto/SchBaseVehiclematerialgroupQuery.java | 2 ++ .../src/views/wms/sch/group/index.vue | 32 +++++++++++++++---- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java index 5d7d63a..de164e2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java @@ -199,13 +199,14 @@ public class SortingServiceImpl implements SortingService { public List getStructList(String jobName) { log.info("sorting查询组盘请求参数数据:{}", jobName); List list = iSchBaseVehiclematerialgroupService.list(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class) - .eq(SchBaseVehiclematerialgroup::getJob_name, jobName)); + .eq(SchBaseVehiclematerialgroup::getJob_name, jobName) + .eq(SchBaseVehiclematerialgroup::getCreate_name,"Connector")); List connectors = new ArrayList<>(); for (SchBaseVehiclematerialgroup schBaseVehiclematerialgroup : list) { Gson gson = new Gson(); ConnectorDto connectorDto = gson.fromJson(schBaseVehiclematerialgroup.getExtend(), ConnectorDto.class); - connectorDto.setDueDate(StrUtil.isNotEmpty(connectorDto.getDueDate()) ? connectorDto.getDueDate() : RegionEnum.TRUBEND_SHELVES_3_1_1.getRegion_code()); - connectorDto.setNextOperation(StrUtil.isNotEmpty(connectorDto.getNextOperation()) ? connectorDto.getNextOperation() : DateUtil.now()); + connectorDto.setDueDate(StrUtil.isNotEmpty(connectorDto.getDueDate()) ? connectorDto.getDueDate() : DateUtil.now() ); + connectorDto.setNextOperation(StrUtil.isNotEmpty(connectorDto.getNextOperation()) ? connectorDto.getNextOperation() : RegionEnum.TRUBEND_SHELVES_3_1_1.getRegion_code()); connectors.add(connectorDto); } log.info("sorting查询组盘响应参数:{}", JSONObject.toJSONString(connectors)); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml index 0bacc91..81e0c79 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml @@ -91,6 +91,12 @@ AND vg.region_code = #{query.region_code} + + AND vg.order_code like CONCAT('%', #{query.order_code}, '%') + + + AND vg.material_id like CONCAT('%', #{query.material_id}, '%') + ) SELECT * FROM RankedVehicles diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java index 9d78104..66dfdce 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java @@ -16,4 +16,6 @@ public class SchBaseVehiclematerialgroupQuery implements Serializable { private String workshop_code; private String region_code; private String job_name; + private String order_code; + private String material_id; } diff --git a/lms/nladmin-ui/src/views/wms/sch/group/index.vue b/lms/nladmin-ui/src/views/wms/sch/group/index.vue index 7240b7b..3709906 100644 --- a/lms/nladmin-ui/src/views/wms/sch/group/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/group/index.vue @@ -75,6 +75,24 @@ @keyup.enter.native="crud.toQuery" /> + + + + + + @@ -239,7 +257,7 @@ - @@ -323,7 +341,7 @@ import crudSchBaseVehiclematerialgroup from './schBaseVehiclematerialgroup' import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' -import udOperation from '@crud/UD.operation' +// import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop' import MaterialDialog from '@/views/wms/sch/group/MaterialDialog.vue' @@ -366,7 +384,7 @@ const defaultForm = { export default { name: 'VehicleMaterialGroup', dicts: ['group_status', 'group_bind_material_status'], - components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation }, + components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({