From ebb8292244c881fbf52c8680ae5793a693917349 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Sun, 23 Feb 2025 20:47:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/dto/cgdd/ErpCgDDEditDTO.java | 4 ++-- .../supermarket/dto/cgdd/ErpCgDDSaveDTO.java | 8 ++++---- .../supermarket/entity/SmErpCgDdEntity.java | 4 +++- .../supermarket/entity/SmErpCgPlanEntity.java | 3 +++ .../SmErpInventoryRecordsController.java | 2 +- .../service/impl/SmErpCgDdServiceImpl.java | 12 ++++++++++++ .../impl/SmErpInventoryRecordsServiceImpl.java | 15 +++++++++++---- .../src/main/resources/mapper/SmErpCgDdMapper.xml | 3 ++- .../main/resources/mapper/SmErpCgPlanMapper.xml | 1 + 9 files changed, 39 insertions(+), 13 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDEditDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDEditDTO.java index 554ab55d0..11778072e 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDEditDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDEditDTO.java @@ -22,13 +22,13 @@ public class ErpCgDDEditDTO { * 采购计划编号 */ @Schema(description="采购计划编号") - private String planCode; + private String code; /** * 采购计划单据日期 */ @Schema(description="采购计划单据日期") - private LocalDate planDate; + private LocalDate ddDate; /** * 仓库id diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDSaveDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDSaveDTO.java index 27af75cd8..875cfb1a4 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDSaveDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDSaveDTO.java @@ -19,14 +19,14 @@ public class ErpCgDDSaveDTO { /** * 采购计划编号 */ - @Schema(description="采购计划编号") - private String planCode; + @Schema(description="编号") + private String code; /** * 采购计划单据日期 */ - @Schema(description="采购计划单据日期") - private LocalDate planDate; + @Schema(description="单据日期") + private LocalDate ddDate; /** * 仓库id diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdEntity.java index cc72b78c3..3537fbe7a 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdEntity.java @@ -40,7 +40,7 @@ public class SmErpCgDdEntity extends Model { * 单据日期 */ @Schema(description="单据日期") - private LocalDate dDate; + private LocalDate ddDate; /** * 经办人id @@ -156,6 +156,8 @@ public class SmErpCgDdEntity extends Model { @Schema(description="租户编号") private Long tenantId; + @Schema(description="关联状态") + private String linkStatus; @Schema(description="关联编码") private String linkCode; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanEntity.java index 5f8a4d297..e9f094bad 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanEntity.java @@ -133,6 +133,9 @@ public class SmErpCgPlanEntity extends Model { @Schema(description="租户编号") private Long tenantId; + @Schema(description="关联状态") + private String linkStatus; + @TableField(exist = false) @Schema(description="商品名称") private String productName; diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java index ad74d6a44..7947e128f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java @@ -216,7 +216,7 @@ public class SmErpInventoryRecordsController { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(cgDdLinkQueryDTO.getCode()),SmErpCgDdEntity::getCode,cgDdLinkQueryDTO.getCode()); - wrapper.eq(Objects.nonNull(cgDdLinkQueryDTO.getDDate()),SmErpCgDdEntity::getDDate,cgDdLinkQueryDTO.getDDate()); + wrapper.eq(Objects.nonNull(cgDdLinkQueryDTO.getDDate()),SmErpCgDdEntity::getDdDate,cgDdLinkQueryDTO.getDDate()); //todo 审核成功条件 // wrapper.eq(SmErpCgPlanEntity::getCheckStatus,); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgDdServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgDdServiceImpl.java index b0af6685c..6613d4866 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgDdServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgDdServiceImpl.java @@ -19,6 +19,7 @@ import com.bsd.pjcloud.supermarket.entity.SmErpCgPlanEntity; import com.bsd.pjcloud.supermarket.entity.SmErpCgPlanItemEntity; import com.bsd.pjcloud.supermarket.mapper.SmErpCgDdItemMapper; import com.bsd.pjcloud.supermarket.mapper.SmErpCgDdMapper; +import com.bsd.pjcloud.supermarket.mapper.SmErpCgPlanMapper; import com.bsd.pjcloud.supermarket.service.SmErpCgDdService; import com.bsd.pjcloud.supermarket.vo.cgdd.SmErpCgDdVo; import com.bsd.pjcloud.supermarket.vo.cgdd.SmeErpCgDdItemVo; @@ -26,6 +27,7 @@ import com.bsd.pjcloud.supermarket.vo.cgplan.SmErpCgPlanItemVo; import com.bsd.pjcloud.supermarket.vo.cgplan.SmErpCgPlanVo; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Collections; import java.util.List; @@ -45,7 +47,10 @@ public class SmErpCgDdServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SmErpCgPlanEntity::getPlanCode, erpCgDDSaveDTO.getCode()); + SmErpCgPlanEntity smErpCgPlanEntity = new SmErpCgPlanEntity(); + smErpCgPlanEntity.setLinkStatus("1"); + smErpCgPlanMapper.update(smErpCgPlanEntity,queryWrapper); + return insert; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java index 4247bffcb..37ec4bc0d 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java @@ -1,5 +1,6 @@ package com.bsd.pjcloud.supermarket.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.security.util.SecurityUtils; @@ -7,10 +8,8 @@ import com.bsd.pjcloud.supermarket.dto.cgdd.SmCgDDSaveItemDTO; import com.bsd.pjcloud.supermarket.dto.inventoryrecords.InventoryRecordSaveDTO; import com.bsd.pjcloud.supermarket.dto.inventoryrecords.InventoryRecordSaveItemDTO; import com.bsd.pjcloud.supermarket.dto.inventoryrecords.UpdateStockDTO; -import com.bsd.pjcloud.supermarket.entity.SmErpCgDdEntity; -import com.bsd.pjcloud.supermarket.entity.SmErpCgDdItemEntity; -import com.bsd.pjcloud.supermarket.entity.SmErpInventoryRecordsEntity; -import com.bsd.pjcloud.supermarket.entity.SmErpInventoryRecordsItemEntity; +import com.bsd.pjcloud.supermarket.entity.*; +import com.bsd.pjcloud.supermarket.mapper.SmErpCgDdMapper; import com.bsd.pjcloud.supermarket.mapper.SmErpInventoryRecordsItemMapper; import com.bsd.pjcloud.supermarket.mapper.SmErpInventoryRecordsMapper; import com.bsd.pjcloud.supermarket.mapper.SmErpStockMapper; @@ -36,6 +35,8 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SmErpCgDdEntity::getCode, inventoryRecordSaveDTO.getInventoryCode()); + SmErpCgDdEntity updateSmErpCgDdEntity = new SmErpCgDdEntity(); + updateSmErpCgDdEntity.setLinkStatus("1"); + smErpCgDdMapper.update(updateSmErpCgDdEntity,queryWrapper); return insert; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgDdMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgDdMapper.xml index e5a501776..85d10bdf5 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgDdMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgDdMapper.xml @@ -6,7 +6,7 @@ - + @@ -26,5 +26,6 @@ + \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgPlanMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgPlanMapper.xml index a340e5dee..5321f7753 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgPlanMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgPlanMapper.xml @@ -21,5 +21,6 @@ + \ No newline at end of file