diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/CGPlanLinkQueryDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/CGPlanLinkQueryDTO.java new file mode 100644 index 000000000..ace1c40ab --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/CGPlanLinkQueryDTO.java @@ -0,0 +1,28 @@ +package com.bsd.pjcloud.supermarket.dto.cgdd; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDate; + + +/** + * 分页查询采购申请单条件 + */ +@Data +@Schema(description = "分页查询采购申请单条件") +public class CGPlanLinkQueryDTO { + + /** + * 采购计划编号 + */ + @Schema(description="采购计划编号") + private String planCode; + + /** + * 采购计划单据日期 + */ + @Schema(description="采购计划单据日期") + private LocalDate planDate; +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanEditDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanEditDTO.java index 8313ebb1b..a7dcec114 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanEditDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanEditDTO.java @@ -30,31 +30,12 @@ public class ErpCgPlanEditDTO { @Schema(description="采购计划单据日期") private LocalDate planDate; - /** - * 仓库id - */ - @Schema(description="仓库id") - private String warehouseId; - /** * 经办人id */ @Schema(description="经办人id") private Long handlerUserId; - - /** - * 累计进货数量 - */ - @Schema(description="累计进货数量") - private Integer totalNumber; - - /** - * 累计总金额 - */ - @Schema(description="累计总金额") - private Integer totalAmount; - /** * 货商 */ @@ -67,11 +48,6 @@ public class ErpCgPlanEditDTO { @Schema(description="备注") private String remark; - /** - * 订单编号 - */ - @Schema(description="订单编号") - private String orderNumber; /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanSaveDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanSaveDTO.java index 36d4fd42a..5f1e217f1 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanSaveDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanSaveDTO.java @@ -29,12 +29,6 @@ public class ErpCgPlanSaveDTO { @Schema(description="采购计划单据日期") private LocalDate planDate; - /** - * 仓库id - */ - @Schema(description="仓库id") - private String warehouseId; - /** * 经办人id */ @@ -42,18 +36,6 @@ public class ErpCgPlanSaveDTO { private Long handlerUserId; - /** - * 累计进货数量 - */ - @Schema(description="累计进货数量") - private Integer totalNumber; - - /** - * 累计总金额 - */ - @Schema(description="累计总金额") - private Integer totalAmount; - /** * 货商 */ @@ -66,12 +48,6 @@ public class ErpCgPlanSaveDTO { @Schema(description="备注") private String remark; - /** - * 订单编号 - */ - @Schema(description="订单编号") - private String orderNumber; - /** * @Link SmCgPlanSaveItemDTO diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/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 similarity index 96% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdEntity.java index 555f90af6..cc72b78c3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/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 @@ -42,12 +42,6 @@ public class SmErpCgDdEntity extends Model { @Schema(description="单据日期") private LocalDate dDate; - /** - * 仓库id - */ - @Schema(description="仓库id") - private String warehouseId; - /** * 经办人id */ @@ -161,4 +155,8 @@ public class SmErpCgDdEntity extends Model { */ @Schema(description="租户编号") private Long tenantId; + + + @Schema(description="关联编码") + private String linkCode; } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdItemEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdItemEntity.java similarity index 100% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdItemEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdItemEntity.java 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 92bc4ec79..22ce80418 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 @@ -42,12 +42,6 @@ public class SmErpCgPlanEntity extends Model { @Schema(description="采购计划单据日期") private LocalDate planDate; - /** - * 仓库id - */ - @Schema(description="仓库id") - private String warehouseId; - /** * 经办人id */ @@ -90,35 +84,12 @@ public class SmErpCgPlanEntity extends Model { @Schema(description="出入库数量") private Integer quantity; - /** - * 累计进货数量 - */ - @Schema(description="累计进货数量") - private Integer totalNumber; - - /** - * 累计总金额 - */ - @Schema(description="累计总金额") - private Integer totalAmount; - - /** - * 货商 - */ - @Schema(description="货商") - private Long supplierId; - /** * 备注 */ @Schema(description="备注") private String remark; - /** - * 订单编号 - */ - @Schema(description="订单编号") - private String orderNumber; /** * 创建人 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsItemEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsItemEntity.java similarity index 100% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsItemEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsItemEntity.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java index b058a358b..a874a40b1 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java @@ -2,23 +2,24 @@ package com.bsd.pjcloud.supermarket.controller; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; +import com.bsd.pjcloud.supermarket.dto.cgdd.CGPlanLinkQueryDTO; import com.bsd.pjcloud.supermarket.dto.cgdd.ErpCgDDEditDTO; import com.bsd.pjcloud.supermarket.dto.cgdd.ErpCgDDSaveDTO; -import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanEditDTO; import com.bsd.pjcloud.supermarket.entity.*; import com.bsd.pjcloud.supermarket.service.SmErpCgDdItemService; import com.bsd.pjcloud.supermarket.service.SmErpCgDdService; +import com.bsd.pjcloud.supermarket.service.SmErpCgPlanService; import com.bsd.pjcloud.supermarket.service.SmErpUnitService; import com.bsd.pjcloud.supermarket.vo.cgdd.SmErpCgDdVo; import com.bsd.pjcloud.supermarket.vo.cgdd.SmeErpCgDdItemVo; import com.bsd.pjcloud.supermarket.vo.cgplan.ErpUnitVo; -import com.bsd.pjcloud.supermarket.vo.cgplan.SmeErpCgPlanItemVo; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -30,6 +31,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -51,6 +53,8 @@ public class SmErpCgDdController { private final SmErpUnitService smErpUnitService; + private final SmErpCgPlanService smErpCgPlanService; + /** * 分页查询 * @param page 分页对象 @@ -157,4 +161,26 @@ public class SmErpCgDdController { public List export(SmErpCgDdEntity smErpCgDd,Long[] ids) { return smErpCgDdService.list(Wrappers.lambdaQuery(smErpCgDd).in(ArrayUtil.isNotEmpty(ids), SmErpCgDdEntity::getId, ids)); } + + + /** + * 分页查询 + * @param page 分页对象 + * @param cGPlanLinkQueryDTO 采购计划 + * @return + */ + @Operation(summary = "分页查询" , description = "分页查询" ) + @GetMapping("/cgsq/page" ) + @PreAuthorize("@pms.hasPermission('supermarket_smErpCgPlan_view')" ) + public R getSmErpCgPlanPage(@ParameterObject Page page, @ParameterObject CGPlanLinkQueryDTO cGPlanLinkQueryDTO) { + + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(cGPlanLinkQueryDTO.getPlanCode()),SmErpCgPlanEntity::getPlanCode,cGPlanLinkQueryDTO.getPlanCode()); + wrapper.eq(Objects.nonNull(cGPlanLinkQueryDTO.getPlanDate()),SmErpCgPlanEntity::getPlanDate,cGPlanLinkQueryDTO.getPlanDate()); + + //todo 审核成功条件 +// wrapper.eq(SmErpCgPlanEntity::getCheckStatus,); + return R.ok(smErpCgPlanService.page(page, wrapper)); + } + } \ No newline at end of file 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 b1f7a6be2..e5a501776 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 @@ -7,7 +7,6 @@ - @@ -26,5 +25,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 d090c74a2..a340e5dee 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 @@ -7,7 +7,6 @@ - @@ -15,11 +14,7 @@ - - - -