From 09bba0589b195dcb4455d1d89582fc9820df6602 Mon Sep 17 00:00:00 2001 From: zhaoyf <1783123481@qq.com> Date: Mon, 6 Jul 2026 17:23:48 +0800 Subject: [PATCH] =?UTF-8?q?opt:pda=E5=B7=A5=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E5=8D=95=E7=BB=84=E7=9B=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work_order/WorkOrderController.java | 4 ++-- .../impl/ProductGroupServiceImpl.java | 14 +++++++++++++ .../service/work_order/IWorkOrderService.java | 7 ++----- .../dao/mapper/WorkOrderBomMapper.java | 9 +++++++++ .../dao/mapper/WorkOrderMapper.java | 5 +---- .../work_order/dao/mapper/WorkOrderMapper.xml | 18 +---------------- .../work_order/impl/WorkOrderServiceImpl.java | 20 +++++++++---------- 7 files changed, 38 insertions(+), 39 deletions(-) create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderBomMapper.java diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java index f6af14f..50246b9 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/controller/work_order/WorkOrderController.java @@ -40,8 +40,8 @@ public class WorkOrderController { } @GetMapping("/getListPda") - public ResponseEntity getListPda(Map query, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(iWorkOrderService.queryList(page,query)),HttpStatus.OK); + public ResponseEntity getListPda(@RequestParam Map query){ + return new ResponseEntity<>(iWorkOrderService.queryList(query),HttpStatus.OK); } @PostMapping diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java index bd590f4..7b0dce3 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/product_group/impl/ProductGroupServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.welding_manage.service.product_group.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.IdUtil; @@ -11,6 +12,8 @@ import org.nl.wms.welding_manage.enums.work_order.StatusEnum; import org.nl.wms.welding_manage.service.product_group.IProductGroupService; import org.nl.wms.welding_manage.service.product_group.dto.GroupPalletDto; import org.nl.wms.welding_manage.service.work_order.IWorkOrderService; +import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao; +import org.nl.wms.welding_manage.service.work_order.dao.mapper.WorkOrderBomMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,6 +33,9 @@ public class ProductGroupServiceImpl implements IProductGroupService { @Autowired private IWorkOrderService workOrderService; + @Autowired + private WorkOrderBomMapper workOrderBomMapper; + @Autowired private MdPbGroupplateMapper GroupPlateMapper; @@ -93,5 +99,13 @@ public class ProductGroupServiceImpl implements IProductGroupService { schBasePointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, dto.getPalletCode()) .eq(SchBasePoint::getPoint_code, dto.getPointCode())); + + //更新工单单据状态 + List items = workOrderBomMapper.selectList(new LambdaQueryWrapper() + .eq(WorkOrderBomDao::getWork_order_code, dto.getWorkOrder())); + if (items.stream().noneMatch(item -> item.getBom_qty().compareTo(item.getUse_bom_qty()) != 0)){ + workOrderService.updateWorkOrderStatus(dto.getWorkOrder(), StatusEnum.WORK_ORDER_FINISH.getCode()); + } + } } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java index 0008ca0..3f3ee41 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/IWorkOrderService.java @@ -1,8 +1,6 @@ package org.nl.wms.welding_manage.service.work_order; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.common.domain.query.PageQuery; import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao; import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao; import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto; @@ -14,12 +12,11 @@ import java.util.Map; public interface IWorkOrderService extends IService { /** - * 分页查询工单详情 - * @param pageable + * 查询工单详情 * @param params * @return */ - IPage queryList(PageQuery pageable, Map params); + List queryList(Map params); /** * 新增工单 diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderBomMapper.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderBomMapper.java new file mode 100644 index 0000000..60e275c --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderBomMapper.java @@ -0,0 +1,9 @@ +package org.nl.wms.welding_manage.service.work_order.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao; + +@Mapper +public interface WorkOrderBomMapper extends BaseMapper { +} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java index 9a550f1..e83e8f4 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.java @@ -1,8 +1,6 @@ package org.nl.wms.welding_manage.service.work_order.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.lettuce.core.dynamic.annotation.Param; import org.apache.ibatis.annotations.Select; import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao; @@ -20,11 +18,10 @@ public interface WorkOrderMapper extends BaseMapper { /** * 分页查询工单 - * @param page * @param params * @return */ - IPage queryList(Page page, @Param("params") Map params); + List queryList(@Param("params") Map params); /** * 保存工单 diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml index aa7bb52..b09a69b 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/mapper/WorkOrderMapper.xml @@ -58,23 +58,7 @@ diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java index 4bfc171..8affba7 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java @@ -1,18 +1,15 @@ package org.nl.wms.welding_manage.service.work_order.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; +import org.nl.wms.welding_manage.service.work_order.IWorkOrderService; import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderBomDao; import org.nl.wms.welding_manage.service.work_order.dao.WorkOrderDao; import org.nl.wms.welding_manage.service.work_order.dao.mapper.WorkOrderMapper; import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto; -import org.nl.wms.welding_manage.service.work_order.IWorkOrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,7 +17,10 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @Slf4j @@ -31,12 +31,11 @@ public class WorkOrderServiceImpl extends ServiceImpl queryList(PageQuery page, Map params) { - IPage workOrderDataDtoIPage = workOrderMapper.queryList(new Page<>(page.getPage() + 1, page.getSize()), params); + public List queryList(Map params) { + List workOrderDataDtoIPage = workOrderMapper.queryList(params); - List records = workOrderDataDtoIPage.getRecords(); - if (records != null && !records.isEmpty()) { - for (WorkOrderDto.WorkOrderDataDto record : records) { + if (workOrderDataDtoIPage != null && !workOrderDataDtoIPage.isEmpty()) { + for (WorkOrderDto.WorkOrderDataDto record : workOrderDataDtoIPage) { //获取PortList并去重 List workOrderBomList = record.getWorkOrderBomList(); @@ -69,7 +68,6 @@ public class WorkOrderServiceImpl extends ServiceImpl