更新

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -56,6 +56,7 @@ auth:
     - /receivingUser/*
     - /searchRecordsInfo/*
     - /saleOrder/*
+    - /saleOrder/**/*
     - /driverViewInfo/*
   expire-in: 36000
   login-url: /login.html

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

@@ -517,8 +517,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
 
                         salesDeliveryReport.setSettlementPrice(unitPrice.add(basis).add(invoiceFee).floatValue());
                         salesDeliveryReport.setCollectionIngPayable(CalculationUtil.mulToFloat(salesDeliveryReport.getSettlementPrice(),salesDeliveryReport.getNetWeight()));
-//                        salesDeliveryReport.setCollectionEdPayable(0f);
-//                        salesDeliveryReport.setCollectionNotPayable(salesDeliveryReport.getCollectionIngPayable());
+                        salesDeliveryReport.setCollectionEdPayable(0f);
+                        salesDeliveryReport.setCollectionNotPayable(salesDeliveryReport.getCollectionIngPayable());
                         if (saleOrder != null) {
                             tranCarInfo.setSettlementPrice(saleOrder.getUnitPrice() + saleOrder.getBasis() + saleOrder.getInvoiceFee());
                         }