1

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

@@ -340,7 +340,7 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(stockSaleReceiptReportList)) {
                 for (StockSaleReceiptReport stockSaleReceiptReport : stockSaleReceiptReportList) {
-                    money = money + stockSaleReceiptReport.getAmountNotReceivable();
+                    money = money + (stockSaleReceiptReport.getAmountNotReceivable()!=null?stockSaleReceiptReport.getAmountNotReceivable():0.0);
                 }
                 //有未收金额
                 if (money > 0) {

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

@@ -385,6 +385,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         qualityInspectionManagement.setRelationId(weighingManagement.getRelationId());
         qualityInspectionManagement.setContractNo(weighingManagement.getContractNo());
         qualityInspectionManagement.setQualityNo(weighingManagement.getNumber());
+        qualityInspectionManagement.setWarehouseInOutId(weighingManagement.getWarehouseInOutId());
         qualityInspectionManagement.setCarNumber(weighingManagement.getCarNumber());
         qualityInspectionManagement.setCompId(weighingManagement.getCompId());
         qualityInspectionManagement.setGoodsName(weighingManagement.getGoodsName());