Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -161,6 +161,26 @@ public class BiInfoController {
         // 在途
         getTranProess(biViewInfos, seachMoth);
 
+        // 销售合同   执行中的合同
+        EntityWrapper<ContractManagementInfo> contractManagementInfoEntityWrapper = new EntityWrapper<ContractManagementInfo>();
+        contractManagementInfoEntityWrapper.eq("status_flag", "1");
+        contractManagementInfoEntityWrapper.eq("comp_id", compId);
+        if (seachMoth != null) {
+            if (!seachMoth.contains("-")) {
+                contractManagementInfoEntityWrapper.and("YEAR(create_date)='" + seachMoth + "'");
+            } else {
+                contractManagementInfoEntityWrapper.like("create_date", seachMoth + "%");
+            }
+        }
+
+        List<ContractManagementInfo> contractManagementInfos = contractManagementInfoService.selectList(contractManagementInfoEntityWrapper);
+        // 执行中的所有合同-已完成量、待完成量   2  执行中的合同额  -已开票、待开票 3 已付款 未付款
+        getCompletedAndNotQuantity(contractManagementInfos, biViewInfos);
+        // 采购
+        getBuyInfo(contractManagementInfos, biViewInfos);
+        // 收入支出毛利润
+        getMoney(biViewInfos, seachMoth);
+
         cacheComponent.putRaw(Const.ADMIN_BI_INFO, JSONObject.toJSONString(biViewInfos), 60 * 20);
         return biViewInfos;
     }
