1

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

@@ -230,11 +230,14 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
     @Override
     public List<ContractManagementInfo> selectContractNoList(StockPurchaseReceiptReport stockPurchaseReceiptReport) {
         List<ContractManagementInfo> contractManagementInfoList=new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String startTime = sdf.format(stockPurchaseReceiptReport.getStartDate())+" 00:00:00";
+        String endTime = sdf.format(stockPurchaseReceiptReport.getEndDate())+" 23:59:59";
         //查现货采购入库报表
         List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList = this.selectList(new EntityWrapper<StockPurchaseReceiptReport>()
                 .eq("comp_id", stockPurchaseReceiptReport.getCompId())
-                .ge("create_date",stockPurchaseReceiptReport.getStartDate())
-                .le("create_date",stockPurchaseReceiptReport.getEndDate())
+                .ge("create_date",startTime)
+                .le("create_date",endTime)
                 .groupBy("contract_no")
                 .eq("delete_flag", "0"));
         if (!CollectionUtils.isEmpty(stockPurchaseReceiptReportList)) {
@@ -250,8 +253,8 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                     List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList1 = this.selectList(new EntityWrapper<StockPurchaseReceiptReport>()
                             .eq("comp_id", stockPurchaseReceiptReport1.getCompId())
                             .eq("contract_no",contractManagementInfo.getContractNo())
-                            .ge("create_date",stockPurchaseReceiptReport.getStartDate())
-                            .le("create_date",stockPurchaseReceiptReport.getEndDate())
+                            .ge("create_date",startTime)
+                            .le("create_date",endTime)
                             .eq("delete_flag", "0"));
                     if (!CollectionUtils.isEmpty(stockPurchaseReceiptReportList1)){
                         money = (stockPurchaseReceiptReportList1.stream().mapToDouble(StockPurchaseReceiptReport::getAmountNotPayable).sum()) ;

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

@@ -288,73 +288,73 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String startTime = sdf.format(stockSaleReceiptReport.getStartDate())+" 00:00:00";
         String endTime = sdf.format(stockSaleReceiptReport.getEndDate())+" 23:59:59";
-            //查现货销售出库报表
-            List<StockSaleReceiptReport> stockSaleReceiptReportList = this.selectList(new EntityWrapper<StockSaleReceiptReport>()
-                    .eq("comp_id", stockSaleReceiptReport.getCompId())
-                    .ge("create_date",startTime)
-                    .le("create_date",endTime)
-                    .groupBy("contract_no")
-                    .eq("delete_flag", "0"));
-            if (!CollectionUtils.isEmpty(stockSaleReceiptReportList)) {
-                for (StockSaleReceiptReport stockSaleReceiptReport1 : stockSaleReceiptReportList) {
-                    ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                            .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 {
+        //查现货销售出库报表
+        List<StockSaleReceiptReport> stockSaleReceiptReportList = this.selectList(new EntityWrapper<StockSaleReceiptReport>()
+                .eq("comp_id", stockSaleReceiptReport.getCompId())
+                .ge("create_date",startTime)
+                .le("create_date",endTime)
+                .groupBy("contract_no")
+                .eq("delete_flag", "0"));
+        if (!CollectionUtils.isEmpty(stockSaleReceiptReportList)) {
+            for (StockSaleReceiptReport stockSaleReceiptReport1 : stockSaleReceiptReportList) {
+                ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .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);
-                        }
-                        Double money = 0.0d;
-                        List<StockSaleReceiptReport> stockSaleReceiptReportList1 = this.selectList(new EntityWrapper<StockSaleReceiptReport>()
-                                .eq("comp_id", stockSaleReceiptReport.getCompId())
-                                .eq("contract_no",stockSaleReceiptReport1.getContractNo())
-                                .ge("create_date",stockSaleReceiptReport.getStartDate())
-                                .le("create_date",stockSaleReceiptReport.getEndDate())
-                                .eq("delete_flag", "0"));
-                        if (!CollectionUtils.isEmpty(stockSaleReceiptReportList1)){
-                            money = (stockSaleReceiptReportList1.stream().mapToDouble(StockSaleReceiptReport::getAmountNotReceivable).sum()) ;
                         }
-                        //有未收金额
-                        if (money > 0) {
-                            contractManagementInfo.setReportStatus("待结算");
-                        } else {
-                            contractManagementInfo.setReportStatus("已结算");
-                        }
-                        contractManagementInfoList.add(contractManagementInfo);
+                        contractManagementInfo.setTranTaskInfoList(tranTaskInfoList);
+                    }
+                    Double money = 0.0d;
+                    List<StockSaleReceiptReport> stockSaleReceiptReportList1 = this.selectList(new EntityWrapper<StockSaleReceiptReport>()
+                            .eq("comp_id", stockSaleReceiptReport.getCompId())
+                            .eq("contract_no",stockSaleReceiptReport1.getContractNo())
+                            .ge("create_date",startTime)
+                            .le("create_date",endTime)
+                            .eq("delete_flag", "0"));
+                    if (!CollectionUtils.isEmpty(stockSaleReceiptReportList1)){
+                        money = (stockSaleReceiptReportList1.stream().mapToDouble(StockSaleReceiptReport::getAmountNotReceivable).sum()) ;
                     }
+                    //有未收金额
+                    if (money > 0) {
+                        contractManagementInfo.setReportStatus("待结算");
+                    } else {
+                        contractManagementInfo.setReportStatus("已结算");
+                    }
+                    contractManagementInfoList.add(contractManagementInfo);
                 }
             }
+        }
         return contractManagementInfoList;
     }
 

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

@@ -522,7 +522,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                     .eq("car_id", tranCarInfo.getId()));
                         if (tranSettlementReport1!=null) {
                             //已卸车过的不重复更新
-                            if (tranSettlementReport1.getUnloadingWeight()==null) {
+                            if (tranSettlementReport1.getUnloadingWeight()==null||tranSettlementReport1.getUnloadingWeight()==0) {
                                 if (tranCarInfo.getUnloadNetWeight() > 0 && tranProcessInfo.getFlag() != null) {
                                     tranSettlementReport1.setLoadingImg(tranCarInfo.getLoadPoundImg());
                                     tranSettlementReport1.setUnloadingWeight(tranCarInfo.getUnloadNetWeight());