Merge remote-tracking branch 'origin/dev' into zs

eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java

@@ -101,6 +101,12 @@ public class TbConsInfo implements Serializable {
     @ApiModelProperty(value = "消耗总量")
     private BigDecimal stockConsume;
 
+
+
+    @Column(name = "`is_check`")
+    @ApiModelProperty(value = "是否检测库存")
+    private String isCheck;
+
     public void copy(TbConsInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java

@@ -110,6 +110,12 @@ public class ViewConInfoFlow implements Serializable {
 
 
 
+    @Column(name = "`is_check`")
+    @ApiModelProperty(value = "是否检测库存")
+    private String isCheck;
+
+
+
     public void copy(ViewConInfoFlow source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoDto.java

@@ -77,4 +77,7 @@ public class TbConsInfoDto implements Serializable {
 
 
     private String contypeCode;
+
+
+    private String isCheck;
 }

eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoFlowDto.java

@@ -68,4 +68,6 @@ public class TbConsInfoFlowDto implements Serializable {
     private Integer orderId;
 
     private String orderNo;
+
+
 }

eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java

@@ -62,4 +62,7 @@ public class ViewConInfoFlowDto implements Serializable {
     private String conWarning;
 
     private Integer conTypeId;
+
+
+    private String isCheck;
 }

eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java

@@ -160,7 +160,9 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
             tbConsInfo.setConUnit(resource.getConUnit());
             tbConsInfo.setConWarning(resource.getConWarning());
             tbConsInfo.setStatus(resource.getStatus());
+            tbConsInfo.setIsCheck(resource.getIsCheck());
             tbConsInfo.setUpdateTime(new Timestamp(System.currentTimeMillis()));
+
             tbConsInfoRepository.save(tbConsInfo);
         }