@@ -675,11 +695,11 @@ public class BiInfoController {
         BiViewInfo biViewInfo1 = new BiViewInfo();
         biViewInfo1.setName("已完成量");
         biViewInfo1.setCount(String.valueOf(completedQuantity));
-        biViewInfo1.setPercentage(completedQuantity / sumTotal * 100 + "%");
+        biViewInfo1.setPercentage(completedQuantity / sumTotal * 100 + "");
         BiViewInfo biViewInfo2 = new BiViewInfo();
         biViewInfo2.setName("待完成量");
         biViewInfo2.setCount(String.valueOf(sumTotal - completedQuantity));
-        biViewInfo2.setPercentage((sumTotal - completedQuantity) / sumTotal * 100 + "%");
+        biViewInfo2.setPercentage((sumTotal - completedQuantity) / sumTotal * 100 + "");
         biViewInfos1.add(biViewInfo1);
         biViewInfos1.add(biViewInfo2);
         biViewInfo.setBiViewInfoList(biViewInfos1);
@@ -695,12 +715,12 @@ public class BiInfoController {
         biViewInfoa1.setName("已开票");
         BigDecimal bg12 = new BigDecimal(invoicingTotal);
         biViewInfoa1.setCount(String.valueOf(bg12));
-        biViewInfoa1.setPercentage(invoicingTotal != 0 ? invoicingTotal / moneyTotal * 100 + "%" : 0 + "%");
+        biViewInfoa1.setPercentage(invoicingTotal != 0 ? invoicingTotal / moneyTotal * 100 + "" : 0 + "");
         BiViewInfo biViewInfoa2 = new BiViewInfo();
         biViewInfoa2.setName("待开票");
         BigDecimal bg00 = new BigDecimal(moneyTotal - (invoicingTotal != null ? invoicingTotal : 0));
         biViewInfoa2.setCount(String.valueOf(bg00));
-        biViewInfoa2.setPercentage((moneyTotal - (invoicingTotal != null ? invoicingTotal : 0)) / moneyTotal * 100 + "%");
+        biViewInfoa2.setPercentage((moneyTotal - (invoicingTotal != null ? invoicingTotal : 0)) / moneyTotal * 100 + "");
         biViewInfosa1.add(biViewInfoa1);
         biViewInfosa1.add(biViewInfoa2);
         biViewInfoa.setBiViewInfoList(biViewInfosa1);
@@ -716,12 +736,12 @@ public class BiInfoController {
         biViewInfob1.setName("已付款");
         BigDecimal bg45 = new BigDecimal(payTotal);
         biViewInfob1.setCount(String.valueOf(bg45));
-        biViewInfob1.setPercentage(payTotal != 0 ? payTotal / moneyTotal * 100 + "%" : 0 + "%");
+        biViewInfob1.setPercentage(payTotal != 0 ? payTotal / moneyTotal * 100 + "" : 0 + "");
         BiViewInfo biViewInfob2 = new BiViewInfo();
         biViewInfob2.setName("待付款");
         BigDecimal bg4 = new BigDecimal(moneyTotal - (payTotal != null ? payTotal : 0));
         biViewInfob2.setCount(String.valueOf(bg4));
-        biViewInfob2.setPercentage((moneyTotal - (payTotal != null ? payTotal : 0)) / moneyTotal * 100 + "%");
+        biViewInfob2.setPercentage((moneyTotal - (payTotal != null ? payTotal : 0)) / moneyTotal * 100 + "");
         biViewInfosb1.add(biViewInfob1);
         biViewInfosb1.add(biViewInfob2);
         biViewInfob.setBiViewInfoList(biViewInfosb1);
@@ -797,11 +817,11 @@ public class BiInfoController {
         BiViewInfo biViewInfo1 = new BiViewInfo();
         biViewInfo1.setName("已完成量");
         biViewInfo1.setCount(String.valueOf(completedQuantity));
-        biViewInfo1.setPercentage(completedQuantity / sumTotal * 100 + "%");
+        biViewInfo1.setPercentage(completedQuantity / sumTotal * 100 + "");
         BiViewInfo biViewInfo2 = new BiViewInfo();
         biViewInfo2.setName("待完成量");
         biViewInfo2.setCount(String.valueOf(sumTotal - completedQuantity));
-        biViewInfo2.setPercentage((sumTotal - completedQuantity) / sumTotal * 100 + "%");
+        biViewInfo2.setPercentage((sumTotal - completedQuantity) / sumTotal * 100 + "");
         biViewInfos1.add(biViewInfo1);
         biViewInfos1.add(biViewInfo2);
         biViewInfo.setBiViewInfoList(biViewInfos1);
@@ -817,12 +837,12 @@ public class BiInfoController {
         biViewInfoa1.setName("已开票");
         BigDecimal bg45 = new BigDecimal(invoicingTotal);
         biViewInfoa1.setCount(String.valueOf(bg45));
-        biViewInfoa1.setPercentage(invoicingTotal != 0 ? invoicingTotal / moneyTotal * 100 + "%" : 0 + "%");
+        biViewInfoa1.setPercentage(invoicingTotal != 0 ? invoicingTotal / moneyTotal * 100 + "" : 0 + "");
         BiViewInfo biViewInfoa2 = new BiViewInfo();
         biViewInfoa2.setName("待开票");
         BigDecimal bg4 = new BigDecimal(moneyTotal - (invoicingTotal != null ? invoicingTotal : 0));
         biViewInfoa2.setCount(String.valueOf(bg4));
-        biViewInfoa2.setPercentage((moneyTotal - (invoicingTotal != null ? invoicingTotal : 0)) / moneyTotal * 100 + "%");
+        biViewInfoa2.setPercentage((moneyTotal - (invoicingTotal != null ? invoicingTotal : 0)) / moneyTotal * 100 + "");
         biViewInfosa1.add(biViewInfoa1);
         biViewInfosa1.add(biViewInfoa2);
         biViewInfoa.setBiViewInfoList(biViewInfosa1);
@@ -838,12 +858,12 @@ public class BiInfoController {
         biViewInfob1.setName("已付款");
         BigDecimal bg9 = new BigDecimal(payTotal);
         biViewInfob1.setCount(String.valueOf(bg9));
-        biViewInfob1.setPercentage(payTotal != 0 ? payTotal / moneyTotal * 100 + "%" : 0 + "%");
+        biViewInfob1.setPercentage(payTotal != 0 ? payTotal / moneyTotal * 100 + "" : 0 + "");
         BiViewInfo biViewInfob2 = new BiViewInfo();
         biViewInfob2.setName("待付款");
         BigDecimal bg6 = new BigDecimal(moneyTotal - (payTotal != null ? payTotal : 0));
         biViewInfob2.setCount(String.valueOf(bg6));
-        biViewInfob2.setPercentage((moneyTotal - (payTotal != null ? payTotal : 0)) / moneyTotal * 100 + "%");
+        biViewInfob2.setPercentage((moneyTotal - (payTotal != null ? payTotal : 0)) / moneyTotal * 100 + "");
         biViewInfosb1.add(biViewInfob1);
         biViewInfosb1.add(biViewInfob2);
         biViewInfob.setBiViewInfoList(biViewInfosb1);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -477,6 +477,11 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     @TableField(exist = false)
     private List<TranCarInfo> shipInfoList;
+    /**
+     * 火运流向列表
+     */
+    @TableField(exist = false)
+    private List<TranCarInfo> fireDirectionList;
     /**
      * 车队列表
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ExpenseInfo.java

@@ -73,6 +73,10 @@ public class ExpenseInfo extends BaseModel<ExpenseInfo> {
      * 付款方名头
      */
     private String payerHeader;
+    /**
+     * 所属名头
+     */
+    private String belongName;
     /**
      * 费用金额
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranSettlementReport.java

@@ -108,13 +108,29 @@ public class TranSettlementReport extends BaseModel<TranSettlementReport> {
      */
     private String unloadingImg;
     /**
-     * 损耗(吨)
+     * 公司承担运损
+     */
+    private Double transportDamage;
+    /**
+     * 吨差(吨)
      */
     private Float lossWeight;
     /**
-     * 运输单价（元/吨）
+     * 实际损耗
+     */
+    private Double actualLoss;
+    /**
+     * 货损
+     */
+    private Double cargoDamage;
+    /**
+     * 预计单价（元/吨）
      */
     private Float transportPrice;
+    /**
+     * 结算单价（元/吨）
+     */
+    private Double settlementPrice;
     /**
      * 结算重量(吨)
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseInOutInfo.java

@@ -216,6 +216,10 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      * 船名
      */
     private String shipName;
+    /**
+     * 火运流向
+     */
+    private String fireDirection;
     /**
      * 是否发车(1已发车)
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeighingManagement.java

@@ -506,6 +506,11 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     @TableField(exist = false)
     private String shipName;
+    /**
+     * 火运流向
+     */
+    @TableField(exist = false)
+    private String fireDirection;
 
     @Override
     protected Serializable pkVal() {

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

@@ -341,6 +341,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                 tranSettlementReport.setLoadingWeight(tranCarInfo.getLoadNetWeight());
                                 tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
                                 tranSettlementReport.setTransportPrice(Float.valueOf(tranCarInfo.getTranPrice()));
+                                tranSettlementReport.setSettlementPrice(Double.valueOf(tranCarInfo.getTranPrice()));
                                 tranSettlementReport.setBatchId(batchReviewInfo.getId());
                                 tranSettlementReportService.insert(tranSettlementReport);
                                 flagBatch = "1";
@@ -430,6 +431,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                 tranSettlementReport.setLoadingWeight(tranCarInfo.getLoadNetWeight());
                                 tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
                                 tranSettlementReport.setTransportPrice(tranProcessInfo.getTranPrice());
+                                tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(tranProcessInfo.getTranPrice())));
                                 tranSettlementReport.setBatchId(batchReviewInfo.getId());
                                 tranSettlementReportService.insert(tranSettlementReport);
                                 flagBatch = "1";
@@ -514,6 +516,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             tranSettlementReport.setLoadingWeight(tranCarInfo.getLoadNetWeight());
                             tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
                             tranSettlementReport.setTransportPrice(Float.valueOf(tranCarInfo.getTranPrice()));
+                            tranSettlementReport.setSettlementPrice(Double.valueOf(tranCarInfo.getTranPrice()));
                             tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
                             tranSettlementReport.setUnloadingWeight(tranCarInfo.getUnloadNetWeight());
                             tranSettlementReport.setUnloadingImg(tranCarInfo.getUnloadPoundImg());

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

@@ -992,6 +992,14 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 if (!CollectionUtils.isEmpty(shipInfoList)) {
                     contractManagementInfo.setShipInfoList(shipInfoList);
                 }
+                //查火运流向
+                List<TranCarInfo> fireList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no", contractManagementInfo.getContractNo())
+                        .eq("tran_type", "2")
+                        .eq("delete_flag", "0"));
+                if (!CollectionUtils.isEmpty(fireList)) {
+                    contractManagementInfo.setFireDirectionList(fireList);
+                }
                 contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
@@ -1036,6 +1044,14 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 if (!CollectionUtils.isEmpty(shipInfoList)) {
                     contractManagementInfo.setShipInfoList(shipInfoList);
                 }
+                //查火运流向
+                List<TranCarInfo> fireList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no", inOutWarehouseTask.getMoveTaskNo())
+                        .eq("tran_type", "2")
+                        .eq("delete_flag", "0"));
+                if (!CollectionUtils.isEmpty(fireList)) {
+                    contractManagementInfo.setFireDirectionList(fireList);
+                }
                 //移库看成自运
                 contractManagementInfo.setDeliverType("1");
                 contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
@@ -1199,6 +1215,14 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 if (!CollectionUtils.isEmpty(shipInfoList)) {
                     contractManagementInfo.setShipInfoList(shipInfoList);
                 }
+                //查火运流向
+                List<TranCarInfo> fireList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no", contractManagementInfo.getContractNo())
+                        .eq("tran_type", "2")
+                        .eq("delete_flag", "0"));
+                if (!CollectionUtils.isEmpty(fireList)) {
+                    contractManagementInfo.setFireDirectionList(fireList);
+                }
                 contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
@@ -1242,6 +1266,14 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 if (!CollectionUtils.isEmpty(shipInfoList)) {
                     contractManagementInfo1.setShipInfoList(shipInfoList);
                 }
+                //查火运流向
+                List<TranCarInfo> fireList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no", contractManagementInfo1.getContractNo())
+                        .eq("tran_type", "2")
+                        .eq("delete_flag", "0"));
+                if (!CollectionUtils.isEmpty(fireList)) {
+                    contractManagementInfo1.setFireDirectionList(fireList);
+                }
                 contractManagementInfo1.setGoodsName(contractGoodsInfo.getGoodsName());
                 contractManagementInfo1.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 contractManagementInfo1.setGrade(contractGoodsInfo.getGrade());
@@ -1281,6 +1313,14 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 if (!CollectionUtils.isEmpty(shipInfoList)) {
                     contractManagementInfo1.setShipInfoList(shipInfoList);
                 }
+                //查火运流向
+                List<TranCarInfo> fireList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no", inOutWarehouseTask.getMoveTaskNo())
+                        .eq("tran_type", "2")
+                        .eq("delete_flag", "0"));
+                if (!CollectionUtils.isEmpty(fireList)) {
+                    contractManagementInfo1.setFireDirectionList(fireList);
+                }
                 contractManagementInfo1.setContractNo(inOutWarehouseTask.getMoveTaskNo());
                 ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                 .eq("contract_no",inOutWarehouseTask.getWarehouseName())

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

