diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java index 61081e92b..2b699e074 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java @@ -68,7 +68,8 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl 0) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("vehicle_code", vehicleCode) - .eq("row_num", param.getString("row_num")) - .setSql("qty=qty-1"); - papervehicleService.update(updateWrapper); + //数量减一 + mdPbPapervehicle.setQty(BigDecimal.valueOf(mdPbPapervehicle.getQty().intValue()-1)); + + log.debug("更新后:" + vehicleCode + "第" + param.getString("row_num") + mdPbPapervehicle); + // 检查更新后的 qty 是否为 0,然后删除相应的记录 - QueryWrapper deleteWrapper = new QueryWrapper<>(); - deleteWrapper.eq("vehicle_code", vehicleCode) - .eq("row_num", param.getString("row_num")) - .eq("qty", "0"); - boolean remove = papervehicleService.remove(deleteWrapper); + if(mdPbPapervehicle.getQty().intValue() <= 0){ + boolean remove = papervehicleService.removeById(mdPbPapervehicle); + log.debug("删除0结果:" + vehicleCode + ":" + remove); + }else{ + papervehicleService.update(mdPbPapervehicle); + } // todo: 如果qty=0,创建AGV送空任务,(新的task_type)、后期优化可以新增诺宝取货完成提前释放货位,任务状态变成071 // if (remove) { // hint: 错误 // // 证明删除成功,创建任务搬走