From 51bc224ec4da2e00d7b3ec671d213415946ae973 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 14 Mar 2025 17:46:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/entity/BoxesBookingEntity.java | 3 ++ .../controller/BoxesBookingController.java | 15 ++++---- .../resources/mapper/BoxesBookingMapper.xml | 1 + .../pjcloud/flow/task/dto/UserRootDto.java | 11 ++++++ .../flow/task/utils/GetCheckReasonUtils.java | 34 +++++++++++++++++++ .../flow/task/vo/CheckStatusAndReasonVo.java | 12 +++++++ .../constant/SupermarketFlowConstant.java | 32 +++++++++++++++++ .../supermarket/entity/SmErpCgPlanEntity.java | 8 +++++ .../pjcloud-supermarket-biz/pom.xml | 11 ++++++ .../controller/SmErpCgPlanController.java | 25 ++++++++++++++ .../service/impl/SmErpCgPlanServiceImpl.java | 19 +++++++++-- .../resources/mapper/SmErpCgPlanMapper.xml | 2 ++ 12 files changed, 165 insertions(+), 8 deletions(-) create mode 100644 pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/UserRootDto.java create mode 100644 pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/utils/GetCheckReasonUtils.java create mode 100644 pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/vo/CheckStatusAndReasonVo.java create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/SupermarketFlowConstant.java diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java index c7c189a36..429a12824 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java @@ -120,4 +120,7 @@ public class BoxesBookingEntity extends Model { @Schema(description="流程实例id") private String processInstanceId; + + @Schema(description="审核原因") + private String checkReason; } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java index 03fc8d499..bb5c55d31 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java @@ -2,6 +2,7 @@ package com.bsd.pjcloud.canteen.controller; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,6 +14,8 @@ import com.bsd.pjcloud.canteen.service.BoxesBookingService; import com.bsd.pjcloud.common.security.annotation.Inner; import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum; import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordParamDto; +import com.bsd.pjcloud.flow.task.utils.GetCheckReasonUtils; +import com.bsd.pjcloud.flow.task.vo.CheckStatusAndReasonVo; import org.apache.seata.spring.annotation.GlobalTransactional; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; @@ -138,20 +141,20 @@ public class BoxesBookingController { @PostMapping("/flow-callback") @Operation(summary = "流程节点回调通知") - @Inner - public R createBooking(@RequestBody ProcessNodeRecordParamDto processNodeRecordParamDto) { - + @Inner(value = false) + @Transactional + public R flowCallback(@RequestBody ProcessNodeRecordParamDto processNodeRecordParamDto) { String processInstanceId = processNodeRecordParamDto.getProcessInstanceId(); BoxesBookingEntity boxesBookingEntity = new BoxesBookingEntity(); boxesBookingEntity.setProcessInstanceId(processInstanceId); boxesBookingEntity.setCheckStatus(TaskCheckStatusEnum.RESULT.getCode()); - System.out.println("***************************"); System.out.println(processNodeRecordParamDto.getData()); -// boxesBookingService.update() LambdaQueryWrapper boxesBookingEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); boxesBookingEntityLambdaQueryWrapper.eq(BoxesBookingEntity::getProcessInstanceId, processInstanceId); + CheckStatusAndReasonVo checkReason = GetCheckReasonUtils.getCheckReason(processNodeRecordParamDto); + boxesBookingEntity.setCheckStatus(checkReason.getCheckStatus()); + boxesBookingEntity.setCheckReason(checkReason.getCheckReason()); boxesBookingService.update(boxesBookingEntity,boxesBookingEntityLambdaQueryWrapper); - System.out.println(processNodeRecordParamDto); return R.ok(); } diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesBookingMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesBookingMapper.xml index eb39f95a8..1da397039 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesBookingMapper.xml +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesBookingMapper.xml @@ -21,5 +21,6 @@ + \ No newline at end of file diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/UserRootDto.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/UserRootDto.java new file mode 100644 index 000000000..cea373c75 --- /dev/null +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/UserRootDto.java @@ -0,0 +1,11 @@ +package com.bsd.pjcloud.flow.task.dto; + +import lombok.Data; + +@Data +public class UserRootDto { + + private long id; + + private String name; +} diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/utils/GetCheckReasonUtils.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/utils/GetCheckReasonUtils.java new file mode 100644 index 000000000..cc92674fa --- /dev/null +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/utils/GetCheckReasonUtils.java @@ -0,0 +1,34 @@ +package com.bsd.pjcloud.flow.task.utils; + +import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum; +import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordParamDto; +import com.bsd.pjcloud.flow.task.dto.UserRootDto; +import com.bsd.pjcloud.flow.task.vo.CheckStatusAndReasonVo; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.io.StringReader; +import java.util.List; +import java.util.Optional; + +public class GetCheckReasonUtils { + + public static CheckStatusAndReasonVo getCheckReason(ProcessNodeRecordParamDto dto) { + String statusKey = dto.getNodeId() + "_approve_condition"; + try { + JsonNode jsonNode = new ObjectMapper().readTree(dto.getData()); + Boolean changeStatus = jsonNode.get(statusKey).asBoolean(); + String approveDesc = Optional.ofNullable(jsonNode).map(node -> node.get("approveDesc")).filter(JsonNode::isTextual).map(JsonNode::asText).orElse(""); +// String approveDesc = jsonNode.get("approveDesc").toString(); + CheckStatusAndReasonVo checkStatusAndReasonVo = new CheckStatusAndReasonVo(); + checkStatusAndReasonVo.setCheckStatus(changeStatus ? TaskCheckStatusEnum.RESULT.getCode() : TaskCheckStatusEnum.REJECT.getCode()); + checkStatusAndReasonVo.setCheckReason(approveDesc); + return checkStatusAndReasonVo; + } catch (Exception e) { + // 处理解析异常 + e.printStackTrace(); + return null; + } + } +} diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/vo/CheckStatusAndReasonVo.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/vo/CheckStatusAndReasonVo.java new file mode 100644 index 000000000..384aab458 --- /dev/null +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/vo/CheckStatusAndReasonVo.java @@ -0,0 +1,12 @@ +package com.bsd.pjcloud.flow.task.vo; + +import lombok.Data; + +@Data +public class CheckStatusAndReasonVo { + + private String checkStatus; + + + private String checkReason; +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/SupermarketFlowConstant.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/SupermarketFlowConstant.java new file mode 100644 index 000000000..1267a55c4 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/SupermarketFlowConstant.java @@ -0,0 +1,32 @@ +package com.bsd.pjcloud.supermarket.constant; + +import lombok.Data; + +@Data +public final class SupermarketFlowConstant { + + /** + * 补货申请 + */ + public static final String SUPERMARKET_BHSQ_FLOW= "SUPERMARKET_BHSQ_FLOW"; + + + /** + * 补货申请 + */ + public static final String SUPERMARKET_CGDD_FLOW= "SUPERMARKET_CGDD_FLOW"; + + + /** + * 补货申请 + */ + public static final String SUPERMARKET_CGRK_FLOW= "SUPERMARKET_CGRK_FLOW"; + + /** + * 补货申请 + */ + public static final String SUPERMARKET_CGTH_FLOW= "SUPERMARKET_CGTH_FLOW"; + + + +} 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 b830f420c..2c0d40399 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 @@ -136,6 +136,12 @@ public class SmErpCgPlanEntity extends Model { @Schema(description="关联状态") private String linkStatus; + @Schema(description="流程实例id") + private String processInstanceId; + + @Schema(description="审核原因") + private String checkReason; + @TableField(exist = false) @Schema(description="商品名称") private String productName; @@ -144,4 +150,6 @@ public class SmErpCgPlanEntity extends Model { @TableField(exist = false) public String handlerUserName; + + } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml index 005039908..5792285a1 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/pom.xml @@ -64,6 +64,17 @@ pjcloud-supermarket-api 5.7.0 + + com.bsd + pjcloud-flow-task-api + 5.7.0 + + + com.bsd + pjcloud-common-seata + 5.7.0 + + com.bsd pjcloud-wallet-api diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java index 3e3062491..22284a15b 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java @@ -3,12 +3,18 @@ package com.bsd.pjcloud.supermarket.controller; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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.common.security.annotation.Inner; +import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordParamDto; +import com.bsd.pjcloud.flow.task.utils.GetCheckReasonUtils; +import com.bsd.pjcloud.flow.task.vo.CheckStatusAndReasonVo; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanDTO; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanEditDTO; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanSaveDTO; @@ -22,6 +28,7 @@ import com.bsd.pjcloud.supermarket.service.SmErpUnitService; import com.bsd.pjcloud.supermarket.vo.cgplan.ErpUnitVo; import com.bsd.pjcloud.supermarket.vo.cgplan.SmErpCgPlanVo; import com.bsd.pjcloud.supermarket.vo.cgplan.SmErpCgPlanItemVo; +import org.apache.seata.spring.annotation.GlobalTransactional; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -104,6 +111,24 @@ public class SmErpCgPlanController { } + @Operation(summary = "回调" , description = "回调" ) + @SysLog("采购补货回调" ) + @PostMapping("/flow-callback") + @Inner(value = false) + @Transactional + public R supermarketFlowCallback(@RequestBody ProcessNodeRecordParamDto processNodeRecordParamDto) { + String processInstanceId = processNodeRecordParamDto.getProcessInstanceId(); + CheckStatusAndReasonVo checkReason = GetCheckReasonUtils.getCheckReason(processNodeRecordParamDto); + smErpCgPlanService.update( + new LambdaUpdateWrapper() + .eq(SmErpCgPlanEntity::getProcessInstanceId, processInstanceId) + .set(SmErpCgPlanEntity::getCheckStatus, checkReason.getCheckStatus()) + .set(SmErpCgPlanEntity::getCheckReason, checkReason.getCheckReason()) + ); + return R.ok(); + } + + /** * 通过id查询采购计划 * @param id id diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java index 3274e6445..50dfe5594 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java @@ -9,6 +9,11 @@ import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowApiFlowService; +import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum; +import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto; +import com.bsd.pjcloud.flow.task.entity.Process; +import com.bsd.pjcloud.supermarket.constant.SupermarketFlowConstant; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanEditDTO; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanSaveDTO; import com.bsd.pjcloud.supermarket.dto.cgplan.SmCgPlanEditItemDTO; @@ -48,7 +53,7 @@ public class SmErpCgPlanServiceImpl extends ServiceImpl processR = remoteFlowApiFlowService.getProcessByBusinessKey(SupermarketFlowConstant.SUPERMARKET_BHSQ_FLOW); + String flowId = processR.getData().getFlowId(); + ProcessInstanceParamDto processInstanceParamDto = new ProcessInstanceParamDto(); + processInstanceParamDto.setFlowId(flowId); + R stringR = remoteFlowApiFlowService.startProcessInstance(processInstanceParamDto); + String processInstanceId = stringR.getData(); + smErpCgPlanEntity.setProcessInstanceId(processInstanceId); + smErpCgPlanEntity.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode()); + int insert = baseMapper.insert(smErpCgPlanEntity); List items = erpCgPlanSaveDTO.getItems(); List cgPlanItemEntities = BeanUtils.toBean(items, SmErpCgPlanItemEntity.class); for (SmErpCgPlanItemEntity cgPlanItemEntity : cgPlanItemEntities) { 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 5321f7753..f7d154ce0 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 @@ -22,5 +22,7 @@ + + \ No newline at end of file From d1512a8e582b0d7eaa7efabd05ee2ce0cd035c43 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 17 Mar 2025 12:32:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=89=E5=8D=93=E6=9C=BA=E8=B6=85?= =?UTF-8?q?=E5=B8=82=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/entity/SmErpCgDdEntity.java | 5 + .../bsd/pjcloud/supermarket/vo/ad/SpuVo.java | 95 +++++++++++++++++++ .../controller/SmErpCgDdController.java | 23 +++++ .../controller/SmErpSpuController.java | 4 +- .../supermarket/mapper/SmErpSpuMapper.java | 5 +- .../supermarket/service/SmErpSpuService.java | 3 +- .../service/impl/SmErpCgDdServiceImpl.java | 21 +++- .../service/impl/SmErpSpuServiceImpl.java | 9 +- .../main/resources/mapper/SmErpCgDdMapper.xml | 2 + .../main/resources/mapper/SmErpSpuMapper.xml | 87 ++++++----------- 10 files changed, 183 insertions(+), 71 deletions(-) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SpuVo.java 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 312282781..52b8fd41a 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 @@ -162,6 +162,11 @@ public class SmErpCgDdEntity extends Model { @Schema(description="关联编码") private String linkCode; + @Schema(description="流程实例id") + private String processInstanceId; + + @Schema(description="审核原因") + private String checkReason; @Schema(description="商品名称") @TableField(exist = false) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SpuVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SpuVo.java new file mode 100644 index 000000000..624f6ccb5 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SpuVo.java @@ -0,0 +1,95 @@ +package com.bsd.pjcloud.supermarket.vo.ad; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpAuxiliaryCodeVo; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitVo; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class SpuVo { + /** + * 商品 SPU 编号，自增 + */ + @Schema(description="商品 SPU 编号，自增") + private Long id; + + /** + * 货号 + */ + @Schema(description="货号") + private String productCode; + + /** + * 商品名称 + */ + @Schema(description="商品名称") + private String productName; + + /** + * 单位 + */ + @Schema(description="单位") + private String unit; + + /** + * 单位 + */ + @Schema(description="规格") + private String spec; + + + /** + * 商品分类编号 + */ + @Schema(description="商品分类编号") + private Long categoryId; + + /** + * 商品封面图 + */ + @Schema(description="商品封面图") + private String picUrl; + + + /** + * 库存 + */ + @Schema(description="剩余库存") + private Double stock; + + + /** + * 商品性质(字典) + */ + @Schema(description="商品性质(字典)") + private String productNature; + + + /** + * 零售价和促销价取基础单位的价格 + */ + @Schema(description="零售价") + private Integer retailPrice; + + @Schema(description="促销价") + private Integer promotionPrice; + + + @Schema(description = "销量") + private Integer salesCount; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + + +} 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 53d8867cc..32536b3f6 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 @@ -4,11 +4,16 @@ 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.conditions.update.LambdaUpdateWrapper; 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.common.security.annotation.Inner; +import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordParamDto; +import com.bsd.pjcloud.flow.task.utils.GetCheckReasonUtils; +import com.bsd.pjcloud.flow.task.vo.CheckStatusAndReasonVo; import com.bsd.pjcloud.supermarket.dto.cgdd.CGPlanLinkQueryDTO; import com.bsd.pjcloud.supermarket.dto.cgdd.ErpCgDDEditDTO; import com.bsd.pjcloud.supermarket.dto.cgdd.ErpCgDDSaveDTO; @@ -28,6 +33,7 @@ import org.springframework.http.HttpHeaders; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -122,6 +128,23 @@ public class SmErpCgDdController { return R.ok(smErpCgDdService.saveCGDD(erpCgDDSaveDTO)); } + + @Operation(summary = "回调" , description = "回调" ) + @SysLog("采购订单回调" ) + @PostMapping("/flow-callback") + @Inner(value = false) + @Transactional + public R supermarketFlowCallback(@RequestBody ProcessNodeRecordParamDto processNodeRecordParamDto) { + String processInstanceId = processNodeRecordParamDto.getProcessInstanceId(); + CheckStatusAndReasonVo checkReason = GetCheckReasonUtils.getCheckReason(processNodeRecordParamDto); + smErpCgDdService.update( + new LambdaUpdateWrapper() + .eq(SmErpCgDdEntity::getProcessInstanceId, processInstanceId) + .set(SmErpCgDdEntity::getCheckStatus, checkReason.getCheckStatus()) + .set(SmErpCgDdEntity::getCheckReason, checkReason.getCheckReason()) + ); + return R.ok(); + } /** * 修改采购订单 * @return R diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java index 2f4961682..a8694513c 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java @@ -251,8 +251,8 @@ public class SmErpSpuController { @Operation(summary = "安卓机条件查询所有" , description = "安卓机条件查询所有" ) @PostMapping("/ad/selectListAll" ) @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" ) - public R getSupermarketSpuByScope(@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO) { - return R.ok(smErpSpuService.selectListAllScope(supermarketSpuQueryDTO)); + public R getSupermarketSpuByScope(@ParameterObject Page page,@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO) { + return R.ok(smErpSpuService.selectListAllScope(page,supermarketSpuQueryDTO)); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java index 4d27c3626..7848bc318 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java @@ -1,12 +1,15 @@ package com.bsd.pjcloud.supermarket.mapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; +import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.springdoc.core.annotations.ParameterObject; import java.util.List; @@ -38,6 +41,6 @@ public interface SmErpSpuMapper extends PjcloudBaseMapper { return update(null, updateWrapper); } - List selectListAllScope(@Param("supermarketSpuQueryDTO") SupermarketSpuQueryDTO supermarketSpuQueryDTO + Page selectListAllScope(@ParameterObject Page page, @Param("supermarketSpuQueryDTO") SupermarketSpuQueryDTO supermarketSpuQueryDTO , DataScope dataScope); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java index fc1a83c5f..b9c6e07ad 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java @@ -11,6 +11,7 @@ import com.bsd.pjcloud.supermarket.dto.erpspu.SmErpSpuImportDto; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.vo.cgplan.ErpSpuWithUnitPageVo; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.validation.BindingResult; import java.util.ArrayList; @@ -49,7 +50,7 @@ public interface SmErpSpuService extends IService { * @param * @return */ - Object selectListAllScope(SupermarketSpuQueryDTO supermarketSpuQueryDTO); + Object selectListAllScope(@ParameterObject Page page,SupermarketSpuQueryDTO supermarketSpuQueryDTO); /** 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 d1e00f821..2d75c4e69 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 @@ -9,6 +9,11 @@ import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowApiFlowService; +import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum; +import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto; +import com.bsd.pjcloud.flow.task.entity.Process; +import com.bsd.pjcloud.supermarket.constant.SupermarketFlowConstant; import com.bsd.pjcloud.supermarket.dto.cgdd.ErpCgDDEditDTO; import com.bsd.pjcloud.supermarket.dto.cgdd.ErpCgDDSaveDTO; import com.bsd.pjcloud.supermarket.dto.cgdd.SmCgDDEditItemDTO; @@ -48,8 +53,7 @@ public class SmErpCgDdServiceImpl extends ServiceImpl items = erpCgDDSaveDTO.getItems(); List cgPlanItemEntities = BeanUtils.toBean(items, SmErpCgDdItemEntity.class); + + R processR = remoteFlowApiFlowService.getProcessByBusinessKey(SupermarketFlowConstant.SUPERMARKET_CGDD_FLOW); + String flowId = processR.getData().getFlowId(); + ProcessInstanceParamDto processInstanceParamDto = new ProcessInstanceParamDto(); + processInstanceParamDto.setFlowId(flowId); + R stringR = remoteFlowApiFlowService.startProcessInstance(processInstanceParamDto); + String processInstanceId = stringR.getData(); + smErpCgDdEntity.setProcessInstanceId(processInstanceId); + smErpCgDdEntity.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode()); + int insert = baseMapper.insert(smErpCgDdEntity); + + for (SmErpCgDdItemEntity cgPlanItemEntity : cgPlanItemEntities) { cgPlanItemEntity.setHId(smErpCgDdEntity.getId()); cgPlanItemEntity.setDeptId(deptId); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index 0f61f336b..ce9cff787 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -23,6 +23,7 @@ import com.bsd.pjcloud.supermarket.service.*; import com.bsd.pjcloud.supermarket.task.TaskStoreService; import com.bsd.pjcloud.supermarket.validarot.ErpSpuValidator; import com.bsd.pjcloud.supermarket.validarot.SupplierValidator; +import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuDetailsVo; import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppUnitVo; import com.bsd.pjcloud.supermarket.vo.erp.SmErpAuxiliaryCodeVo; @@ -36,6 +37,7 @@ import com.bsd.pjcloud.wallet.api.vo.MchManageVo; import lombok.AllArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.dao.DuplicateKeyException; @@ -378,11 +380,10 @@ public class SmErpSpuServiceImpl extends ServiceImpl list = baseMapper.selectListAllScope(supermarketSpuQueryDTO, DataScope.of()); - List bean = BeanUtils.toBean(list, SmErpSpuVo.class); - return bean; + Page list = baseMapper.selectListAllScope(page,supermarketSpuQueryDTO, DataScope.of()); + return list; } 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 85d10bdf5..9cbf5659a 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 @@ -27,5 +27,7 @@ + + \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml index 1c2101632..0f91f0412 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml @@ -52,81 +52,48 @@ - - - id, - product_code, - barcode, - product_name, - unit, - introduction, - description, - category_id, - pic_url, - slider_pic_urls, - sort, - status, - cost_price, - stock, - give_integral, - merchant_id, - dept_id, - specification, - origin, - packing_quantity, - purchase_price, - retail_price, - member_price1, - member_price2, - member_price3, - wholesale_price1, - wholesale_price2, - wholesale_price3, - promotion_price, - product_nature, - archiver_signature, - inventory_area, - commission_rate, - joint_deduction_rate, - inventory_upper_limit, - inventory_lower_limit, - gross_margin, - auxiliary_barcode_id, - brand_id, - supplier_id, - create_by, - create_time, - update_by, - update_time, - del_flag, - tenant_id, - sales_count - - SELECT - - FROM supermarket_spu + es.id, + es.product_code, + es.product_name, + es.category_id, + es.pic_url, + es.product_nature, + es.create_time, + es.sales_count, + u.unit, + u.spec, + u.retail_price, + u.promotion_price, + st.current_stock as stock + FROM sm_erp_spu es + left join sm_erp_unit u + on es.id = u.spu_id and u.is_base=1 + left join sm_erp_stock st + on es.id = st.erp_spu_id + u.status = 0 and es.status = 0 - AND id = #{supermarketSpuQueryDTO.id} + AND es.id = #{supermarketSpuQueryDTO.id} - AND product_code = #{supermarketSpuQueryDTO.productCode} + AND es.product_code = #{supermarketSpuQueryDTO.productCode} - AND barcode = #{supermarketSpuQueryDTO.barcode} + AND es.barcode = #{supermarketSpuQueryDTO.barcode} - AND product_name LIKE CONCAT('%', #{supermarketSpuQueryDTO.productName}, '%') + AND es.product_name LIKE CONCAT('%', #{supermarketSpuQueryDTO.productName}, '%') - AND category_id = #{supermarketSpuQueryDTO.categoryId} + AND es.category_id = #{supermarketSpuQueryDTO.categoryId} - AND product_nature = #{supermarketSpuQueryDTO.productNature} + AND es.product_nature = #{supermarketSpuQueryDTO.productNature} - ORDER BY create_time DESC + ORDER BY es.sort DESC \ No newline at end of file From f10a53cf6852480d196d8507c5371204d807a2a2 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 17 Mar 2025 14:38:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=89=E5=8D=93=E6=9C=BA=E8=B6=85?= =?UTF-8?q?=E5=B8=82=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ad/SmErpAuxiliaryCodeVo.java | 50 +++++++++++ .../SmErpSpuDetailsVo.java} | 67 +-------------- .../vo/{erp => ad}/SmErpUnitVo.java | 49 +---------- .../bsd/pjcloud/supermarket/vo/ad/SpuVo.java | 3 - .../vo/app/SupermarketSpuAppDetailsVo.java | 2 +- .../vo/erp/SmErpAuxiliaryCodeVo.java | 83 ------------------- .../service/impl/SmErpSpuServiceImpl.java | 23 +++-- 7 files changed, 70 insertions(+), 207 deletions(-) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SmErpAuxiliaryCodeVo.java rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/{erp/SmErpSpuVo.java => ad/SmErpSpuDetailsVo.java} (57%) rename pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/{erp => ad}/SmErpUnitVo.java (56%) delete mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpAuxiliaryCodeVo.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SmErpAuxiliaryCodeVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SmErpAuxiliaryCodeVo.java new file mode 100644 index 000000000..1ad99aca9 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SmErpAuxiliaryCodeVo.java @@ -0,0 +1,50 @@ +package com.bsd.pjcloud.supermarket.vo.ad; + +import com.baomidou.mybatisplus.annotation.*; +import com.bsd.pjcloud.common.core.util.TenantTable; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 商品辅助条码 + * + * @author zjf + * @date 2024-12-23 10:15:43 + */ +@Data +@Schema(description = "商品辅助条码") +public class SmErpAuxiliaryCodeVo { + + + /** + * 辅助条码id + */ + @Schema(description="辅助条码id") + private Long id; + + /** + * 条码 + */ + @Schema(description="条码") + private String barCode; + + /** + * spuID + */ + @Schema(description="spuID") + private Long spuId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + + @Schema(description="包装单位id") + private Long unitId; + +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSpuVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SmErpSpuDetailsVo.java similarity index 57% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSpuVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SmErpSpuDetailsVo.java index 3cd8a9fc9..39127ef93 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpSpuVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SmErpSpuDetailsVo.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.supermarket.vo.erp; +package com.bsd.pjcloud.supermarket.vo.ad; import com.baomidou.mybatisplus.annotation.*; @@ -10,7 +10,7 @@ import java.util.List; @Data @Schema(description="ad Spuvo") -public class SmErpSpuVo { +public class SmErpSpuDetailsVo { /** * 商品 SPU 编号，自增 @@ -24,35 +24,12 @@ public class SmErpSpuVo { @Schema(description="货号") private String productCode; - /** - * 自编码/条码 - */ - @Schema(description="自编码/条码") - private String barcode; - /** * 商品名称 */ @Schema(description="商品名称") private String productName; - /** - * 单位 - */ - @Schema(description="单位") - private String unit; - - /** - * 商品简介 - */ - @Schema(description="商品简介") - private String introduction; - - /** - * 商品详情 - */ - @Schema(description="商品详情") - private String description; /** * 商品分类编号 @@ -66,26 +43,11 @@ public class SmErpSpuVo { @Schema(description="商品封面图") private String picUrl; - /** - * 商品轮播图地址 - 数组，以逗号分隔 - 最多上传15张 - */ - @Schema(description="商品轮播图地址") - private String sliderPicUrls; - - /** * 库存 */ - @Schema(description="总库存") - private Integer stock; - - /** - * 赠送积分 - */ - @Schema(description="赠送积分") - private Integer giveIntegral; + @Schema(description="剩余库存") + private Double stock; /** * 商户编号 @@ -121,13 +83,6 @@ public class SmErpSpuVo { @Schema(description="货商id") private Long supplierId; - /** - * 创建人 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="创建人") - private String createBy; - /** * 创建时间 */ @@ -135,20 +90,6 @@ public class SmErpSpuVo { @Schema(description="创建时间") private LocalDateTime createTime; - /** - * 更新人 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="更新人") - private String updateBy; - - /** - * 更新时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="更新时间") - private LocalDateTime updateTime; - @Schema(description = "销量") private Integer salesCount; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpUnitVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SmErpUnitVo.java similarity index 56% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpUnitVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SmErpUnitVo.java index eb968bd6f..ae7a3e9ad 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpUnitVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SmErpUnitVo.java @@ -1,4 +1,4 @@ -package com.bsd.pjcloud.supermarket.vo.erp; +package com.bsd.pjcloud.supermarket.vo.ad; import com.baomidou.mybatisplus.annotation.*; import com.bsd.pjcloud.common.core.util.MoneyDeserializer; @@ -18,7 +18,6 @@ import java.time.LocalDateTime; * @date 2024-12-26 11:06:54 */ @Data -@TenantTable @Schema(description = "商品包装单位(sku)") public class SmErpUnitVo { @@ -26,7 +25,6 @@ public class SmErpUnitVo { /** * 包装单位id */ - @TableId(type = IdType.ASSIGN_ID) @Schema(description="包装单位id") private Long id; @@ -64,16 +62,12 @@ public class SmErpUnitVo { * 进价/单位分 */ @Schema(description="进价/单位分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer purchasePrice; /** * 零售价/单位分 */ @Schema(description="零售价/单位分") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer retailPrice; /** @@ -86,24 +80,9 @@ public class SmErpUnitVo { * 促销价 */ @Schema(description="促销价") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 private Integer promotionPrice; - /** - * 成本价 - */ - @Schema(description="成本价") - @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 - @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 - private Integer costPrice; - /** - * 创建者 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="创建者") - private String createBy; /** * 创建时间 @@ -112,31 +91,5 @@ public class SmErpUnitVo { @Schema(description="创建时间") private LocalDateTime createTime; - /** - * 更新者 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="更新者") - private String updateBy; - /** - * 更新时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="更新时间") - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - @TableLogic - @TableField(fill = FieldFill.INSERT) - @Schema(description="是否删除") - private String delFlag; - - /** - * 租户编号 - */ - @Schema(description="租户编号") - private Long tenantId; } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SpuVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SpuVo.java index 624f6ccb5..16030bc88 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SpuVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/ad/SpuVo.java @@ -2,13 +2,10 @@ package com.bsd.pjcloud.supermarket.vo.ad; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.bsd.pjcloud.supermarket.vo.erp.SmErpAuxiliaryCodeVo; -import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; -import java.util.List; @Data public class SpuVo { diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/SupermarketSpuAppDetailsVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/SupermarketSpuAppDetailsVo.java index 184dbbcdb..de0eb2fc3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/SupermarketSpuAppDetailsVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/SupermarketSpuAppDetailsVo.java @@ -3,7 +3,7 @@ package com.bsd.pjcloud.supermarket.vo.app; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitVo; +import com.bsd.pjcloud.supermarket.vo.ad.SmErpUnitVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpAuxiliaryCodeVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpAuxiliaryCodeVo.java deleted file mode 100644 index bb4e2faad..000000000 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpAuxiliaryCodeVo.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.bsd.pjcloud.supermarket.vo.erp; - -import com.baomidou.mybatisplus.annotation.*; -import com.bsd.pjcloud.common.core.util.TenantTable; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * 商品辅助条码 - * - * @author zjf - * @date 2024-12-23 10:15:43 - */ -@Data -@TenantTable -@TableName("supermarket_auxiliary_code") -@Schema(description = "商品辅助条码") -public class SmErpAuxiliaryCodeVo { - - - /** - * 辅助条码id - */ - @TableId(type = IdType.ASSIGN_ID) - @Schema(description="辅助条码id") - private Long id; - - /** - * 条码 - */ - @Schema(description="条码") - private String barCode; - - /** - * spuID - */ - @Schema(description="spuID") - private Long spuId; - - /** - * 创建者 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="创建者") - private String createBy; - - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="创建时间") - private LocalDateTime createTime; - - /** - * 更新者 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="更新者") - private String updateBy; - - /** - * 更新时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="更新时间") - private LocalDateTime updateTime; - - /** - * 是否删除 - */ - @TableLogic - @TableField(fill = FieldFill.INSERT) - @Schema(description="是否删除") - private String delFlag; - - /** - * 租户编号 - */ - @Schema(description="租户编号") - private Long tenantId; -} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index ce9cff787..a50ea9c52 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -16,19 +16,17 @@ import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanDTO; import com.bsd.pjcloud.supermarket.dto.erpspu.SmErpSpuImportDto; import com.bsd.pjcloud.supermarket.dto.inventoryrecords.UpdateStockDTO; -import com.bsd.pjcloud.supermarket.dto.supplier.SmErpSupplierImportDto; import com.bsd.pjcloud.supermarket.entity.*; import com.bsd.pjcloud.supermarket.mapper.*; import com.bsd.pjcloud.supermarket.service.*; import com.bsd.pjcloud.supermarket.task.TaskStoreService; import com.bsd.pjcloud.supermarket.validarot.ErpSpuValidator; -import com.bsd.pjcloud.supermarket.validarot.SupplierValidator; import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuDetailsVo; import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppUnitVo; -import com.bsd.pjcloud.supermarket.vo.erp.SmErpAuxiliaryCodeVo; -import com.bsd.pjcloud.supermarket.vo.erp.SmErpSpuVo; -import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitVo; +import com.bsd.pjcloud.supermarket.vo.ad.SmErpAuxiliaryCodeVo; +import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; +import com.bsd.pjcloud.supermarket.vo.ad.SmErpUnitVo; import com.bsd.pjcloud.supermarket.vo.cgplan.ErpSpuWithUnitPageVo; import com.bsd.pjcloud.supermarket.vo.cgplan.ErpUnitVo; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; @@ -393,12 +391,19 @@ public class SmErpSpuServiceImpl extends ServiceImpl smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper().eq(SmErpUnitEntity::getSpuId, id)); List supermarketAuxiliaryCodeEntities = smErpAuxiliaryCodeService.list(new LambdaQueryWrapper().eq(SmErpAuxiliaryCodeEntity::getSpuId, id)); - SmErpSpuVo smErpSpuVo = BeanUtils.toBean(smErpSpuEntity, SmErpSpuVo.class); + SmErpSpuDetailsVo smErpSpuDetailsVo = BeanUtils.toBean(smErpSpuEntity, SmErpSpuDetailsVo.class); List smErpUnitVoList = BeanUtils.toBean(smErpUnitEntityList, SmErpUnitVo.class); List smErpAuxiliaryCodeVos = BeanUtils.toBean(supermarketAuxiliaryCodeEntities, SmErpAuxiliaryCodeVo.class); - smErpSpuVo.setSupermarketUnitEntityList(smErpUnitVoList); - smErpSpuVo.setSupermarketAuxiliaryCodeEntityList(smErpAuxiliaryCodeVos); - return smErpSpuVo; + smErpSpuDetailsVo.setSupermarketUnitEntityList(smErpUnitVoList); + smErpSpuDetailsVo.setSupermarketAuxiliaryCodeEntityList(smErpAuxiliaryCodeVos); + + //库存 + LambdaQueryWrapper stocmEq = new LambdaQueryWrapper() + .eq(SmErpStockEntity::getErpSpuId, id); + SmErpStockEntity smErpStockEntity = smErpStockMapper.selectOne(stocmEq); + smErpSpuDetailsVo.setStock(smErpStockEntity.getCurrentStock()); + return smErpSpuDetailsVo; + } @Override From d217e007800f3806c325a3198ea8210ba4b42802 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 17 Mar 2025 14:44:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=89=E5=8D=93=E6=9C=BA=E8=B6=85?= =?UTF-8?q?=E5=B8=82=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/api/feign/RemoteSupermarketSpuService.java | 3 ++- .../bsd/pjcloud/supermarket/dto/SupermarketSpuQueryDTO.java | 6 ------ .../src/main/resources/mapper/SmErpSpuMapper.xml | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java index c3e755381..3c0ed7888 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java @@ -20,6 +20,7 @@ package com.bsd.pjcloud.supermarket.api.feign; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.feign.annotation.NoToken; @@ -44,7 +45,7 @@ public interface RemoteSupermarketSpuService { * @return R */ @PostMapping("/supermarketSpu/ad/selectListAll") - R getSupermarketSpuScope(@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO); + R getSupermarketSpuScope(@RequestParam Page page,@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO); diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuQueryDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuQueryDTO.java index 4e12dd5ef..10ef8edc2 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuQueryDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/SupermarketSpuQueryDTO.java @@ -45,10 +45,4 @@ public class SupermarketSpuQueryDTO { @Schema(description="商品性质(字典)") private String productNature; - - /** - * 商户id - */ - @Schema(description="商户id") - private Long merchantId; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml index 0f91f0412..eb7e667fb 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml @@ -82,7 +82,7 @@ AND es.product_code = #{supermarketSpuQueryDTO.productCode} - AND es.barcode = #{supermarketSpuQueryDTO.barcode} + AND u.barcode = #{supermarketSpuQueryDTO.barcode} AND es.product_name LIKE CONCAT('%', #{supermarketSpuQueryDTO.productName}, '%') From c53010698e92c0d42347c652388db0d1a7801f0f Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 17 Mar 2025 14:56:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=89=E5=8D=93=E6=9C=BA=E8=B6=85?= =?UTF-8?q?=E5=B8=82=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/feign/RemoteSupermarketCategoryService.java | 5 ++++- .../api/feign/RemoteSupermarketSpuService.java | 6 ++++-- .../supermarket/controller/SmErpCategoryController.java | 2 +- .../supermarket/controller/SmErpSpuController.java | 8 +++++--- .../bsd/pjcloud/supermarket/service/SmErpSpuService.java | 7 +++++-- .../supermarket/service/impl/SmErpSpuServiceImpl.java | 5 +++-- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketCategoryService.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketCategoryService.java index 51e1015d4..9e3f666a7 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketCategoryService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketCategoryService.java @@ -3,10 +3,13 @@ package com.bsd.pjcloud.supermarket.api.feign; import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.supermarket.vo.erp.SmErpCategorySimpleVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * @author zjf * @date 2018/6/22 @@ -22,6 +25,6 @@ public interface RemoteSupermarketCategoryService { * @return R */ @GetMapping("/supermarketCategory/simpleAll") - R getSimpleAll(); + R> getSimpleAll(); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java index 3c0ed7888..00291ffa5 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java @@ -26,6 +26,8 @@ import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.feign.annotation.NoToken; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO; +import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; +import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -45,7 +47,7 @@ public interface RemoteSupermarketSpuService { * @return R */ @PostMapping("/supermarketSpu/ad/selectListAll") - R getSupermarketSpuScope(@RequestParam Page page,@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO); + R> getSupermarketSpuScope(@RequestParam Page page, @RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO); @@ -55,7 +57,7 @@ public interface RemoteSupermarketSpuService { * @return */ @GetMapping("/supermarketSpu/ad/SpuDetails") - R getSupermarketSpuDetailById(@RequestParam("id")Long id); + R getSupermarketSpuDetailById(@RequestParam("id")Long id); /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java index 3a9c91f5f..de011e7ec 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java @@ -144,7 +144,7 @@ public class SmErpCategoryController { */ @Operation(summary = "APP分类查询",description = "通过商户id获取该商户下的分类") @GetMapping("/app/simpleAll") - public R getAppSimpleAll(@RequestParam("merchantId")Long merchantId) { + public R> getAppSimpleAll(@RequestParam("merchantId")Long merchantId) { List list = smErpCategoryService. list(new LambdaQueryWrapper().eq(SmErpCategoryEntity::getMerchantId, merchantId)); List bean = BeanUtils.toBean(list, SmErpCategorySimpleVo.class); diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java index a8694513c..0b3c584dc 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java @@ -21,6 +21,8 @@ import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity; import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity; import com.bsd.pjcloud.supermarket.service.*; import com.bsd.pjcloud.supermarket.task.TaskStoreService; +import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; +import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuSimpleVo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -251,7 +253,7 @@ public class SmErpSpuController { @Operation(summary = "安卓机条件查询所有" , description = "安卓机条件查询所有" ) @PostMapping("/ad/selectListAll" ) @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" ) - public R getSupermarketSpuByScope(@ParameterObject Page page,@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO) { + public R> getSupermarketSpuByScope(@ParameterObject Page page, @RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO) { return R.ok(smErpSpuService.selectListAllScope(page,supermarketSpuQueryDTO)); } @@ -261,9 +263,9 @@ public class SmErpSpuController { * @param id * @return */ - @Operation(summary = "条件查询所有" , description = "条件查询所有" ) + @Operation(summary = "spu详情" , description = "spu详情" ) @GetMapping("/ad/SpuDetails" ) - public R getSupermarketSpuDetailById(@RequestParam("id")Long id) { + public R getSupermarketSpuDetailById(@RequestParam("id")Long id) { return R.ok(smErpSpuService.getSupermarketSpuDetailById(id)); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java index b9c6e07ad..79403e9f0 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.supermarket.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.common.core.util.R; @@ -9,6 +10,8 @@ import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanDTO; import com.bsd.pjcloud.supermarket.dto.erpspu.SmErpSpuImportDto; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; +import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; +import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; import com.bsd.pjcloud.supermarket.vo.cgplan.ErpSpuWithUnitPageVo; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; import org.springdoc.core.annotations.ParameterObject; @@ -50,7 +53,7 @@ public interface SmErpSpuService extends IService { * @param * @return */ - Object selectListAllScope(@ParameterObject Page page,SupermarketSpuQueryDTO supermarketSpuQueryDTO); + Page selectListAllScope(@ParameterObject Page page, SupermarketSpuQueryDTO supermarketSpuQueryDTO); /** @@ -58,7 +61,7 @@ public interface SmErpSpuService extends IService { * @param id * @return */ - Object getSupermarketSpuDetailById(Long id); + SmErpSpuDetailsVo getSupermarketSpuDetailById(Long id); /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index a50ea9c52..a79229d3a 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -2,6 +2,7 @@ package com.bsd.pjcloud.supermarket.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.common.core.util.BeanUtils; @@ -378,7 +379,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl selectListAllScope(@ParameterObject Page page, SupermarketSpuQueryDTO supermarketSpuQueryDTO) { Page list = baseMapper.selectListAllScope(page,supermarketSpuQueryDTO, DataScope.of()); return list; @@ -387,7 +388,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper().eq(SmErpUnitEntity::getSpuId, id)); List supermarketAuxiliaryCodeEntities = smErpAuxiliaryCodeService.list(new LambdaQueryWrapper().eq(SmErpAuxiliaryCodeEntity::getSpuId, id));