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 3889cad..9fac4ed 100644 Binary files a/wms-webapi/src/main/resources/templates/import/batch.xlsx and b/wms-webapi/src/main/resources/templates/import/batch.xlsx differ