@@ -1349,7 +1349,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         stockSaleReceiptReport.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                     } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
                                         tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
-                                        tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+//                                        tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                        tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                        tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                        tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                        tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                         tranCarInfo.setThreeTranType("火运");
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                                         stockSaleReceiptReport.setBoxNo(warehouseInOutInfo.getWingNumber());
@@ -1365,6 +1369,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
                                         tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
                                         tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                        tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                        tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                         tranCarInfo.setThreeTranType("集装箱船");
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                                         stockSaleReceiptReport.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
@@ -1433,7 +1439,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         stockSaleReceiptReport.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                     } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                                        stockSaleReceiptReport.setBoxNo(warehouseInOutInfo.getWingNumber());
+//                                        stockSaleReceiptReport.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                        stockSaleReceiptReport.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                        stockSaleReceiptReport.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                        stockSaleReceiptReport.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                        stockSaleReceiptReport.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                     } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                                         stockSaleReceiptReport.setShipName(warehouseInOutInfo.getShipName());
@@ -1486,6 +1496,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setTranTypeKey("1");
                                     } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
                                         tranSettlementReport.setTranType("火运");
+                                        TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                                .eq("tran_type","2")
+                                                .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                                .eq("box_no",warehouseInOutInfo.getFireDirection()));
+                                        if (tranCarInfo!=null){
+                                            TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                            if (tranTaskInfo1!=null){
+                                                tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                            }
+                                        }
                                         tranSettlementReport.setTranTypeKey("2");
                                     } else {
                                         tranSettlementReport.setTranType("船运");
@@ -1524,7 +1544,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                                         //未付
                                         tranSettlementReport.setAmountNotPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
-                                        tranSettlementReport.setTransportPrice(Float.valueOf(tranProcessInfo.getTranPrice()));
+                                        tranSettlementReport.setTransportPrice(tranProcessInfo.getTranPrice());
+                                        tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(tranProcessInfo.getTranPrice())));
                                     }
                                     tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                                     tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -1671,6 +1692,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranSettlementReport.setTranTypeKey("1");
                             } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
                                 tranSettlementReport.setTranType("火运");
