From b1e1dcc44f6daaf393fb2d49454f2f60083c4401 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 29 Oct 2025 10:24:58 +0800 Subject: [PATCH] =?UTF-8?q?2025-10-29=20=E6=8E=A5=E5=8F=A3=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java | 5 +++++ .../modules/oa/service/impl/SalesOrderServiceImpl.java | 2 ++ .../modules/schedule/controller/SchedulingController.java | 2 -- .../java/com/gaotao/modules/sop/dto/SopFileRequestDto.java | 6 ++++++ .../com/gaotao/modules/sop/entity/FileManagementEntity.java | 5 +++++ .../gaotao/modules/sop/service/impl/SopFileServiceImpl.java | 2 ++ 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java b/src/main/java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java index 6b97bb8..d2f24ea 100644 --- a/src/main/java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java +++ b/src/main/java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java @@ -112,5 +112,10 @@ public class SalesOrderItemDto { * 订单备注说明-4 */ private String orderRef4; + + /** + * 标准装箱数量 + */ + private Double stdPackingQty; } diff --git a/src/main/java/com/gaotao/modules/oa/service/impl/SalesOrderServiceImpl.java b/src/main/java/com/gaotao/modules/oa/service/impl/SalesOrderServiceImpl.java index 92a9cb8..5cfea99 100644 --- a/src/main/java/com/gaotao/modules/oa/service/impl/SalesOrderServiceImpl.java +++ b/src/main/java/com/gaotao/modules/oa/service/impl/SalesOrderServiceImpl.java @@ -128,6 +128,7 @@ public class SalesOrderServiceImpl implements SalesOrderService { String orderref2 = item.getOrderRef2() != null ? item.getOrderRef2() : ""; String orderref3 = item.getOrderRef3() != null ? item.getOrderRef3() : ""; String interfaceName = "销售订单接口"; + String stdPackingQty = item.getStdPackingQty() == null ? "" : String.valueOf(item.getStdPackingQty()); // 标准装箱数量 List params = new ArrayList<>(); params.add(site); @@ -151,6 +152,7 @@ public class SalesOrderServiceImpl implements SalesOrderService { params.add(orderref2); params.add(orderref3); params.add(interfaceName); + params.add(stdPackingQty); // 执行存储过程 List> resultList = procedureDao.getProcedureData("UspInsertOutboundNotification", params); diff --git a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java index 9aec0dc..30c657b 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java @@ -602,7 +602,6 @@ public class SchedulingController extends AbstractController { /** * @author: sxm * @description: 拓展排产批量排产 - * @param [inData] * @return: com.gaotao.common.utils.R * @date: 2022/11/23 14:13 */ @@ -618,7 +617,6 @@ public class SchedulingController extends AbstractController { /** * @author: sxm * @description: 移动派工单排产位置 - * @param [inData] * @return: com.gaotao.common.utils.R * @date: 2022/12/2 16:38 */ diff --git a/src/main/java/com/gaotao/modules/sop/dto/SopFileRequestDto.java b/src/main/java/com/gaotao/modules/sop/dto/SopFileRequestDto.java index 3025aa7..03520a5 100644 --- a/src/main/java/com/gaotao/modules/sop/dto/SopFileRequestDto.java +++ b/src/main/java/com/gaotao/modules/sop/dto/SopFileRequestDto.java @@ -97,4 +97,10 @@ public class SopFileRequestDto { */ @NotBlank(message = "文件名称不能为空") private String fileName; + + /** + * 公共文件标识 + */ + @NotBlank(message = "公共文件标识不能为空") + private String publicFlag; } diff --git a/src/main/java/com/gaotao/modules/sop/entity/FileManagementEntity.java b/src/main/java/com/gaotao/modules/sop/entity/FileManagementEntity.java index ee96968..fc07869 100644 --- a/src/main/java/com/gaotao/modules/sop/entity/FileManagementEntity.java +++ b/src/main/java/com/gaotao/modules/sop/entity/FileManagementEntity.java @@ -39,5 +39,10 @@ public class FileManagementEntity { private String checksum; @TableField(exist = false) private String updateFlag; // 'Y' or 'N' + /** + * 公共文件标识 + */ + @TableField(exist = false) + private String publicFlag; // 'Y' or 'N' } diff --git a/src/main/java/com/gaotao/modules/sop/service/impl/SopFileServiceImpl.java b/src/main/java/com/gaotao/modules/sop/service/impl/SopFileServiceImpl.java index c3b8ea0..1b056fc 100644 --- a/src/main/java/com/gaotao/modules/sop/service/impl/SopFileServiceImpl.java +++ b/src/main/java/com/gaotao/modules/sop/service/impl/SopFileServiceImpl.java @@ -113,6 +113,7 @@ public class SopFileServiceImpl implements SopFileService { entity.setFileName(request.getFileName()); entity.setFileSuffix("pdf"); // NOT NULL，默认值 entity.setUpdateFlag(request.getUpdateFlag()); + entity.setPublicFlag(request.getPublicFlag()); log.info("创建新文件记录"); // } @@ -228,6 +229,7 @@ public class SopFileServiceImpl implements SopFileService { params.add(item.getUpdateFlag()); // @updateFlag params.add(item.getUrlAddRess()); // @urlAddress - 使用文件路径 params.add(item.getFileSuffix()); // @fileSuffix - 使用文件后缀 + params.add(item.getPublicFlag()); // @publicFlag - 公共文件标识 log.debug("调用存储过程UspInsertSOP参数 {}", params);