于继渤 1 год назад
Родитель
Сommit
caec448a9e

+ 4 - 1
src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.xml

@@ -325,13 +325,16 @@
                makestaff.staff_name as "makeStaffName",
                t.make_time,
                t.flg_valid,
-               t.cp_id
+               t.cp_id,
+               tma.receivable_residue,
+               tma.receipt_residue
         from dkic_b.t_mac_rec_pay as t
                  left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.object_id
                  left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
                  left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
                  left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
                  left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
+                 LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id =  t.object_id
         where   t.rp_id = #{id}::uuid
     </select>
 

+ 8 - 8
src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -284,10 +284,10 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 for (InboundItemVO inboundItemVO : itemList) {
 
                     //region  不能新建
-                    if (inboundItemVO.getSPurItemId() == null) {
-                        throw new BaseBusinessException(ErrorCodeEnum.ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE.getCode(),
-                                ErrorCodeEnum.ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE.getMessage());
-                    }
+//                    if (inboundItemVO.getSPurItemId() == null) {
+//                        throw new BaseBusinessException(ErrorCodeEnum.ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE.getCode(),
+//                                ErrorCodeEnum.ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE.getMessage());
+//                    }
                     //endregion
 
                     //根据id查询
@@ -409,10 +409,10 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 List<InboundItemVO> itemList = inboundVO.getItemList();
                 for (InboundItemVO inboundItemVO : itemList) {
                     //region  不能新建
-                    if (inboundItemVO.getSPurItemId() == null) {
-                        throw new BaseBusinessException(ErrorCodeEnum.ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE.getCode(),
-                                ErrorCodeEnum.ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE.getMessage());
-                    }
+//                    if (inboundItemVO.getSPurItemId() == null) {
+//                        throw new BaseBusinessException(ErrorCodeEnum.ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE.getCode(),
+//                                ErrorCodeEnum.ITEMS_THAT_ARE_NOT_AVAILABLE_HANDLE.getMessage());
+//                    }
                     //endregion
 
                     //region 编辑明细