更新

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

@@ -12,7 +12,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   profiles:
-    active: local
+    active: prod
   resources:
     static-locations: file:///winsea/static/
   thymeleaf:

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

@@ -3579,13 +3579,13 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             if ("1".equals(contractManagementInfo1.getSettlementWeightMethod())) {
                                 stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
 //                                //定价销售
-//                                if (contractManagementInfo1.getUnitContractPrice() != null) {
+                                if (weighingManagement.getContractPrice() != null) {
                                     stockSaleReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(weighingManagement.getContractPrice())));
                                     stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getNetWeight() *
                                             (Double.valueOf(String.valueOf(weighingManagement.getContractPrice()))));
                                     stockSaleReceiptReport.setAmountEdReceivable(0.00);
                                     stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
-//                                }
+                                }
                             }
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                             stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());