From 2b6c4ff7f3b6a76c1304c6c8daca37a448e37f08 Mon Sep 17 00:00:00 2001 From: zc Date: Fri, 17 Apr 2026 17:01:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=87=E8=AE=B0=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/model/req/BatchImportRowReq.java | 8 -------- .../service/impl/MaterialInfoServiceImpl.java | 9 +++++++-- .../model/req/WorkOrderInfoReq.java | 6 ++++++ .../service/impl/WorkOrderServiceImpl.java | 10 +++++++--- .../weighManage/ah/AHDZCConnect.java | 4 ++-- .../resources/templates/import/batch.xlsx | Bin 9087 -> 9057 bytes 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/req/BatchImportRowReq.java b/wms-module-system/src/main/java/top/wms/admin/material/model/req/BatchImportRowReq.java index a9f1c88..d8742f2 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/BatchImportRowReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/BatchImportRowReq.java @@ -30,12 +30,4 @@ public class BatchImportRowReq implements Serializable { @Length(max = 255, message = "批次长度不能超过 {max} 个字符") private String batch; - /** - * 标记 - */ - @Schema(description = "标记") - @NotBlank(message = "标记不能为空") - @Length(max = 25, message = "标记长度不能超过 {max} 个字符") - private String mark; - } diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java index 27836b7..5992c6c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java @@ -512,11 +512,17 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl validRowList = this.filterImportData2(importRowList); materialImportResp.setValidRows(validRowList.size()); CheckUtils.throwIfEmpty(validRowList, "数据文件格式错误"); + Set batchSet = validRowList.stream().map(BatchImportRowReq::getBatch).collect(Collectors.toSet()); + if (batchSet.size() > 1) { + throw new BusinessException("存在不同批次数据，请检查批次信息"); + } + + validRowList = validRowList.stream().distinct().collect(Collectors.toList()); // 设置导入会话并缓存数据，有效期10分钟 String importKey = UUID.fastUUID().toString(true); RedisUtils.set(CacheConstants.DATA_IMPORT_KEY + importKey, JSONUtil.toJsonStr(validRowList), Duration @@ -543,7 +549,6 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl { workOrderInfoDO.setWorkOrderId(workOrder.getId()); workOrderInfoDO.setBatch(materialInfoDO.getBatch()); - workOrderInfoDO.setMark(materialInfoDO.getMark()); }); workOrderInfoMapper.insertBatch(workOrderInfoDOList); diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java index 8f4e034..090c8f7 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java @@ -28,9 +28,9 @@ import java.util.regex.Pattern; public class AHDZCConnect { //老设备（只能跑jar包的） - // private static final String PORT_NAME = "COM12"; + private static final String PORT_NAME = "COM12"; //新设备（环境齐全的） - private static final String PORT_NAME = "COM13"; + // private static final String PORT_NAME = "COM13"; private static final int BAUD_RATE = 9600; private static final int DATA_BITS = 8; private static final int STOP_BITS = 1; diff --git a/wms-webapi/src/main/resources/templates/import/batch.xlsx b/wms-webapi/src/main/resources/templates/import/batch.xlsx index 3889cad88677f47f746761d5cee284b7f7449bc1..9fac4ed7023c710718717718ef1ae79aff0d346b 100644 GIT binary patch delta 2156 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