소스 검색

凯和商务端查询订单详情添加应收费用信息

lazhaoqian 4 년 전
부모
커밋
50a64f1337
1개의 변경된 파일8개의 추가작업 그리고 0개의 파일을 삭제
  1. 8 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

+ 8 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -2239,20 +2239,28 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         List<TWarehouseBills> warehouseBills = tWarehouseBillsMapper.webVersionOrderList(tWarehouseBills);
         List<TWarehouseBills> warehouseBills = tWarehouseBillsMapper.webVersionOrderList(tWarehouseBills);
         if (CollectionUtils.isNotEmpty(warehouseBills)) {
         if (CollectionUtils.isNotEmpty(warehouseBills)) {
             for (TWarehouseBills warehouseBill : warehouseBills) {
             for (TWarehouseBills warehouseBill : warehouseBills) {
+                //货物信息
                 TWarehousebillsCntr warehousebillsCntr = new TWarehousebillsCntr();
                 TWarehousebillsCntr warehousebillsCntr = new TWarehousebillsCntr();
                 warehousebillsCntr.setfPid(warehouseBill.getfId());
                 warehousebillsCntr.setfPid(warehouseBill.getfId());
                 List<TWarehousebillsCntr> tWarehousebillsCntrs = tWarehousebillsCntrMapper.selectTWarehousebillsCntrList(warehousebillsCntr);
                 List<TWarehousebillsCntr> tWarehousebillsCntrs = tWarehousebillsCntrMapper.selectTWarehousebillsCntrList(warehousebillsCntr);
                 if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {
                 if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {
                     warehouseBill.settWarehousebillsCntrList(tWarehousebillsCntrs);
                     warehouseBill.settWarehousebillsCntrList(tWarehousebillsCntrs);
                 }
                 }
+                //箱信息
                 TWarehousebillsCntritems warehousebillsCntritems = new TWarehousebillsCntritems();
                 TWarehousebillsCntritems warehousebillsCntritems = new TWarehousebillsCntritems();
                 warehousebillsCntritems.setfPid(warehouseBill.getfId());
                 warehousebillsCntritems.setfPid(warehouseBill.getfId());
                 List<TWarehousebillsCntritems> tWarehousebillsCntritems = tWarehousebillsCntritemsMapper.selectTWarehousebillsCntritemsList(warehousebillsCntritems);
                 List<TWarehousebillsCntritems> tWarehousebillsCntritems = tWarehousebillsCntritemsMapper.selectTWarehousebillsCntritemsList(warehousebillsCntritems);
                 if (CollectionUtils.isNotEmpty(tWarehousebillsCntritems)) {
                 if (CollectionUtils.isNotEmpty(tWarehousebillsCntritems)) {
                     warehouseBill.settWarehousebillsCntritemsList(tWarehousebillsCntritems);
                     warehouseBill.settWarehousebillsCntritemsList(tWarehousebillsCntritems);
                 }
                 }
+                //航线信息
                 TVoyage tVoyage = tVoyageMapper.selectTVoyageById(warehouseBill.getfVoyid());
                 TVoyage tVoyage = tVoyageMapper.selectTVoyageById(warehouseBill.getfVoyid());
                 warehouseBill.settVoyageL(tVoyage);
                 warehouseBill.settVoyageL(tVoyage);
+                //应收信息
+                List<TWarehousebillsfees> tWarehousebillsfeesDr = tWarehousebillsfeesMapper.selectFeesByPId(warehouseBill.getfId(), "D");
+                if (CollectionUtils.isNotEmpty(tWarehousebillsfeesDr)){
+                    warehouseBill.settWarehousebillsfeesDr(tWarehousebillsfeesDr);
+                }
             }
             }
         }
         }
         return warehouseBills;
         return warehouseBills;