fix(智慧超市):入库数量统一修改为double类型，商品选择vo增加商品性质字段

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;
 
 	/**
 	* 进价

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;
 
 	/**
 	* 进价

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;
 
 	/**
 	* 进价

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;
 
 	/**
 	* 进价

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;
 
 	/**
 	* 进价

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;
 
 	/**
 	* 进价

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdEntity.java

@@ -83,7 +83,7 @@ public class SmErpCgDdEntity extends Model<SmErpCgDdEntity> {
 	* 出入库数量
 	*/
     @Schema(description="出入库数量")
-    private Integer quantity;
+    private Double quantity;
 
 	/**
 	* 累计进货数量

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdItemEntity.java

@@ -57,7 +57,7 @@ public class SmErpCgDdItemEntity extends Model<SmErpCgDdItemEntity> {
 	* 数量
 	*/
     @Schema(description="数量")
-    private Integer quantity;
+    private Double quantity;
 
 	/**
 	* 进价

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanEntity.java

@@ -83,7 +83,7 @@ public class SmErpCgPlanEntity extends Model<SmErpCgPlanEntity>  {
 	* 出入库数量
 	*/
     @Schema(description="出入库数量")
-    private Integer quantity;
+    private Double quantity;
 
 	/**
 	* 备注

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanItemEntity.java

@@ -61,7 +61,7 @@ public class SmErpCgPlanItemEntity extends Model<SmErpCgPlanItemEntity> {
 	* 数量
 	*/
     @Schema(description="数量")
-    private Integer quantity;
+    private Double quantity;
 
 	/**
 	* 进价

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;
 
 	/**
 	* 进价

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<ErpUnitVo> erpUnitVos;
 }

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;
 
 	/**
 	* 进价

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;
 
 	/**
 	* 进价

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;
 
     /**
      * 进价

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="盘后总数")

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" )