|
|
@@ -194,15 +194,30 @@ public class IndexController {
|
|
|
if (StringUtils.isNotEmpty(equipmentVo.getStick())) {
|
|
|
equipmentDesc.setStick(equipmentVo.getStick());
|
|
|
}
|
|
|
- if (equipmentVo.getCupQuantity() != null) {
|
|
|
- equipmentDesc.setCupQuantity(equipmentVo.getCupQuantity());
|
|
|
- }
|
|
|
- if (StringUtils.isNotEmpty(equipmentVo.getStirTm())) {
|
|
|
- equipmentDesc.setStirTm(equipmentVo.getStirTm());
|
|
|
- }
|
|
|
- if (StringUtils.isNotEmpty(equipmentVo.getCornGeneratorTm())) {
|
|
|
- equipmentDesc.setCornGeneratorTm(equipmentVo.getCornGeneratorTm());
|
|
|
+ // 如果是爆米花机
|
|
|
+ if(newEquipment.getMachineType().equals("1")) {
|
|
|
+ // 爆米花机搅拌温度
|
|
|
+ if (StringUtils.isNotEmpty(cabinetTm)) {
|
|
|
+ equipmentDesc.setStirTm(cabinetTm);
|
|
|
+ }
|
|
|
+ // 爆米花机玉米发生器温度
|
|
|
+ if (StringUtils.isNotEmpty(cabinetHd)) {
|
|
|
+ equipmentDesc.setCornGeneratorTm(cabinetHd);
|
|
|
+ }
|
|
|
+ // 爆米花机杯子剩余量
|
|
|
+ if (StringUtils.isNotEmpty(furnaceTm)) {
|
|
|
+ equipmentDesc.setCupQuantity(Long.parseLong(furnaceTm));
|
|
|
+ }
|
|
|
}
|
|
|
+// if (equipmentVo.getCupQuantity() != null) {
|
|
|
+// equipmentDesc.setCupQuantity(equipmentVo.getCupQuantity());
|
|
|
+// }
|
|
|
+// if (StringUtils.isNotEmpty(equipmentVo.getStirTm())) {
|
|
|
+// equipmentDesc.setStirTm(equipmentVo.getStirTm());
|
|
|
+// }
|
|
|
+// if (StringUtils.isNotEmpty(equipmentVo.getCornGeneratorTm())) {
|
|
|
+// equipmentDesc.setCornGeneratorTm(equipmentVo.getCornGeneratorTm());
|
|
|
+// }
|
|
|
if (StringUtils.isNotEmpty(numberOne)) {
|
|
|
equipmentDesc.setNumberOne(numberOne);
|
|
|
}
|
|
|
@@ -556,6 +571,7 @@ public class IndexController {
|
|
|
equipment.setChannel("1");
|
|
|
equipment.setProductTotal(0);
|
|
|
equipment.setCompanyType(companyType);
|
|
|
+ equipment.setMachineType(machineType);
|
|
|
//设置默认规则
|
|
|
equipment.setTimeRuleId(Long.valueOf(1));
|
|
|
if (equimentType.equals("MG320-1")) {
|
