库存量改成液位的库存量

platform-service/src/main/java/com/platform/service/produce/impl/ProduceReportServiceImpl.java

@@ -672,10 +672,15 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
                     .andEqualTo(ProduceReport::getDay, date.getDayOfMonth())
                     .andEqualTo(ProduceReport::getDate, date);
             ProduceReport reportStock = mapper.selectOneByExample(weekend3);
-            total = new BigDecimal(reportStock.getValue()).subtract(total);
-            dto.setValue(total.toString());
+
+            // 液位量
+            BigDecimal yeweiStock = new BigDecimal(reportStock.getValue()).subtract(total);
+            dto.setValue(yeweiStock.toString());// 库存量-液位量
             this.modModelByDTO(dto);
 
+            // 库存量改成液位库存量
+            reportStock.setValue(total.toString());
+
             // 每单当日单耗和977生产量，如果生产量为0，则当日单耗为0
             Weekend<ProduceReport> weekendDanhao = new Weekend<>(ProduceReport.class);
             WeekendCriteria<ProduceReport, Object> weekendCriteriaDanhao = weekendDanhao.weekendCriteria();
@@ -702,10 +707,10 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
                     .andEqualTo(ProduceReport::getDate, date);
             ProduceReport cs077 = mapper.selectOneByExample(weekend977);
 
-            if(StringUtils.isBlank(cs077.getValue()) || new BigDecimal(cs077.getValue()).compareTo(new BigDecimal(0))==0){
+            if(StringUtils.isBlank(cs077.getValue()) || new BigDecimal(cs077.getValue()).compareTo(new BigDecimal(0))==0  || new BigDecimal(cs077.getValue()).compareTo(new BigDecimal(0))==0){
                 danhao.setValue("0");
             }else{
-                danhao.setValue(total.divide(new BigDecimal(cs077.getValue()), RoundingMode.HALF_UP).multiply(rate).setScale(2,RoundingMode.HALF_UP).toString());
+                danhao.setValue(yeweiStock.divide(new BigDecimal(cs077.getValue()), RoundingMode.HALF_UP).multiply(rate).setScale(2,RoundingMode.HALF_UP).toString());
             }
             this.modModelByPrimaryKey(danhao);