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] =?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" )