From b3c5a94cfe4fa2129e09ca94aa01e3cde181422f Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Thu, 12 Mar 2026 19:54:29 +0800 Subject: [PATCH] no message --- .../config/default-spring-doc.properties | 2 +- .../inbound/request/ReceiveRequest.java | 4 -- .../service/impl/AsnDetailServiceImpl.java | 11 ------ .../inbound/service/impl/AsnServiceImpl.java | 14 +------ .../service/impl/ReceiveServiceImpl.java | 1 - .../src/main/resources/banner.txt | 10 +++++ k8s/kubepi-serviceaccount.yaml | 37 +++++++++++++++++++ 7 files changed, 49 insertions(+), 30 deletions(-) create mode 100644 cpte-wms-service/cpte-wms-inbound-service/src/main/resources/banner.txt create mode 100644 k8s/kubepi-serviceaccount.yaml diff --git a/cpte-boot-base-core/src/main/resources/config/default-spring-doc.properties b/cpte-boot-base-core/src/main/resources/config/default-spring-doc.properties index 6742841..2bbd00a 100644 --- a/cpte-boot-base-core/src/main/resources/config/default-spring-doc.properties +++ b/cpte-boot-base-core/src/main/resources/config/default-spring-doc.properties @@ -1,2 +1,2 @@ springdoc.auto-tag-classes= false -springdoc.packages-to-scan= org.jeecg \ No newline at end of file +springdoc.packages-to-scan= org.jeecg, org.cpte \ No newline at end of file diff --git a/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/request/ReceiveRequest.java b/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/request/ReceiveRequest.java index c0698b7..e614ec2 100644 --- a/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/request/ReceiveRequest.java +++ b/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/request/ReceiveRequest.java @@ -1,7 +1,6 @@ package org.cpte.modules.inbound.request; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; import lombok.Data; import java.io.Serializable; @@ -16,15 +15,12 @@ import java.io.Serializable; @Schema(description = "收货参数") public class ReceiveRequest implements Serializable { - @NotBlank(message = "物料编码不能为空") @Schema(description = "物料编码") private String itemCode; - @NotBlank(message = "库位编码不能为空") @Schema(description = "库位编码") private String pointCode; - @NotBlank(message = "容器编码不能为空") @Schema(description = "容器编码") private String stockCode; } diff --git a/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/AsnDetailServiceImpl.java b/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/AsnDetailServiceImpl.java index 82c065e..f0df3c3 100644 --- a/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/AsnDetailServiceImpl.java +++ b/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/AsnDetailServiceImpl.java @@ -1,29 +1,18 @@ package org.cpte.modules.inbound.service.impl; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import org.apache.commons.collections4.CollectionUtils; -import org.apache.shiro.SecurityUtils; -import org.cpte.modules.constant.GeneralConstant; import org.cpte.modules.constant.enums.*; import org.cpte.modules.inbound.entity.Asn; import org.cpte.modules.inbound.entity.AsnDetail; -import org.cpte.modules.inbound.entity.ReceiveRecord; import org.cpte.modules.inbound.mapper.AsnDetailMapper; import org.cpte.modules.inbound.mapper.AsnMapper; -import org.cpte.modules.inbound.rule.AsnSerialNumberRule; import org.cpte.modules.inbound.service.IAsnDetailService; -import org.cpte.modules.inventory.dto.ItemKeyDTO; -import org.jeecg.common.system.vo.LoginUser; import org.springframework.stereotype.Service; - import java.math.BigDecimal; import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; /** * @Description: 入库明细 diff --git a/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/AsnServiceImpl.java b/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/AsnServiceImpl.java index 3e5d81a..50e6902 100644 --- a/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/AsnServiceImpl.java +++ b/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/AsnServiceImpl.java @@ -138,7 +138,6 @@ public class AsnServiceImpl extends ServiceImpl implements IAsnS AtomicInteger lineNoCounter = new AtomicInteger(1); List insertDetails = new ArrayList<>(); - List updateDetails = new ArrayList<>(); for (AsnDetail entity : asnDetailList) { // 自动设置行号 @@ -148,22 +147,11 @@ public class AsnServiceImpl extends ServiceImpl implements IAsnS // 设置关联 ID entity.setAsnId(asn.getId()); - - // 分类：新增或更新 - if (entity.getId() != null) { - updateDetails.add(entity); - } else { - insertDetails.add(entity); - } } asnDataProcessor.updateAsn(asn); if (CollectionUtils.isNotEmpty(insertDetails)) { - asnDetailService.saveBatch(insertDetails); - } - - if (CollectionUtils.isNotEmpty(updateDetails)) { - asnDetailService.updateBatchById(updateDetails); + asnDetailService.saveOrUpdateBatch(insertDetails); } // 3. 刷新入库单 diff --git a/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/ReceiveServiceImpl.java b/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/ReceiveServiceImpl.java index b5559e3..2abda40 100644 --- a/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/ReceiveServiceImpl.java +++ b/cpte-wms-service/cpte-wms-inbound-service/src/main/java/org/cpte/modules/inbound/service/impl/ReceiveServiceImpl.java @@ -1,6 +1,5 @@ package org.cpte.modules.inbound.service.impl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.cpte.feign.client.BasicServiceClient; diff --git a/cpte-wms-service/cpte-wms-inbound-service/src/main/resources/banner.txt b/cpte-wms-service/cpte-wms-inbound-service/src/main/resources/banner.txt new file mode 100644 index 0000000..97d432b --- /dev/null +++ b/cpte-wms-service/cpte-wms-inbound-service/src/main/resources/banner.txt @@ -0,0 +1,10 @@ + +██████ ██████ ████████ ███████ ██ ██ ███ ███ ███████ +██ ██ ██ ██ ██ ██ ██ ████ ████ ██ +██ ██████ ██ █████ █████ ██ █ ██ ██ ████ ██ ███████ +██ ██ ██ ██ ██ ███ ██ ██ ██ ██ ██ + ██████ ██ ██ ███████ ███ ███ ██ ██ ███████ + +Spring Boot Version: ${spring-boot.version} +版权所属： 中邮科技股份有限公司 +公司官网： www.cpte.com diff --git a/k8s/kubepi-serviceaccount.yaml b/k8s/kubepi-serviceaccount.yaml new file mode 100644 index 0000000..8fb4257 --- /dev/null +++ b/k8s/kubepi-serviceaccount.yaml @@ -0,0 +1,37 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: kubepi-admin + namespace: wms-system + labels: + app: kubepi +--- +apiVersion: v1 +kind: Secret +metadata: + name: kubepi-admin-token + namespace: wms-system + annotations: + kubernetes.io/service-account.name: kubepi-admin +type: kubernetes.io/service-account-token +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: kubepi-admin-binding + labels: + app: kubepi +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin +subjects: + - kind: ServiceAccount + name: kubepi-admin + namespace: wms-system +--- +# 应用配置后，执行以下命令获取长期有效的 Bearer Token: +# kubectl -n wms-system get secret kubepi-admin-token -o jsonpath='{.data.token}' | base64 -d +# +# 获取 API Server 地址: +# kubectl cluster-info