+                                TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                        .eq("tran_type","2")
+                                        .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                        .eq("box_no",warehouseInOutInfo.getFireDirection()));
+                                if (tranCarInfo!=null){
+                                    TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                    if (tranTaskInfo1!=null){
+                                        tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                    }
+                                }
                                 tranSettlementReport.setTranTypeKey("2");
                             } else {
                                 tranSettlementReport.setTranType("船运");
@@ -1709,7 +1740,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranSettlementReport.setAmountIngPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
                                 //未付
                                 tranSettlementReport.setAmountNotPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
-                                tranSettlementReport.setTransportPrice(Float.valueOf(warehouseInOutInfo.getFreight()));
+                                tranSettlementReport.setTransportPrice(warehouseInOutInfo.getFreight());
+                                tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getFreight())));
                             }
                             tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                             tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -2196,11 +2228,22 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         tranSettlementReport.setCompId(warehouseBaseInfo.getCompId());
                         tranSettlementReport.setCarId(warehouseInOutInfo.getCarId());
                         tranSettlementReport.setId(IdGenerator.generateUUID());
+                        tranSettlementReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
                         if ("汽运".equals(warehouseInOutInfo.getOutType())) {
                             tranSettlementReport.setTranType("汽运");
                             tranSettlementReport.setTranTypeKey("1");
                         } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
                             tranSettlementReport.setTranType("火运");
