Просмотр исходного кода

采购入库 是否收款标识

changhaoning 2 лет назад
Родитель
Сommit
d68cfca643

+ 9 - 1
src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -334,7 +334,10 @@
         sys.f_get_name_i18n(tdktype.kind_name_i18n, 'zh_CN') AS  "intoTypeName",
         sys.f_get_name_i18n(tdk.kind_name_i18n, 'zh_CN') AS  "intoStatusName",
         tmd.data_value                                   as into_reason_name,
-        tmp.return_address
+        tmp.return_address,
+        case when tpi.receivable_id is null then false
+        when tmai.amt_should = tmai.amt_residue then false
+        else true end as "paymentFlag"
         FROM dkic_b.t_psi_inbound tpi
         <include refid="Join_Table"/>
         <include refid="Condition"/>
@@ -362,6 +365,7 @@
         Left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
         left join dkic_b.t_mst_customer tmc on tpi.cus_id = tmc.cus_id
         left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = tpi.into_reason
+        left join t_mac_account_item tmai on tmai.item_id = tpi.receivable_id
     </sql>
 
 
@@ -375,6 +379,9 @@
         ,tmp.sup_name as "supplierName"
         ,tmw.wh_name as "whName"
         ,tmd.data_value  as into_reason_name
+        ,case when tpi.receivable_id is null then false
+        when tmai.amt_should = tmai.amt_residue then false
+        else true end as "paymentFlag"
         FROM dkic_b.t_psi_inbound tpi
         Left join dkic_b.t_mst_org tmo on tmo.org_id = tpi.org_id
         Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = tpi.sup_id
@@ -382,6 +389,7 @@
         Left join dkic_b.t_mst_staff tms1 on tms1.staff_id = tpi.make_staff
         Left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
         left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = tpi.into_reason
+        left join t_mac_account_item tmai on tmai.item_id = tpi.receivable_id
         WHERE tpi.into_id = #{intoId}::uuid
     </select>
 

+ 3 - 0
src/main/java/com/dk/mdm/model/response/ivt/InboundResponse.java

@@ -402,6 +402,9 @@ public class InboundResponse  {
     @ApiModelProperty(value = "供应商")
     private String supName;
 
+    @ApiModelProperty(value = "是否付款")
+    private Boolean paymentFlag;
+
 
 
     private static final long serialVersionUID = 1L;