From d7d413e3a4c6a26b4c7e2b3e74e6e27046387c21 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 4 Aug 2025 10:12:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(=E6=99=BA=E6=85=A7=E8=B6=85=E5=B8=82):?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E4=BA=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E7=BC=96=E8=BE=91=E9=87=8C=E7=9A=84=E7=B4=AF=E8=AE=A1?= =?UTF-8?q?=E6=80=BB=E9=87=91=E9=A2=9D=E5=92=8C=E5=88=97=E8=A1=A8=E9=87=8C?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E5=88=97=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=80=BB=E9=87=91=E9=A2=9D=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SmErpInventoryRecordsServiceImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 7ce471126..23753d3e9 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 @@ -210,12 +210,24 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl userMap = remoteUserService.getUserMap(userIds).getData(); - List processInstanceIds= records.stream().map(SmErpInventoryRecordsEntity::getProcessInstanceId).filter(Objects::nonNull).collect(Collectors.toList()); +// List processInstanceIds= records.stream().map(SmErpInventoryRecordsEntity::getProcessInstanceId).filter(Objects::nonNull).collect(Collectors.toList()); LambdaQueryWrapper smErpCgPlanItemEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); smErpCgPlanItemEntityLambdaQueryWrapper.in(SmErpInventoryRecordsItemEntity::getInventoryId,planIds); List cgPlanItemEntities = smErpInventoryRecordsItemMapper.selectList(smErpCgPlanItemEntityLambdaQueryWrapper); + // 按 inventoryId 分组并计算每个分组的 totalAmount 总和 + Map inventoryTotalAmountMap = cgPlanItemEntities.stream() + .collect(Collectors.groupingBy( + SmErpInventoryRecordsItemEntity::getInventoryId, + Collectors.summingInt(SmErpInventoryRecordsItemEntity::getTotalAmount) + )); + // 将计算出的 totalAmount 总和设置回 pageData 的 records 中 + records.forEach(record -> { + Integer totalAmount = inventoryTotalAmountMap.getOrDefault(record.getId(), 0); + record.setTotalAmount(totalAmount); + }); + Set erpSpuIds = cgPlanItemEntities.stream().map(SmErpInventoryRecordsItemEntity::getErpSpuId).collect(Collectors.toSet()); List smErpSpuEntities = smErpSpuMapper.selectList(new LambdaQueryWrapper().in(SmErpSpuEntity::getId, erpSpuIds)); Map spuMap = smErpSpuEntities.stream().collect(Collectors.toMap(SmErpSpuEntity::getId, spu -> spu)); From 2e73cea68f214c619664bda4289e94a65ffaa003 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 4 Aug 2025 11:28:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix(=E6=99=BA=E6=85=A7=E8=B6=85=E5=B8=82):?= =?UTF-8?q?=E8=B4=A7=E5=95=86=E5=AF=BC=E5=85=A5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/dto/supplier/SmErpSupplierImportDto.java | 2 +- .../pjcloud/supermarket/validarot/SupplierValidator.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/supplier/SmErpSupplierImportDto.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/supplier/SmErpSupplierImportDto.java index 3e539cd5b..d26001aef 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/supplier/SmErpSupplierImportDto.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/supplier/SmErpSupplierImportDto.java @@ -33,7 +33,7 @@ public class SmErpSupplierImportDto { @ExcelProperty("开户行及帐号") private String bankAccount; - @ExcelProperty("货商类") + @ExcelProperty("货商类别") private String supplierCategory; @ExcelProperty("货商地区") diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/validarot/SupplierValidator.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/validarot/SupplierValidator.java index 6ebf15230..036916334 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/validarot/SupplierValidator.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/validarot/SupplierValidator.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.supermarket.validarot; +import com.alibaba.excel.util.StringUtils; import com.bsd.pjcloud.supermarket.dto.supplier.SmErpSupplierImportDto; import org.springframework.stereotype.Component; @@ -14,9 +15,9 @@ public class SupplierValidator { if (entity.getSupplierName() == null || entity.getSupplierName().isEmpty()) { errors.add("第" + (rowIndex + 1) + "行: 货商名称不能为空"); } -// if (entity.getPhone()== null || entity.getPhone().isEmpty()) { -// errors.add("第" + (rowIndex + 1) + "行: 电话不能为空"); -// } + if (StringUtils.isBlank(entity.getSupplierCategory())) { + errors.add("第" + (rowIndex + 1) + "行: 货商类别不能为空"); + } return errors; } } From 75656cd8b107672e0090582b7d7c886f4598e484 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 4 Aug 2025 12:24:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(=E6=99=BA=E6=85=A7=E8=B6=85=E5=B8=82):?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F=E7=BB=9F=E4=B8=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAdouble=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=95=86?= =?UTF-8?q?=E5=93=81=E9=80=89=E6=8B=A9vo=E5=A2=9E=E5=8A=A0=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=80=A7=E8=B4=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java | 2 +- .../bsd/pjcloud/supermarket/dto/cgdd/SmCgDDEditItemDTO.java | 2 +- .../bsd/pjcloud/supermarket/dto/cgdd/SmCgDDSaveItemDTO.java | 2 +- .../pjcloud/supermarket/dto/cgplan/SmCgPlanEditItemDTO.java | 2 +- .../pjcloud/supermarket/dto/cgplan/SmCgPlanSaveItemDTO.java | 2 +- .../dto/inventoryrecords/InventoryRecordSaveItemDTO.java | 2 +- .../com/bsd/pjcloud/supermarket/entity/SmErpCgDdEntity.java | 2 +- .../bsd/pjcloud/supermarket/entity/SmErpCgDdItemEntity.java | 2 +- .../com/bsd/pjcloud/supermarket/entity/SmErpCgPlanEntity.java | 2 +- .../bsd/pjcloud/supermarket/entity/SmErpCgPlanItemEntity.java | 2 +- .../com/bsd/pjcloud/supermarket/vo/cgdd/SmeErpCgDdItemVo.java | 2 +- .../pjcloud/supermarket/vo/cgplan/ErpSpuWithUnitPageVo.java | 4 ++++ .../bsd/pjcloud/supermarket/vo/cgplan/SmErpCgPlanItemVo.java | 2 +- .../supermarket/vo/inventoryrecord/InventoryRecordItemVo.java | 2 +- .../supermarket/vo/inventoryrecord/InventoryRecordPageVo.java | 2 +- .../bsd/pjcloud/supermarket/vo/inventoryrecord/PDItemVo.java | 2 +- .../pjcloud/supermarket/controller/SmErpCgPlanController.java | 1 + 17 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java index bc9d7ec0e..c18e49b6f 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java @@ -34,7 +34,7 @@ public class InventoryRecordItemVo { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/SmCgDDEditItemDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/SmCgDDEditItemDTO.java index 8d293584a..bd1865397 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/SmCgDDEditItemDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/SmCgDDEditItemDTO.java @@ -31,7 +31,7 @@ public class SmCgDDEditItemDTO { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/SmCgDDSaveItemDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/SmCgDDSaveItemDTO.java index 9e9807837..0291a5d6f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/SmCgDDSaveItemDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/SmCgDDSaveItemDTO.java @@ -25,7 +25,7 @@ public class SmCgDDSaveItemDTO { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanEditItemDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanEditItemDTO.java index 882c8fbb0..ff5690e67 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanEditItemDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanEditItemDTO.java @@ -31,7 +31,7 @@ public class SmCgPlanEditItemDTO { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanSaveItemDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanSaveItemDTO.java index 6a927095d..073c111ae 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanSaveItemDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanSaveItemDTO.java @@ -31,7 +31,7 @@ public class SmCgPlanSaveItemDTO { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java index a79f63cc6..e4507037f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java @@ -25,7 +25,7 @@ public class InventoryRecordSaveItemDTO { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 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 abe05869b..2d5efbb4f 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 @@ -83,7 +83,7 @@ public class SmErpCgDdEntity extends Model { * 出入库数量 */ @Schema(description="出入库数量") - private Integer quantity; + private Double quantity; /** * 累计进货数量 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/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 index 67154bd52..497de357f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/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 @@ -57,7 +57,7 @@ public class SmErpCgDdItemEntity extends Model { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 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 3353ce2fc..d3f17caf9 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 @@ -83,7 +83,7 @@ public class SmErpCgPlanEntity extends Model { * 出入库数量 */ @Schema(description="出入库数量") - private Integer quantity; + private Double quantity; /** * 备注 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanItemEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanItemEntity.java index 2131294af..6c3e9958c 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanItemEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanItemEntity.java @@ -61,7 +61,7 @@ public class SmErpCgPlanItemEntity extends Model { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgdd/SmeErpCgDdItemVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgdd/SmeErpCgDdItemVo.java index 53bb03b4e..f8a0529f7 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgdd/SmeErpCgDdItemVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgdd/SmeErpCgDdItemVo.java @@ -38,7 +38,7 @@ public class SmeErpCgDdItemVo { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/ErpSpuWithUnitPageVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/ErpSpuWithUnitPageVo.java index 09842f16d..dacb7eb2d 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/ErpSpuWithUnitPageVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/ErpSpuWithUnitPageVo.java @@ -85,6 +85,10 @@ public class ErpSpuWithUnitPageVo { private Long supplierId; + @Schema(description="商品性质,1普通商品 2称重商品") + private String productNature; + + @Schema(description = "包装对象集合对象") private List erpUnitVos; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/SmErpCgPlanItemVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/SmErpCgPlanItemVo.java index b61e7dc78..3b82ff102 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/SmErpCgPlanItemVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/SmErpCgPlanItemVo.java @@ -37,7 +37,7 @@ public class SmErpCgPlanItemVo { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordItemVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordItemVo.java index 999089648..06b82f988 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordItemVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordItemVo.java @@ -38,7 +38,7 @@ public class InventoryRecordItemVo { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; /** * 进价 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordPageVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordPageVo.java index b07818502..79eb20c35 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordPageVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordPageVo.java @@ -58,7 +58,7 @@ public class InventoryRecordPageVo { * 数量 */ @Schema(description="入库数量") - private Integer quantity; + private Double quantity; /** * 进价 diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/PDItemVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/PDItemVo.java index 679deee99..3b938b672 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/PDItemVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/PDItemVo.java @@ -67,7 +67,7 @@ public class PDItemVo { * 数量 */ @Schema(description="数量") - private Integer quantity; + private Double quantity; @Schema(description="盘后总数") 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 f9745b723..cdb2e10e7 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 @@ -91,6 +91,7 @@ public class SmErpCgPlanController { * 分页查询 * @param page 分页对象 * @return + * todo 迁移到公共接口 */ @Operation(summary = "选择商品分页数据" , description = "选择商品分页数据" ) @GetMapping("/erpSpuPage" ) From 79ed3806f77218808cdcb589483390608f29cee4 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 4 Aug 2025 16:40:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(=E6=99=BA=E6=85=A7=E8=B6=85=E5=B8=82):?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=95=86=E5=93=81=E5=88=86=E9=A1=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/erpspu/SmErpSpuPageDto.java | 98 +++++++++++ .../supermarket/vo/erpspu/SmErpSpuPageVo.java | 159 ++++++++++++++++++ .../controller/SmErpSpuController.java | 10 +- .../supermarket/mapper/SmErpSpuMapper.java | 5 + .../supermarket/service/SmErpSpuService.java | 5 +- .../service/impl/SmErpSpuServiceImpl.java | 55 +++--- .../main/resources/mapper/SmErpSpuMapper.xml | 84 +++++---- 7 files changed, 356 insertions(+), 60 deletions(-) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuPageDto.java create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuPageVo.java diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuPageDto.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuPageDto.java new file mode 100644 index 000000000..1885a693a --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuPageDto.java @@ -0,0 +1,98 @@ +package com.bsd.pjcloud.supermarket.dto.erpspu; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.bsd.pjcloud.common.core.util.TenantTable; +import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity; +import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 商品spu + * + * @author zjf + * @date 2024-12-23 10:42:43 + */ +@Data +@TenantTable +@TableName("sm_erp_spu") +@EqualsAndHashCode(callSuper = true) +@Schema(description = "商品spu") +public class SmErpSpuPageDto extends Model { + + + /** + * 商品 SPU 编号，自增 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="商品 SPU 编号，自增") + private Long id; + + /** + * 货号 + */ + @Schema(description="货号") + private String productCode; + + /** + * 自编码/条码 + */ + @Schema(description="自编码/条码") + private String barCode; + + /** + * 商品名称 + */ + @Schema(description="商品名称") + private String productName; + + + + /** + * 商品详情 + */ + @Schema(description="商品详情") + private String description; + + /** + * 商品分类编号 + */ + @Schema(description="商品分类编号") + private Long categoryId; + + + /** + * 排序字段 + */ + @Schema(description="排序字段") + private Integer sort; + + /** + * 商品状态: 1 上架（开启） 0 下架（禁用） -1 回收 + */ + @Schema(description="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收") + private String status; + + + + /** + * 商品性质(字典) + */ + @Schema(description="商品性质(字典)") + private String productNature; + + + /** + * 货商id + */ + @Schema(description="货商id") + private Long supplierId; + + +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuPageVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuPageVo.java new file mode 100644 index 000000000..b5dcc5cd1 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erpspu/SmErpSpuPageVo.java @@ -0,0 +1,159 @@ +package com.bsd.pjcloud.supermarket.vo.erpspu; + +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.bsd.pjcloud.common.core.util.TenantTable; +import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity; +import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 商品spu + * + * @author zjf + * @date 2024-12-23 10:42:43 + */ +@Data +@Schema(description = "商品spu") +public class SmErpSpuPageVo { + + + /** + * 商品 SPU 编号，自增 + */ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description="商品 SPU 编号，自增") + private Long id; + + /** + * 货号 + */ + @Schema(description="货号") + private String productCode; + + /** + * 自编码/条码 + */ + @Schema(description="自编码/条码") + private String barCode; + + /** + * 商品名称 + */ + @Schema(description="商品名称") + private String productName; + + /** + * 单位 + */ + @Schema(description="单位") + private String unit; + + /** + * 商品分类编号 + */ + @Schema(description="商品分类编号") + private Long categoryId; + + /** + * 商品封面图 + */ + @Schema(description="商品封面图") + private String picUrl; + + + /** + * 排序字段 + */ + @Schema(description="排序字段") + private Integer sort; + + /** + * 商品状态: 1 上架（开启） 0 下架（禁用） -1 回收 + */ + @Schema(description="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收") + private String status; + + /** + * 成本单价，单位： 分 + */ + @Schema(description="成本单价，单位： 分") +// @JsonSerialize(using = MoneySerializer.class) // 分 -> 元 +// @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分 + private Double costPrice; + + /** + * 库存 + */ + @Schema(description="库存") + private Double stock; + + + /** + * 进价（分为单位） + */ + @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; + + /** + * 商品性质(字典) + */ + @Schema(description="商品性质(字典)") + private String productNature; + + + /** + * 辅助条码id + */ + @Schema(description="辅助条码id") + private String auxiliaryBarcodeId; + + /** + * 品牌id + */ + @Schema(description="品牌id") + private Long brandId; + + /** + * 货商id + */ + @Schema(description="货商id") + private Long supplierId; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description="创建时间") + private LocalDateTime createTime; + + + + + + + +} \ No newline at end of file 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 50b675e32..7dc4b52cf 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 @@ -17,6 +17,7 @@ import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockByCodeReqDTO; import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO; import com.bsd.pjcloud.supermarket.dto.erpspu.SmErpSpuImportDto; +import com.bsd.pjcloud.supermarket.dto.erpspu.SmErpSpuPageDto; import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.entity.SmErpStockEntity; @@ -82,13 +83,8 @@ public class SmErpSpuController { @Operation(summary = "分页查询" , description = "分页查询" ) @GetMapping("/page" ) @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" ) - public R getSupermarketSpuPage(@ParameterObject Page page, @ParameterObject SmErpSpuEntity supermarketSpu) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductCode()), SmErpSpuEntity::getProductCode,supermarketSpu.getProductCode()); - wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getBarCode()), SmErpSpuEntity::getBarCode,supermarketSpu.getBarCode()); - wrapper.like(StringUtils.isNotBlank(supermarketSpu.getProductName()), SmErpSpuEntity::getProductName,supermarketSpu.getProductName()); - wrapper.orderByDesc(SmErpSpuEntity::getCreateTime).orderByDesc(SmErpSpuEntity::getId); - return R.ok(smErpSpuService.pageScope(page, wrapper)); + public R getSupermarketSpuPage(@ParameterObject Page page, @ParameterObject SmErpSpuPageDto supermarketSpu) { + return R.ok(smErpSpuService.pageScope(page, supermarketSpu)); } /** 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 5d7c0c7be..d69d39c7b 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 @@ -5,8 +5,10 @@ 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.dto.erpspu.SmErpSpuPageDto; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; +import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuPageVo; import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuStockExcel; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -47,4 +49,7 @@ public interface SmErpSpuMapper extends PjcloudBaseMapper { List exportSupermarketSpuStockExcel(@Param("supermarketSpu") SmErpSpuEntity supermarketSpu, @Param("ids") Long[] ids,DataScope dataScope); + + + Page selectPageXmlByScope(@Param("page") Page page, @Param("supermarketSpuPageDto") SmErpSpuPageDto smErpSpuPageDto,DataScope of); } \ 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 348006929..7fdb71b62 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 @@ -10,6 +10,7 @@ import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockByCodeReqDTO; 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.erpspu.SmErpSpuPageDto; import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity; import com.bsd.pjcloud.supermarket.vo.ad.SmErpSpuDetailsVo; import com.bsd.pjcloud.supermarket.vo.ad.SpuVo; @@ -53,10 +54,10 @@ public interface SmErpSpuService extends IService { /** * 分页查询 * @param page - * @param wrapper + * @param * @return */ - Object pageScope(Page page, LambdaQueryWrapper wrapper); + Object pageScope(Page page, SmErpSpuPageDto smErpSpuPageDto); /** * 根据条件查询所有数据，app/收银机接口 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 192f86cbe..43314a3f0 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 @@ -3,6 +3,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.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum; @@ -18,6 +19,7 @@ import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockByCodeReqDTO; 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.erpspu.SmErpSpuPageDto; import com.bsd.pjcloud.supermarket.dto.inventoryrecords.UpdateStockDTO; import com.bsd.pjcloud.supermarket.entity.*; import com.bsd.pjcloud.supermarket.mapper.*; @@ -32,6 +34,7 @@ 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.erpspu.SmErpSpuPageVo; import com.bsd.pjcloud.supermarket.vo.erpspu.SmErpSpuStockExcel; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; @@ -495,28 +498,38 @@ public class SmErpSpuServiceImpl extends ServiceImpl wrapper) { - Page pageData = baseMapper.selectPageByScope(page, wrapper, DataScope.of()); + public Object pageScope(Page page, SmErpSpuPageDto smErpSpuPageDto) { +// LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); +// wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductCode()), SmErpSpuEntity::getProductCode,supermarketSpu.getProductCode()); +// wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getBarCode()), SmErpSpuEntity::getBarCode,supermarketSpu.getBarCode()); +// wrapper.like(StringUtils.isNotBlank(supermarketSpu.getProductName()), SmErpSpuEntity::getProductName,supermarketSpu.getProductName()); +// wrapper.eq(null!=supermarketSpu.getCategoryId(), SmErpSpuEntity::getCategoryId,supermarketSpu.getCategoryId()); +// wrapper.orderByDesc(SmErpSpuEntity::getCreateTime).orderByDesc(SmErpSpuEntity::getId); + + //重构分页 + Page pageData=baseMapper.selectPageXmlByScope(page,smErpSpuPageDto , DataScope.of()); + +// Page pageData = baseMapper.selectPageByScope(page, wrapper, DataScope.of()); //计算库存回显 - List records = pageData.getRecords(); - if (CollectionUtils.isNotEmpty(records)) { - Set erpSpuIds = records.stream().map(smErpSpuEntity -> smErpSpuEntity.getId()).collect(Collectors.toSet()); - - // 批量查询库存信息 - List stocks = smErpStockMapper.selectList( - new LambdaQueryWrapper() - .in(SmErpStockEntity::getErpSpuId, erpSpuIds)); - - // 建立SPU ID与库存的映射关系 - Map stockMap = stocks.stream() - .collect(Collectors.toMap(SmErpStockEntity::getErpSpuId, smErpStockEntity -> smErpStockEntity)); - - records.forEach(spu -> - { - SmErpStockEntity smErpStockEntity = stockMap.get(spu.getId()); - spu.setStock(smErpStockEntity != null ? smErpStockEntity.getCurrentStock() : 0); - }); - } +// List records = pageData.getRecords(); +// if (CollectionUtils.isNotEmpty(records)) { +// Set erpSpuIds = records.stream().map(smErpSpuEntity -> smErpSpuEntity.getId()).collect(Collectors.toSet()); +// +// // 批量查询库存信息 +// List stocks = smErpStockMapper.selectList( +// new LambdaQueryWrapper() +// .in(SmErpStockEntity::getErpSpuId, erpSpuIds)); +// +// // 建立SPU ID与库存的映射关系 +// Map stockMap = stocks.stream() +// .collect(Collectors.toMap(SmErpStockEntity::getErpSpuId, smErpStockEntity -> smErpStockEntity)); +// +// records.forEach(spu -> +// { +// SmErpStockEntity smErpStockEntity = stockMap.get(spu.getId()); +// spu.setStock(smErpStockEntity != null ? smErpStockEntity.getCurrentStock() : 0); +// }); +// } return pageData; } 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 affbe3f7d..452956474 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 @@ -3,54 +3,27 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file From 9a5b4d3a30bdd56210be4aeb6b2b03b17dcdd6a3 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 4 Aug 2025 18:50:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(=E6=99=BA=E6=85=A7=E8=B6=85=E5=B8=82):?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=95=86=E5=93=81=E5=88=86=E9=A1=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/SmErpSpuMapper.xml | 1 + 1 file changed, 1 insertion(+) 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 452956474..084b7160e 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 @@ -155,5 +155,6 @@ AND spu.supplier_id = #{supermarketSpuPageDto.supplierId} + order by spu.create_time desc,spu.id desc \ No newline at end of file