+                            TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                    .eq("tran_type","2")
+                                    .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                    .eq("box_no",warehouseInOutInfo.getFireDirection()));
+                            if (tranCarInfo!=null){
+                                TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                if (tranTaskInfo1!=null){
+                                    tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                }
+                            }
                             tranSettlementReport.setTranTypeKey("2");
                         } else {
                             tranSettlementReport.setTranType("船运");
@@ -2239,7 +2282,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranSettlementReport.setAmountIngPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
                             //未付
                             tranSettlementReport.setAmountNotPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
-                            tranSettlementReport.setTransportPrice(Float.valueOf(warehouseInOutInfo.getFreight()));
+                            tranSettlementReport.setTransportPrice(warehouseInOutInfo.getFreight());
+                            tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getFreight())));
                         }
                         tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                         tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -3590,6 +3634,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                                 } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
                                                     tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
                                                     tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                                    tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                                    tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                                 }
                                                 warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                                 warehouseInOutInfo.setTranCarNo(tranCarNo);
@@ -3616,7 +3662,88 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                                 tranSettlementReport.setAmountIngPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                                 //未付
                                                 tranSettlementReport.setAmountNotPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
-                                                tranSettlementReport.setTransportPrice(Float.valueOf(tranProcessInfo.getTranPrice()));
+                                                tranSettlementReport.setTransportPrice(tranProcessInfo.getTranPrice());
+                                                tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(tranProcessInfo.getTranPrice())));
+                                            }
+                                            tranSettlementReport.setUnloadingImg(warehouseInOutInfo.getAddressUrl());
+                                            tranSettlementReport.setUnloadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                            tranSettlementReport.setStatusFlag(StatusEnum.PENDING_PAY.getFlag());
+                                            tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
+                                            tranSettlementReportService.insert(tranSettlementReport);
+                                        }
+                                    }
+                                    else {
+                                        throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
+                                    }
+                                }
+                            }
+                            //火运移库入库生成汽运报表
+                            else if ("火运".equals(warehouseInOutInfo.getOutType())) {
+                                TranCarInfo tranCarInfo1=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                        .eq("tran_type","2")
+                                        .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                        .eq("box_no",warehouseInOutInfo.getFireDirection()));
+                                if (tranCarInfo1!=null){
+                                    TranTaskInfo tranTaskInfo=tranTaskInfoService.selectById(tranCarInfo1.getInfoId());
+                                    if (tranTaskInfo!=null){
+                                        TranProcessInfo tranProcessInfo = tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
+                                                .eq("info_id", tranTaskInfo.getId()));
+                                        if (tranProcessInfo != null) {
+                                            //自运出库时手动加的车
+                                            if ("1".equals(warehouseInOutInfo.getSelfLoading()) || warehouseInOutInfo.getCarId() == null) {
+                                                List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                                                        .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1"));
+                                                TranCarInfo tranCarInfo = new TranCarInfo();
+                                                tranCarInfo.setProcessId(tranProcessInfo.getId());
+                                                tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
+                                                tranCarInfo.setInfoId(tranTaskInfo.getId());
+                                                tranCarInfo.setCompId(warehouseBaseInfo.getCompId());
+                                                tranCarInfo.setTranType("1");
+                                                tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
+                                                String tranCarNo = "";
+                                                if ((tranCarInfoList.size() + 1) < 10) {
+                                                    tranCarNo = "C00" + (tranCarInfoList.size() + 1);
+                                                } else if (tranCarInfoList.size() + 1 < 100) {
+                                                    tranCarNo = "C0" + (tranCarInfoList.size() + 1);
+                                                } else {
+                                                    tranCarNo = "C" + (tranCarInfoList.size() + 1);
+                                                }
+                                                tranCarInfo.setTranCarNo(tranCarNo);
+                                                tranCarInfo.setId(IdGenerator.generateUUID());
+                                                tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
+                                                tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                                                tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+                                                tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                                tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                                tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                                tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                                                warehouseInOutInfo.setCarId(tranCarInfo.getId());
+                                                warehouseInOutInfo.setTranCarNo(tranCarNo);
+                                                warehouseInOutInfoService.updateById(warehouseInOutInfo);
+                                                tranCarInfoService.insert(tranCarInfo);
+                                            }
+                                            //生成火运报表
+                                            TranSettlementReport tranSettlementReport = new TranSettlementReport();
+                                            tranSettlementReport.setCompId(warehouseBaseInfo.getCompId());
+                                            tranSettlementReport.setCarId(warehouseInOutInfo.getCarId());
+                                            tranSettlementReport.setId(IdGenerator.generateUUID());
+                                            tranSettlementReport.setTranType("火运");
+                                            tranSettlementReport.setTranTypeKey("2");
+                                            tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
+                                            tranSettlementReport.setTaskNo(tranTaskInfo.getTaskNo());
+                                            tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
+                                            tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
+                                            tranSettlementReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
+                                            tranSettlementReport.setStartAddress(inOutWarehouseTask.getWarehouseName());
+                                            tranSettlementReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                            //运输单价不为空
+                                            if (tranProcessInfo.getTranPrice() != null) {
+                                                //应付
+                                                tranSettlementReport.setAmountIngPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                                //未付
+                                                tranSettlementReport.setAmountNotPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                                tranSettlementReport.setTransportPrice(tranProcessInfo.getTranPrice());
+                                                tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(tranProcessInfo.getTranPrice())));
                                             }
                                             tranSettlementReport.setUnloadingImg(warehouseInOutInfo.getAddressUrl());
                                             tranSettlementReport.setUnloadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -4124,7 +4251,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         stockSaleReceiptReport.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                     } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
                                         tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
