From 2a3c10a84dcb6aeb7fb405f39fb722992402859c Mon Sep 17 00:00:00 2001 From: qianshijiang <1965297290@qq.com> Date: Wed, 26 Nov 2025 08:57:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?nacos=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 2f6fbb30..3216ea88 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,14 @@ qsj + dev + + 172.16.46.63:30848 qsj + DEFAULT_GROUP + nacos + P@ssword25 + 1.0.0 From a9a12c30440813e76e5b870c39f25b93c0d5a68a Mon Sep 17 00:00:00 2001 From: guojunyun Date: Wed, 26 Nov 2025 10:00:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=88=E5=90=8C=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=E6=A0=A1=E9=AA=8C=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zt/plat/module/contractorder/enums/ErrorCodeConstants.java | 1 + .../contractorder/service/contract/ContractServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErrorCodeConstants.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErrorCodeConstants.java index bb50fb27..0e837b7d 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErrorCodeConstants.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErrorCodeConstants.java @@ -31,4 +31,5 @@ public interface ErrorCodeConstants { ErrorCode CONTRACT_UNKNOWN_OPERATE = new ErrorCode(1_027_000_016, "未知的操作"); ErrorCode CONTRACT_PARTNER_NOT_EXISTS = new ErrorCode(1_027_000_017, "客商信息不存在"); ErrorCode CONTRACT_PUSH_FAIL = new ErrorCode(1_027_000_019, "推送合同失败：{}"); + ErrorCode CONTRACT_STATUS_NOT_CANCEL = new ErrorCode(1_027_000_020, "{}状态合同不允许作废"); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 29d6b0ce..ce69eab7 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -1589,7 +1589,7 @@ public class ContractServiceImpl implements ContractService { // 合同状态校验 if (!DictEnum.BSE_CTRT_STS_IN_PROGRESS.getCode().equals(contractMainDO.getStatus())) { - throw exception(CONTRACT_STATUS_NOT_ARCHIVE, + throw exception(CONTRACT_STATUS_NOT_CANCEL, DictEnum.getByCodeAndType(contractMainDO.getStatus(), DictTypeConstants.BSE_CTRT_STS).getLabel()); } From 770036aecdd729482361f237a695bf710190e6fb Mon Sep 17 00:00:00 2001 From: qianshijiang <1965297290@qq.com> Date: Wed, 26 Nov 2025 10:38:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-server/src/main/resources/logback-spring.xml | 5 +++-- .../src/main/resources/logback-spring.xml | 7 ++++--- .../src/main/resources/logback-spring.xml | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/base-server/src/main/resources/logback-spring.xml b/base-server/src/main/resources/logback-spring.xml index 2bde9644..cc9f1f81 100644 --- a/base-server/src/main/resources/logback-spring.xml +++ b/base-server/src/main/resources/logback-spring.xml @@ -31,7 +31,7 @@ ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-50MB} ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} @@ -56,9 +56,10 @@ + - + diff --git a/zt-module-base/zt-module-base-server/src/main/resources/logback-spring.xml b/zt-module-base/zt-module-base-server/src/main/resources/logback-spring.xml index 0e551414..8e63177d 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/logback-spring.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/logback-spring.xml @@ -31,7 +31,7 @@ ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-50MB} ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} @@ -56,9 +56,10 @@ + - - + + diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/logback-spring.xml b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/logback-spring.xml index 2bde9644..cc9f1f81 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/logback-spring.xml +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/logback-spring.xml @@ -31,7 +31,7 @@ ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} - ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB} + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-50MB} ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0} @@ -56,9 +56,10 @@ + - + From 6bb603ea94dc17cc0185960ce9be27b4a3eb2257 Mon Sep 17 00:00:00 2001 From: qianshijiang <1965297290@qq.com> Date: Wed, 26 Nov 2025 15:45:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9C=AA=E8=AE=B0=E5=BD=95=E5=88=B0=E6=97=A5=E5=BF=97=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 28 +++++++++++++++++ .../src/main/resources/logback-spring.xml | 30 ++++++++++++++++++- .../src/main/resources/logback-spring.xml | 28 +++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/base-server/src/main/resources/logback-spring.xml b/base-server/src/main/resources/logback-spring.xml index cc9f1f81..1af842df 100644 --- a/base-server/src/main/resources/logback-spring.xml +++ b/base-server/src/main/resources/logback-spring.xml @@ -5,6 +5,10 @@ + + + + 　　　　　 @@ -56,19 +60,43 @@ + + + ${LOG_DIR}-error.log + + ERROR + ACCEPT + DENY + + + ${LOG_DIR}-error.%d{yyyy-MM-dd}.log + 30 + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + diff --git a/zt-module-base/zt-module-base-server/src/main/resources/logback-spring.xml b/zt-module-base/zt-module-base-server/src/main/resources/logback-spring.xml index 8e63177d..1af842df 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/logback-spring.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/logback-spring.xml @@ -5,6 +5,10 @@ + + + + 　　　　　 @@ -56,19 +60,43 @@ + + + ${LOG_DIR}-error.log + + ERROR + ACCEPT + DENY + + + ${LOG_DIR}-error.%d{yyyy-MM-dd}.log + 30 + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + - + + diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/logback-spring.xml b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/logback-spring.xml index cc9f1f81..1af842df 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/logback-spring.xml +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/logback-spring.xml @@ -5,6 +5,10 @@ + + + + 　　　　　 @@ -56,19 +60,43 @@ + + + ${LOG_DIR}-error.log + + ERROR + ACCEPT + DENY + + + ${LOG_DIR}-error.%d{yyyy-MM-dd}.log + 30 + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + From a3fe2403a77b61da4990da128208c770cff8021a Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Wed, 26 Nov 2025 16:50:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=BA=93=E4=BD=8Dapi,=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=AC=E5=8F=B8ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plat/module/erp/api/ErpExternalApi.java | 9 +++-- .../module/erp/api/dto/ErpWarehouseDTO.java | 37 ++++++++++++++++++ .../module/erp/api/ErpExternalApiImpl.java | 18 +++++---- .../erp/dal/dataobject/erp/ErpContractDO.java | 38 +------------------ 4 files changed, 55 insertions(+), 47 deletions(-) create mode 100644 zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/ErpWarehouseDTO.java diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java index 304b6d93..a39ad946 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java @@ -1,10 +1,7 @@ package com.zt.plat.module.erp.api; import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.module.erp.api.dto.ErpMaterialDTO; -import com.zt.plat.module.erp.api.dto.ErpProductiveVersionReqDTO; -import com.zt.plat.module.erp.api.dto.ErpQueryReqDTO; -import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO; +import com.zt.plat.module.erp.api.dto.*; import com.zt.plat.module.erp.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -39,4 +36,8 @@ public interface ErpExternalApi { @GetMapping(PREFIX + "/getMaterialUnit") @Operation(summary = "根据物料编码查询对应计量单位") CommonResult getMaterialUnit(@RequestParam("downCenterNumber") String downCenterNumber); + + @GetMapping(PREFIX + "/getErpWarehouse") + @Operation(summary = "根据id获得ERP库位") + CommonResult getErpWarehouse(@RequestParam("id") Long id); } diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/ErpWarehouseDTO.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/ErpWarehouseDTO.java new file mode 100644 index 00000000..0f260703 --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/ErpWarehouseDTO.java @@ -0,0 +1,37 @@ +package com.zt.plat.module.erp.api.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - ERP库位 Response VO") +@Data +public class ErpWarehouseDTO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16847") + private Long id; + + @Schema(description = "工厂编码;将查询参数存入") + private String factoryNumber; + + @Schema(description = "工厂名称") + private String factoryName; + + @Schema(description = "库位描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + private String name; + + @Schema(description = "库位编码", requiredMode = Schema.RequiredMode.REQUIRED) + private String number; + + @Schema(description = "类别") + private String type; + + @Schema(description = "绑定库位名") + private String relName; + + @Schema(description = "绑定库位编码") + private String relnumber; + + @Schema(description = "是否启用") + private String isEnable; + +} \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java index fcf9617f..075af596 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java @@ -2,19 +2,15 @@ package com.zt.plat.module.erp.api; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.module.erp.api.dto.ErpMaterialDTO; -import com.zt.plat.module.erp.api.dto.ErpProductiveVersionReqDTO; -import com.zt.plat.module.erp.api.dto.ErpQueryReqDTO; -import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO; -import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialRespVO; +import com.zt.plat.module.erp.api.dto.*; +import com.zt.plat.module.erp.dal.dataobject.erp.ErpWarehouseDO; import com.zt.plat.module.erp.service.erp.ErpMaterialService; import com.zt.plat.module.erp.service.erp.ErpProductiveVersionService; +import com.zt.plat.module.erp.service.erp.ErpWarehouseService; import com.zt.plat.module.erp.utils.ErpConfig; import jakarta.annotation.Resource; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; @@ -39,6 +35,8 @@ public class ErpExternalApiImpl implements ErpExternalApi { private ErpProductiveVersionService erpProductiveVersionService; @Resource private ErpMaterialService erpMaterialService; + @Resource + private ErpWarehouseService erpWarehouseService; @Override @@ -64,4 +62,10 @@ public class ErpExternalApiImpl implements ErpExternalApi { String materialUnit = erpMaterialService.getMaterialUnit(materialNumber); return success(materialUnit); } + + @Override + public CommonResult getErpWarehouse(Long id) { + ErpWarehouseDO erpWarehouse = erpWarehouseService.getErpWarehouse(id); + return success(BeanUtils.toBean(erpWarehouse, ErpWarehouseDTO.class)); + } } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpContractDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpContractDO.java index 00ab6ea6..1159f019 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpContractDO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpContractDO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.erp.dal.dataobject.erp; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; import java.math.BigDecimal; @@ -23,7 +24,7 @@ import java.time.LocalDate; /** * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO */ -public class ErpContractDO extends BaseDO { +public class ErpContractDO extends BusinessBaseDO { /** @@ -291,40 +292,5 @@ public class ErpContractDO extends BaseDO { */ @TableField("PYEE_CND_AMT") private BigDecimal payeeConditionAmount; - /** - * 公司编号 - */ - @TableField("COMPANY_ID") - private Long companyId; - /** - * 公司名称 - */ - @TableField("COMPANY_NAME") - private String companyName; - /** - * 部门编号 - */ - @TableField("DEPT_ID") - private Long deptId; - /** - * 部门名称 - */ - @TableField("DEPT_NAME") - private String deptName; - /** - * 岗位编号 - */ - @TableField("POST_ID") - private Long postId; - /** - * 创建者 - */ - @TableField("CREATOR_NAME") - private String creatorName; - /** - * 更新者 - */ - @TableField("UPDATER_NAME") - private String updaterName; } \ No newline at end of file