Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformJobService.java

@@ -36,6 +36,7 @@
     * @param id 主键
     */
    void deleteById(Integer id);
    void deleteById(Integer id,LoginUserInfo user);

    void delete(Integer id);
    /**
@@ -195,6 +196,11 @@
    PlatformJob finishWork(JobOperateDTO jobOperateDTO);

    /**
     * 查询所有已完成作业电子锁上锁状态
     */
    void checkWmsLockStatus();

    /**
     * 手动授权车辆离场
     * @param jobOperateDTO
     */
@@ -245,4 +251,20 @@

    PlatformJob getLastWaitJob(String uuid, LoginUserInfo loginUser);

    /**
     * 作业未完成定时通知
     */
    void sendUnFinishNotice();


    void dealJobFinish(List<Integer> jobIdList,LoginUserInfo loginUserInfo);

    /**
     * 恢复作业
     * @param jobOperateDTO
     * @return
     */
    PlatformJob restoreWork(JobOperateDTO jobOperateDTO);

    void changPlatformGroup(PlatformJob param, LoginUserInfo loginUser);
}