销售收入上缴-v1.8

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenue.java

@@ -73,7 +73,7 @@ public class BusinessFsSaleRevenue implements Serializable {
     @TableField("problem_feedback")
     private String problemFeedback;
 
-    @ApiModelProperty(value = "状态 0：保存；1：上报；2：已核定；")
+    @ApiModelProperty(value = "状态 0：保存；1：库级系统-上报；2：已核定；3：省级平台-上报")
     @TableField("status")
     private Integer status;
 

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenueApprovalPrice.java

@@ -70,10 +70,18 @@ public class BusinessFsSaleRevenueApprovalPrice implements Serializable {
 
     @ApiModelProperty(value = "仓房名称")
     @TableField(exist = false)
+    private Integer storehouseId;
+
+    @ApiModelProperty(value = "仓房名称")
+    @TableField(exist = false)
     private String storehouseName;
 
     @ApiModelProperty(value = "货位名称")
     @TableField(exist = false)
+    private String warehouseId;
+
+    @ApiModelProperty(value = "货位名称")
+    @TableField(exist = false)
     private String warehouseName;
 
     @ApiModelProperty(value = "入库数量（公斤）")

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueMapper.xml

@@ -405,7 +405,9 @@
     <select id="getCardDetailsInfo" parameterType="integer" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueApprovalPrice">
         SELECT
             ap.id,
+            sc.basic_storehouse_id storehouseId,
             bs.storehouse_name storehouseName,
+            sc.warehouse_id warehouseId,
             bw.warehouse_name warehouseName,
             sc.lssl,
             sc.in_financial_verification inNinancialVerification,