whycxzp
2025-06-10 73bb5617e6aeb4ee8f7dfd4ad54b61d477969d86
自动充放电自动化流程
2个文件已修改
36 ■■■■■ 已修改文件
src/main/java/com/whyc/service/BattWarehouseService.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/WmsService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattWarehouseService.java
@@ -89,7 +89,7 @@
    public BattWarehouse getByTaskNo(String taskNo) {
        QueryWrapper<BattWarehouse> query = Wrappers.query();
        query.eq("task_no",taskNo);
        query.eq("task_no",taskNo).or().eq("charge_task_no",taskNo).or().eq("discharge_task_no",taskNo);
        query.last(" limit 1");
        return mapper.selectOne(query);
    }
@@ -106,4 +106,22 @@
        update.eq("id",id);
        mapper.update((BattWarehouse) ActionUtil.objeNull,update);
    }
    public void finishChargeById(Integer id) {
        UpdateWrapper<BattWarehouse> update = Wrappers.update();
        update.set("charge_task_no",null);
        update.set("charge_on_plan",0);
        update.set("charge_time",Calendar.getInstance().getTime());
        update.eq("id",id);
        mapper.update((BattWarehouse) ActionUtil.objeNull,update);
    }
    public void finishDischargeById(Integer id) {
        UpdateWrapper<BattWarehouse> update = Wrappers.update();
        update.set("discharge_task_no",null);
        update.set("discharge_on_plan",0);
        update.set("discharge_time",Calendar.getInstance().getTime());
        update.eq("id",id);
        mapper.update((BattWarehouse) ActionUtil.objeNull,update);
    }
}
src/main/java/com/whyc/service/WmsService.java
@@ -241,7 +241,21 @@
                //开始取活化结束的电池,如果任务编号在更新电池仓库中存在,则更新活化时间为当前时间
                BattWarehouse battWarehouse =battWarehouseService.getByTaskNo(taskNo);
                if(battWarehouse != null){
                    battWarehouseService.finishActivationById(battWarehouse.getId());
                    String activateTaskNo = battWarehouse.getTaskNo();
                    String chargeTaskNo = battWarehouse.getChargeTaskNo();
                    String dischargeTaskNo = battWarehouse.getDischargeTaskNo();
                    if(activateTaskNo.equals(taskNo)) {
                        //如果是活化任务,则更新数据库中该任务完成时间
                        battWarehouseService.finishActivationById(battWarehouse.getId());
                    }
                    else if (chargeTaskNo.equals(taskNo)) {
                        //如果是充电任务,则更新数据库中该任务完成时间
                        battWarehouseService.finishChargeById(battWarehouse.getId());
                    }
                    else if (dischargeTaskNo.equals(taskNo)) {
                        //如果是放电任务,则更新数据库中该任务完成时间
                        battWarehouseService.finishDischargeById(battWarehouse.getId());
                    }
                }
                task.setActivationChamberPickUpTime(statusTime);break;
            case 24: