|
@@ -260,7 +260,7 @@ public class IndexController {
|
|
|
equipmentApply.setAdminId(adminId);
|
|
|
equipmentApply.setAdminUserName(username);
|
|
|
equipmentApply.setEquimentType(equimentType);
|
|
|
- if(equimentType.equals("POP320")) {
|
|
|
+ if(equimentType.equals("P30")) {
|
|
|
machineType = "1";
|
|
|
}
|
|
|
equipmentApply.setMachineType(machineType);
|
|
@@ -349,7 +349,7 @@ public class IndexController {
|
|
|
if(equipmentApply.getEquimentType().equals("MG330")){
|
|
|
equipment.setEquimentType("MG330");
|
|
|
}
|
|
|
- if(equipmentApply.getEquimentType().equals("POP320")) {
|
|
|
+ if(equipmentApply.getEquimentType().equals("P30")) {
|
|
|
equipment.setEquimentType(equipmentApply.getEquimentType());
|
|
|
}
|
|
|
equipmentService.updateById(equipment);
|
|
@@ -453,8 +453,8 @@ public class IndexController {
|
|
|
saveProduct(equipmentId);
|
|
|
}
|
|
|
} else {
|
|
|
- if(equimentType.equals("POP320")) {
|
|
|
- saveProductPOP320(equipmentId);
|
|
|
+ if(equimentType.equals("P30")) {
|
|
|
+ saveProductP30(equipmentId);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -665,7 +665,7 @@ public class IndexController {
|
|
|
* 添加爆米花产品
|
|
|
* @param id
|
|
|
*/
|
|
|
- private void saveProductPOP320(Long id) {
|
|
|
+ private void saveProductP30(Long id) {
|
|
|
String[] str = {"活力爆米花(正常糖)-B01", "活力爆米花(无糖)-B02", "活力爆米花(巧克力)-B03", "活力爆米花(焦糖)-B04", "活力爆米花(水蜜桃)-B05", "活力爆米花(蓝莓)-B06"};
|
|
|
|
|
|
for (int i = 0; i < str.length; i++) {
|