From 7e08ec9ec45be241b8904d86db7bf12be4a2cb22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Fri, 23 Jan 2026 11:20:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A7=94=E6=89=98=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java index b6f8c097..f5310089 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java @@ -139,7 +139,7 @@ public class EntrustOrderOrderSaveReqVO { @Schema(description = "采购组名称", example = "张三") private String purchaseGroupName; @Schema(description = "创建时间") - private LocalDateTime[] createTime; + private LocalDateTime createTime; @Schema(description = "委托加工订单明细") private List entrustOrderDetails; From 2b7dd97c64fd63aae939d850fea2c43a662e37d3 Mon Sep 17 00:00:00 2001 From: yangchaojin <549193112@qq.com> Date: Fri, 23 Jan 2026 14:57:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E9=87=8D=E5=A4=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9=E7=9A=84=E7=AE=80=E5=8D=95=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../departmentmaterial/DepartmentMaterialMapper.java | 9 +++++++++ .../DepartmentMaterialServiceImpl.java | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/departmentmaterial/DepartmentMaterialMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/departmentmaterial/DepartmentMaterialMapper.java index 848aa797..5f9bdcde 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/departmentmaterial/DepartmentMaterialMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dao/departmentmaterial/DepartmentMaterialMapper.java @@ -31,4 +31,13 @@ public interface DepartmentMaterialMapper extends BaseMapperX() + .eqIfPresent(DepartmentMaterialDO::getInfomationId, reqVO.getInfomationId()) + .eqIfPresent(DepartmentMaterialDO::getClassesId, reqVO.getClassesId()) + .eqIfPresent(DepartmentMaterialDO::getDeptId, reqVO.getDeptId()) + .eqIfPresent(DepartmentMaterialDO::getDictionaryDataValue, reqVO.getDictionaryDataValue()) + .neIfPresent(DepartmentMaterialDO::getId,reqVO.getId())); // 更新时判断要排除自身 + } + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialServiceImpl.java index e1af3443..f0b767d8 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/departmentmaterial/DepartmentMaterialServiceImpl.java @@ -9,6 +9,7 @@ import com.zt.plat.module.base.dal.dataobject.materialproperties.MaterialPropert import com.zt.plat.module.base.service.masterdatasync.support.MasterDataPropertyDefinition; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.util.*; @@ -69,6 +70,7 @@ public class DepartmentMaterialServiceImpl implements DepartmentMaterialService public DepartmentMaterialRespVO createDepartmentMaterial(DepartmentMaterialSaveReqVO createReqVO) { // 插入 DepartmentMaterialDO departmentMaterial = BeanUtils.toBean(createReqVO, DepartmentMaterialDO.class); + validateNotExists(departmentMaterial); // 简单验证不存在相同分类物料 departmentMaterialMapper.insert(departmentMaterial); // 构造完整响应，方便前端直接刷新数据 return CollUtil.getFirst(decorateDepartmentMaterials(Collections.singletonList(departmentMaterial))); @@ -80,6 +82,7 @@ public class DepartmentMaterialServiceImpl implements DepartmentMaterialService validateDepartmentMaterialExists(updateReqVO.getId()); // 更新 DepartmentMaterialDO updateObj = BeanUtils.toBean(updateReqVO, DepartmentMaterialDO.class); + validateNotExists(updateObj); // 简单验证不存在重复相同分类物料 departmentMaterialMapper.updateById(updateObj); } @@ -106,6 +109,14 @@ public class DepartmentMaterialServiceImpl implements DepartmentMaterialService } } + public void validateNotExists(DepartmentMaterialDO departmentMaterial) { + Long cnt = departmentMaterialMapper.countExist(departmentMaterial); + if (cnt != null && cnt > 0) { + // 已存在未删除的同一条 + throw exception(DEPARTMENT_MATERIAL_EXISTS); + } + } + private void validateDepartmentMaterialExists(Long id) { if (departmentMaterialMapper.selectById(id) == null) { throw exception(DEPARTMENT_MATERIAL_NOT_EXISTS);