diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java index 9c596569..2027df16 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java @@ -162,6 +162,14 @@ public class WastecchangeServiceImpl implements WastecchangeService { for (int i = 0; i < rf_arr.size(); i++) { JSONObject json_rf_type = rf_arr.getJSONObject(i); + // 校验修正值必须为 -0.5 ~ 0.5 之间 或者为 99 + double value = json_rf_type.getDoubleValue("value"); + if (value != 99) { + if (!(-0.5 <= value && value <= 0.5)) { + throw new BadRequestException("修正值必须为-0.5~0.5的小时;若无此软废,修正值填为99"); + } + } + HashMap map = new HashMap<>(); map.put("flag", "2"); map.put("material_id", whereJson.getString("material_id")); @@ -194,7 +202,12 @@ public class WastecchangeServiceImpl implements WastecchangeService { JSONObject jsonExt_rf = extTab.query("material_id = '" + json.getString("material_id") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonExt_rf)) throw new BadRequestException("软废扩展属性不存在" + jsonExt_rf.getString("material_code")); - jsonExt_rf.put("c_balance", rf_c_balance); + + if (value == 99) { + jsonExt_rf.put("c_balance", -1); + } else { + jsonExt_rf.put("c_balance", rf_c_balance); + } extTab.update(jsonExt_rf); } } diff --git a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue index 9fe71a7b..da4db947 100644 --- a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue +++ b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue @@ -213,7 +213,7 @@ - + 同步 @@ -377,7 +377,6 @@ export default { ], c_balance: [ { required: true, message: '不能为空', trigger: 'blur' }, - { validator: numberOne } ], ball_speed: [ { required: true, message: '不能为空', trigger: 'blur' },