核销信息查询

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -1050,6 +1050,10 @@
             ,tpo.make_time AS "makeTime"
             ,tms.staff_name as "staffName"
             ,tmo.org_name   as "orgName"
+            ,tmrp.sum_amt_rec AS "sumAmtRec"
+            ,tmrp.sum_should_handle AS "sumShouldHandle"
+            ,tmrp.sum_use_payment_residue  AS "sumUsePaymentResidue"
+            ,tmrp.sum_waive_amt AS "sumWaiveAmt"
         FROM
             dkic_b.t_psi_order tpo
         left join dkic_b.t_mst_customer tmc on tpo.cus_id = tmc.cus_id
@@ -1058,6 +1062,7 @@
         left join sys.t_data_kind as tdk3 on tpo.out_status = tdk3.kind_code
         left join dkic_b.t_mst_staff tms on tpo.staff_id = tms.staff_id
         left join dkic_b.t_mst_org tmo on tpo.org_id = tmo.org_id
+        left join dkic_b.t_mac_rec_pay tmrp on  tmrp.biznis_id = tpo.order_id
         <include refid="ConditionSalesTrackingReport"/>
         order by  tpo.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

src/main/java/com/dk/mdm/model/vo/ivt/OutboundItemVO.java

@@ -229,6 +229,9 @@ public class OutboundItemVO {
     @ApiModelProperty(value = "新建编辑标识true:新建,false:编辑")
     private Boolean addOrEditFlag;
 
+    @ApiModelProperty(value = "可以输入负数出库标识")
+    private Boolean canNegativeFlag;
+
     private static final long serialVersionUID = 1L;
 
 }