Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

lbq

14 小时以前 f7c904f2b079d903d7811b8aad6429f5307c60f6

Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java

@@ -82,6 +82,19 @@
    @ApiModelProperty(value= "目标库位")
    private String targLoc;


    /**
     * 源站点
     */
    @ApiModelProperty("源站点")
    private String orgSite;

    /**
     * 目标站点
     */
    @ApiModelProperty("目标站点")
    private String targSite;

    /**
     * 托盘码
     */

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java

@@ -829,7 +829,9 @@
            TaskLog taskLog = new TaskLog();
            BeanUtils.copyProperties(task, taskLog);
            taskLog.setOrgLoc(task.getOrgLoc())
                            .setTargLoc(task.getTargLoc());
                    .setTargLoc(task.getTargLoc())
                    .setTargSite(task.getTargSite())
                    .setOrgSite(task.getOrgSite());
            taskLog.setTaskId(task.getId())
                    .setId(null);
            if (!taskLogService.save(taskLog)) {