-                                        tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+//                                        tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                        tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                        tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                        tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                        tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                         tranCarInfo.setThreeTranType("火运");
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                                         stockSaleReceiptReport.setBoxNo(warehouseInOutInfo.getWingNumber());
@@ -4140,6 +4271,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
                                         tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
                                         tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                        tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                        tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                         tranCarInfo.setThreeTranType("集装箱船");
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                                         stockSaleReceiptReport.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
@@ -4208,7 +4341,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         stockSaleReceiptReport.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                     } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                                        stockSaleReceiptReport.setBoxNo(warehouseInOutInfo.getWingNumber());
+//                                        stockSaleReceiptReport.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                        stockSaleReceiptReport.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                        stockSaleReceiptReport.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                        stockSaleReceiptReport.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                        stockSaleReceiptReport.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                     } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                                         stockSaleReceiptReport.setShipName(warehouseInOutInfo.getShipName());
@@ -4251,13 +4388,19 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                             tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
                                             tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                         } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
-                                            tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+//                                            tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                            tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                            tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                            tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                            tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                         } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
                                             tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
                                             tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
                                         } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
                                             tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
                                             tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                            tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                            tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                         }
                                         warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                         warehouseInOutInfo.setTranCarNo(tranCarNo);
@@ -4275,6 +4418,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setTranTypeKey("1");
                                     } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
                                         tranSettlementReport.setTranType("火运");
