From 9e0ff6cfd4b6cb728f875feb3619700bf02bb42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 27 Mar 2026 20:33:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(component):=20=E6=B7=BB=E5=8A=A0=E9=9B=B6?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 ComponentPackingController 控制器,提供零部件打包相关接口 - 实现出库单列表查询、装箱单详情查看、订单信息获取等功能 - 添加打包信息的新增、修改、删除操作支持 - 集成 SAP 服务获取零部件订单信息 - 实现 PDF 导出功能,支持装箱单打印 - 添加 PDA 端任务接口,支持移动端操作 - 增加业务验证逻辑,防止重复创建和误删已完成单据 --- .../nflg/wms/admin/controller/ComponentPackingController.java | 3 +-- .../java/com/nflg/wms/common/pojo/qo/ComponentPackingQO.java | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java index d570dac5..65cf4ba9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java @@ -60,8 +60,7 @@ public class ComponentPackingController { */ @PostMapping("search") public ApiResult> search(@Valid @RequestBody ComponentPackingQO request) { - PageData pageData = PageUtil.convert(wmscomponentPackingService.search(request), d -> Convert.convert(ComponentPackingVO.class, d)); - return ApiResult.success(pageData); + return ApiResult.success(wmscomponentPackingService.search(request)); } /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingQO.java index d5537c42..093a6995 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -19,6 +20,7 @@ public class ComponentPackingQO extends SearchBaseQO { /** * 办事处代理商 */ + @JsonProperty("pName") private String pName;