库存量改成液位的库存量

platform-dao/src/main/java/com/platform/dao/dto/produce/ProduceDataDTO.java

@@ -21,6 +21,10 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class ProduceDataDTO extends BaseDTO implements Serializable {
 
+    /**
+     * 是否需要手工填报，1是，0否
+     */
+    private Integer flag;
     /**
      * 类型
      */

platform-dao/src/main/java/com/platform/dao/dto/produce/ProduceReportDTO.java

@@ -91,6 +91,10 @@ public class ProduceReportDTO extends BaseDTO implements Serializable {
      * 排序
      */
     private Integer sort;
+    /**
+     * 是否需要手工填报，1是，0否
+     */
+    private Integer flag;
     /**
      * 值
      */

platform-dao/src/main/java/com/platform/dao/entity/produce/ProduceData.java

@@ -21,6 +21,10 @@ import java.time.LocalDateTime;
 @Table(name = "t_produce_data")
 public class ProduceData implements Serializable {
 
+    /**
+     * 是否需要手工填报，1是，0否
+     */
+    private Integer flag;
     /**
      * 类型
      */

platform-dao/src/main/java/com/platform/dao/vo/query/produce/ProduceDataVO.java

@@ -19,6 +19,10 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class ProduceDataVO extends BaseVO implements Serializable {
 
+    /**
+     * 是否需要手工填报，1是，0否
+     */
+    private Integer flag;
     /**
      * 类型
      */

platform-dao/src/main/java/com/platform/dao/vo/query/produce/ProduceReportVO.java

@@ -64,6 +64,10 @@ public class ProduceReportVO extends BaseVO implements Serializable {
      * 分组1
      */
     private String lineOne;
+    /**
+     * 是否需要手工填报，1是，0否
+     */
+    private Integer flag;
     /**
      * 分租2
      */

platform-dao/src/main/resources/mapper/produce/ProduceDataMapper.xml

@@ -10,6 +10,7 @@
                                      data.name,
                                      data.unit,
                                      data.type,
+                                     data.flag,
                                      data.line_one,
                                      data.line_two,
                                      data.sort,
@@ -27,6 +28,7 @@
         ,
                                      data.name,
                                      data.unit,
+                                     data.flag,
                                      data.type,
                                      data.line_one,
                                      data.line_two,
@@ -36,6 +38,9 @@
         <if test="id != null and id != ''">
             and data.id = #{id}
         </if>
+        <if test="flag != null and flag != ''">
+            and data.flag = #{flag}
+        </if>
         <if test="no != null and no != ''">
             and data.no = #{no}
         </if>

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

@@ -60,11 +60,14 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
 
     @Override
     public int batchDelete(List<String> ids) {
-        Weekend<ProduceReport> weekend = new Weekend<>(ProduceReport.class);
-        WeekendCriteria<ProduceReport, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(ProduceReport::getId, ids);
-        mapper.deleteByExample(weekend);
-
+        for (String id : ids) {
+            ProduceReport produceReport = mapper.selectByPrimaryKey(id);
+            ProduceData produceData = produceDataService.getModelById(produceReport.getDataId());
+            if (produceData.getFlag() > 0) {
+                continue;
+            }
+            mapper.deleteByPrimaryKey(id);
+        }
         // 如果有月计划的不能删除
         return 1;
     }
@@ -694,7 +697,6 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         report.setValue(new BigDecimal(reportStockPre.getValue()).add(new BigDecimal(inStock.getValue())).subtract(new BigDecimal(reportStock.getValue())).toString());
         this.modModelByPrimaryKey(report);
 
-
         // 重新计算当日单耗和月均单耗
         // 每单当日单耗和977生产量，如果生产量为0，则当日单耗为0
         Weekend<ProduceReport> weekendDanhao = new Weekend<>(ProduceReport.class);