+                                        TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                                .eq("tran_type","2")
+                                                .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                                .eq("box_no",warehouseInOutInfo.getFireDirection()));
+                                        if (tranCarInfo!=null){
+                                            TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                            if (tranTaskInfo1!=null){
+                                                tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                            }
+                                        }
                                         tranSettlementReport.setTranTypeKey("2");
                                     } else {
                                         tranSettlementReport.setTranType("船运");
@@ -4315,7 +4468,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setAmountIngPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                         //未付
                                         tranSettlementReport.setAmountNotPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
-                                        tranSettlementReport.setTransportPrice(Float.valueOf(tranProcessInfo.getTranPrice()));
+                                        tranSettlementReport.setTransportPrice(tranProcessInfo.getTranPrice());
+                                        tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(tranProcessInfo.getTranPrice())));
                                     }
                                     tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                                     tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -4453,13 +4607,19 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
                                     tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                 } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
-                                    tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+//                                    tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                    tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                    tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                    tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                    tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                 } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
                                     tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
                                     tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
                                 } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
                                     tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
                                     tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                    tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                    tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                 }
                                 warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                 warehouseInOutInfo.setTranCarNo(tranCarNo);
@@ -4470,12 +4630,23 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             TranSettlementReport tranSettlementReport = new TranSettlementReport();
                             tranSettlementReport.setCompId(warehouseBaseInfo.getCompId());
                             tranSettlementReport.setCarId(warehouseInOutInfo.getCarId());
+                            tranSettlementReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
                             tranSettlementReport.setId(IdGenerator.generateUUID());
                             if ("汽运".equals(warehouseInOutInfo.getOutType())) {
                                 tranSettlementReport.setTranType("汽运");
                                 tranSettlementReport.setTranTypeKey("1");
                             } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
                                 tranSettlementReport.setTranType("火运");
+                                TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                        .eq("tran_type","2")
+                                        .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                        .eq("box_no",warehouseInOutInfo.getFireDirection()));
+                                if (tranCarInfo!=null){
+                                    TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                    if (tranTaskInfo1!=null){
+                                        tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                    }
+                                }
                                 tranSettlementReport.setTranTypeKey("2");
                             } else {
                                 tranSettlementReport.setTranType("船运");
@@ -4515,7 +4686,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranSettlementReport.setAmountIngPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
                                 //未付
                                 tranSettlementReport.setAmountNotPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
-                                tranSettlementReport.setTransportPrice(Float.valueOf(warehouseInOutInfo.getFreight()));
+                                tranSettlementReport.setTransportPrice(warehouseInOutInfo.getFreight());
+                                tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getFreight())));
                             }
                             tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                             tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -5050,13 +5222,19 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
                                 tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                             } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
