Просмотр исходного кода

feat:"增加纸币器禁能状态"

soobin 1 месяц назад
Родитель
Сommit
36f0f492e6

+ 2 - 0
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -308,6 +308,7 @@ public class TEquipmentController {
                 equipmentDTO.setCleanFunction(equipmentDesc.getCleanFunction());
                 equipmentDTO.setTaxStatus(equipmentDesc.getTaxStatus());
                 equipmentDTO.setTaxRate(equipmentDesc.getTaxRate());
+                equipmentDTO.setBanPaper(equipmentDesc.getBanPaper());
             }
 
         }
@@ -338,6 +339,7 @@ public class TEquipmentController {
             equipmentDTO.setCleanFunction(equipmentDesc.getCleanFunction());
             equipmentDTO.setTaxStatus(equipmentDesc.getTaxStatus());
             equipmentDTO.setTaxRate(equipmentDesc.getTaxRate());
+            equipmentDTO.setBanPaper(equipmentDesc.getBanPaper());
         }
         String messageReceiver = equipment.getMessageReceiver();
         if (StringUtils.isNotEmpty(messageReceiver)) {

+ 3 - 0
src/main/java/com/szwl/model/bean/TEquipmentDTO.java

@@ -116,6 +116,9 @@ public class TEquipmentDTO extends TEquipment {
     @ApiModelProperty(value = "税率")
     private BigDecimal taxRate;
 
+    @ApiModelProperty(value = "纸币器禁能,0:关闭,1:开启,默认关闭")
+    private Boolean banPaper;
+
     public void setOccurrenceTime(Date occurrenceTime) {
         if(null != occurrenceTime){
             this.hasTodayAlarm = DateUtils.isSameDay(new Date(),occurrenceTime);