派车表结算价

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

@@ -350,6 +350,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             .eq("contract_no", warehouseInOutInfo.getContractNo())
                             .eq("car_no", warehouseInOutInfo.getCarNo())
                             .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+                    // 采购订单
+                    PurchaseOrder purchaseOrder = purchaseOrderService.selectOne(new EntityWrapper<PurchaseOrder>().eq("contract_no", warehouseInOutInfo.getContractNo())
+                            .eq("delete_flag", "0"));
                     if (tranCarInfo != null) {
                         //将到货数据同步到派车表
                         tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
@@ -358,6 +361,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         tranCarInfo.setDeductionItems(warehouseInOutInfo.getDeductionItems());
                         tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
                         tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                        if (purchaseOrder!=null) {
+                            tranCarInfo.setSettlementPrice(purchaseOrder.getUnitPrice() - purchaseOrder.getBasis() - purchaseOrder.getUnloadingCharge() - purchaseOrder.getInvoiceFee() - Float.valueOf(warehouseInOutInfo.getDeductionAmount()));
+                        }
                         tranCarInfoService.updateById(tranCarInfo);
                     }
                     //判断是否第一次提交
@@ -369,10 +375,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     }
                     // 采购入库统计
                     PurchaseReceiptReport purchaseReceiptReport = new PurchaseReceiptReport();
-                    // 采购订单
-                    PurchaseOrder purchaseOrder = purchaseOrderService.selectOne(new EntityWrapper<PurchaseOrder>().eq("contract_no", warehouseInOutInfo.getContractNo())
-                            .eq("delete_flag", "0"));
-
                     purchaseReceiptReport.setId(IdGenerator.generateUUID());
                     purchaseReceiptReport.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
                     purchaseReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
@@ -426,6 +428,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     tranCarInfo.setLoadNetWeight(warehouseInOutInfo.getNetWeight());
                     tranCarInfo.setLoadPoundImg(warehouseInOutInfo.getAddressUrl());
                     tranCarInfo.setConfirmFlag(StatusEnum.NOT_CONFIRM.getFlag());
+                    // 销售订单
+                    SaleOrder saleOrder = saleOrderService.selectOne(new EntityWrapper<SaleOrder>().eq("contract_no", warehouseInOutInfo.getContractNo())
+                            .eq("delete_flag", "0"));
+                    if (saleOrder != null) {
+                        tranCarInfo.setSettlementPrice(warehouseInOutInfo.getUnitPrice() + saleOrder.getBasis() + saleOrder.getInvoiceFee());
+                    }
                     tranCarInfoService.insert(tranCarInfo);
                     //判断是否第一次提交
                     if (StringUtils.isEmpty(warehouseInOutDetail.getId())) {
@@ -451,11 +459,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     salesDeliveryReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                     salesDeliveryReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                     salesDeliveryReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
-
-                    // 销售订单
-                    SaleOrder saleOrder = saleOrderService.selectOne(new EntityWrapper<SaleOrder>().eq("contract_no", warehouseInOutInfo.getContractNo())
-                            .eq("delete_flag", "0"));
-
                     if (saleOrder != null) {
                         salesDeliveryReport.setBasisPrice(saleOrder.getBasis());
                         salesDeliveryReport.setInvoiceFee(saleOrder.getInvoiceFee());