-                                tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+//                                tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                             } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
                                 tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
                                 tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
                             } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
                                 tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
                                 tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                             }
                             warehouseInOutInfo.setSelfLoading("1");
                             warehouseInOutInfo.setCarId(tranCarInfo.getId());
@@ -5074,6 +5252,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranSettlementReport.setTranTypeKey("1");
                         } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
                             tranSettlementReport.setTranType("火运");
+                            TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                    .eq("tran_type","2")
+                                    .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                    .eq("box_no",warehouseInOutInfo.getFireDirection()));
+                            if (tranCarInfo!=null){
+                                TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                if (tranTaskInfo1!=null){
+                                    tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                }
+                            }
                             tranSettlementReport.setTranTypeKey("2");
                         } else {
                             tranSettlementReport.setTranType("船运");
@@ -5114,7 +5302,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranSettlementReport.setAmountIngPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
                             //未付
                             tranSettlementReport.setAmountNotPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
-                            tranSettlementReport.setTransportPrice(Float.valueOf(warehouseInOutInfo.getFreight()));
+                            tranSettlementReport.setTransportPrice(warehouseInOutInfo.getFreight());
+                            tranSettlementReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getFreight())));
                         }
                         tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
                         tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));

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

@@ -1645,6 +1645,32 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             //请款累计和
             requestFundsTotal = requestFundsTotal + warehousingOrder1.getRequestFunds();
             inWarehouseWeightTotal = inWarehouseWeightTotal + warehousingOrder1.getInWarehouseWeight();
+            //查询详细数据
+            Map<String, Object> pageView1 = new HashMap<>();
+            //  关联ID
+            pageView1.put("batchId", warehousingOrder1.getBatchId());
+            // 查询付款数据
+            List<PaymentManagement> dataList1 = baseMapper.getListByConditionOut(pageView1);
+            if (!CollectionUtils.isEmpty(dataList1)) {
+                for (int j = 0; j < dataList1.size(); j++) {
+                    warehousingOrder1.setNetWeight(dataList1.get(j).getNetWeight() / 1000);
+                    warehousingOrder1.setGrossWeight(dataList1.get(j).getGrossWeight() / 1000);
+                    warehousingOrder1.setTare(dataList1.get(j).getTare() / 1000);
+                    warehousingOrder1.setGrade(dataList1.get(j).getGrade());
+                    warehousingOrder1.setBulkDensity(dataList1.get(j).getBulkDensity());
+                    warehousingOrder1.setMildewGrain(dataList1.get(j).getMildewGrain());
+                    warehousingOrder1.setImpurity(dataList1.get(j).getImpurity());
+                    warehousingOrder1.setImperfectGrain(dataList1.get(j).getImperfectGrain());
+                    warehousingOrder1.setJiaorenli(dataList1.get(j).getJiaorenli());
+                    warehousingOrder1.setWaterContent(dataList1.get(j).getWaterContent());
+                    if ("潮粮".contains(dataList1.get(j).getGoodsName())) {
+                        //单价=（潮粮单价-扣单价）*1000
+                        warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
+                    } else {
+                        warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
+                    }
+                }
+            }
         }
 
         // 返回数据

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

@@ -478,6 +478,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     weighingManagement.setSelfLoading(warehouseInOutInfo.getSelfLoading());
                     weighingManagement.setShipName(warehouseInOutInfo.getShipName());
                     weighingManagement.setShipNumber(warehouseInOutInfo.getShipNumber());
+                    weighingManagement.setFireDirection(warehouseInOutInfo.getFireDirection());
                 }
             }
             CommonCompany commonCompany=commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranSettlementReportMapper.xml

@@ -84,9 +84,13 @@
         loading_img as loadingImg,
         unloading_img as unloadingImg,
         start_address as startAddress,
+        transport_damage as transportDamage,
         loss_weight as lossWeight,
+        actual_loss as actualLoss,
+        cargo_damage as cargoDamage,
         manual_flag as ManualFlag,
         transport_price as transportPrice,
+        settlement_price as settlementPrice,
         settlement_weight as settlementWeight,
         deduction_amount as deductionAmount,
         amount_ing_payable as amountIngPayable,