1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/StockSaleReceiptReportController.java

@@ -79,6 +79,15 @@ public class StockSaleReceiptReportController {
     public List<ContractManagementInfo> selectContractNoList(StockSaleReceiptReport stockSaleReceiptReport) {
         return stockSaleReceiptReportService.selectContractNoList(stockSaleReceiptReport);
     }
+    /**
+     * 合同详情
+     * @param contractId
+     * @return
+     */
+    @GetMapping("/selectContractDetail")
+    public ContractManagementInfo selectContractDetail(@RequestParam String contractId) {
+        return stockSaleReceiptReportService.selectContractDetail(contractId);
+    }
     /**
      * 批量开发票
      * @param stockSaleReceiptReport

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IStockSaleReceiptReportService.java

@@ -66,4 +66,6 @@ public interface IStockSaleReceiptReportService extends IService<StockSaleReceip
      * 统计
      */
     List<BiViewInfo> getMoney(List<BiViewInfo> biViewInfos, String seachMoth);
+
+    ContractManagementInfo selectContractDetail(String contractId);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockSaleReceiptReportServiceImpl.java

@@ -302,43 +302,10 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
                         .eq("comp_id", stockSaleReceiptReport1.getCompId())
                         .eq("contract_no", stockSaleReceiptReport1.getContractNo()));
                 if (contractManagementInfo != null) {
-                    ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
-                            .eq("contract_id", contractManagementInfo.getId()));
-                    contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
-                    List<TranTaskInfo> tranTaskInfoList = tranTaskInfoService.selectList(new EntityWrapper<TranTaskInfo>()
-                            .eq("comp_id", contractManagementInfo.getCompId())
-                            .eq("contract_no", contractManagementInfo.getContractNo()));
-                    if (!CollectionUtils.isEmpty(tranTaskInfoList)) {
-                        for (TranTaskInfo tranTaskInfo : tranTaskInfoList) {
-                            TranProcessInfo tranProcessInfo = tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
-                                    .eq("info_id", tranTaskInfo.getId())
-                                    .eq("end_flag", "1"));
-                            if (tranProcessInfo != null) {
-                                if ("船运".equals(tranProcessInfo.getTranType())) {
-                                    TranCarInfo tranCarInfo = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                                            .eq("process_id", tranProcessInfo.getId())
-                                            .eq("ship_type", "集装箱"));
-                                    if (tranCarInfo != null) {
-                                        tranProcessInfo.setTranType("箱船");
-                                        tranTaskInfo.setTranProcessInfo(tranProcessInfo);
-                                    }
-                                    TranCarInfo tranCarInfo1 = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                                            .eq("process_id", tranProcessInfo.getId())
-                                            .eq("ship_type", "散船"));
-                                    if (tranCarInfo1 != null) {
-                                        tranProcessInfo.setTranType("散船");
-                                        tranTaskInfo.setTranProcessInfo(tranProcessInfo);
-                                    }
-                                } else {
-                                    tranTaskInfo.setTranProcessInfo(tranProcessInfo);
-                                }
-                            }
-                        }
-                        contractManagementInfo.setTranTaskInfoList(tranTaskInfoList);
-                    }
+                    contractManagementInfoList.add(contractManagementInfo);
                     Double money = 0.0d;
                     List<StockSaleReceiptReport> stockSaleReceiptReportList1 = this.selectList(new EntityWrapper<StockSaleReceiptReport>()
-                            .eq("comp_id", stockSaleReceiptReport.getCompId())
+                            .eq("comp_id", contractManagementInfo.getCompId())
                             .eq("contract_no",stockSaleReceiptReport1.getContractNo())
                             .ge("create_date",startTime)
                             .le("create_date",endTime)
@@ -352,13 +319,51 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
                     } else {
                         contractManagementInfo.setReportStatus("已结算");
                     }
-                    contractManagementInfoList.add(contractManagementInfo);
                 }
             }
         }
         return contractManagementInfoList;
     }
 
+    @Override
+    public ContractManagementInfo selectContractDetail(String contractId) {
+        ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectById(contractId);
+        ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
+                .eq("contract_id", contractManagementInfo.getId()));
+        contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
+        List<TranTaskInfo> tranTaskInfoList = tranTaskInfoService.selectList(new EntityWrapper<TranTaskInfo>()
+                .eq("comp_id", contractManagementInfo.getCompId())
+                .eq("contract_no", contractManagementInfo.getContractNo()));
+        if (!CollectionUtils.isEmpty(tranTaskInfoList)) {
+            for (TranTaskInfo tranTaskInfo : tranTaskInfoList) {
+                TranProcessInfo tranProcessInfo = tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
+                        .eq("info_id", tranTaskInfo.getId())
+                        .eq("end_flag", "1"));
+                if (tranProcessInfo != null) {
+                    if ("船运".equals(tranProcessInfo.getTranType())) {
+                        TranCarInfo tranCarInfo = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                .eq("process_id", tranProcessInfo.getId())
+                                .eq("ship_type", "集装箱"));
+                        if (tranCarInfo != null) {
+                            tranProcessInfo.setTranType("箱船");
+                            tranTaskInfo.setTranProcessInfo(tranProcessInfo);
+                        }
+                        TranCarInfo tranCarInfo1 = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                .eq("process_id", tranProcessInfo.getId())
+                                .eq("ship_type", "散船"));
+                        if (tranCarInfo1 != null) {
+                            tranProcessInfo.setTranType("散船");
+                            tranTaskInfo.setTranProcessInfo(tranProcessInfo);
+                        }
+                    } else {
+                        tranTaskInfo.setTranProcessInfo(tranProcessInfo);
+                    }
+                }
+            }
+            contractManagementInfo.setTranTaskInfoList(tranTaskInfoList);
+        }
+       return contractManagementInfo;
+    }
     @Override
     public String openInvoiceList(StockSaleReceiptReport stockSaleReceiptReport) {
         List<StockSaleReceiptReport> stockSaleReceiptReportList = stockSaleReceiptReport.getStockSaleReceiptReportList();
@@ -437,4 +442,5 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
         return biViewInfos;
     }
 
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -728,6 +728,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                             } else if ("折干".equals(warehousingOrder2.getInType())) {
                                 warehousingOrder.setGoodsSource(warehousingOrder2.getGoodsSource());
                             }
+                            else{
+                                warehousingOrder.setGoodsSource(warehousingOrder2.getGoodsSource());
+                            }
                             this.insert(warehousingOrder);
                         }
                     }
@@ -811,6 +814,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                     }
                                 }
                             }
+                            else{
+                                warehousingOrder.setGoodsSource(warehousingOrder2.getGoodsSource());
+                            }
                             this.insert(warehousingOrder);
                         }
                     }