添加耗材功能

eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfoFlow.java

@@ -45,6 +45,12 @@ public class TbConsInfoFlow implements Serializable {
     @ApiModelProperty(value = "耗材id")
     private Integer consId;
 
+
+
+    @Column(name = "`pro_sku_id`")
+    @ApiModelProperty(value = "规格id")
+    private Integer   proSkuId;
+
     @Column(name = "`con_name`")
     @ApiModelProperty(value = "耗材名称")
     private String conName;

eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java

@@ -15,11 +15,11 @@ public interface TbConsInfoFlowRepository extends JpaRepository<TbConsInfoFlow,
 
 
     @Query(value = "SELECT\n" +
-            "\tp.`name`\n" +
+            "\tp.`name` \n" +
             "FROM\n" +
-            " tb_prosku_con i \n" +
-            "\tleft join tb_product_sku s on i.product_sku_id=s.id\n" +
-            "\tleft join tb_product p on s.product_id=p.id\n" +
-            "\twhere i.con_info_id=?1 limit 1",nativeQuery = true)
+            "\ttb_cons_info_flow i\n" +
+            "\tLEFT JOIN tb_product_sku s ON i.pro_sku_id = s.id\n" +
+            "\tLEFT JOIN tb_product p ON s.product_id = p.id\n" +
+            "\twhere i.pro_sku_id=?1 limit 1",nativeQuery = true)
     String selectByPskId(Integer skuId);
 }

eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoFlowDto.java

@@ -32,6 +32,8 @@ public class TbConsInfoFlowDto implements Serializable {
     /** 耗材id */
     private Integer consId;
 
+    private Integer   proSkuId;
+
     /** 耗材名称 */
     private String conName;