自动化立体仓库 - WCS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
Junjie
昨天 ccc33d62a39aeb49751de7d4c833795db459091b 
 src/main/java/com/zy/asrs/entity/TaskWrkLog.java


@@ -1,31 +1,15 @@


package com.zy.asrs.entity;




import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;


import com.core.common.Cools;


import com.baomidou.mybatisplus.annotations.TableField;


import java.text.SimpleDateFormat;


import java.util.Date;


import org.springframework.format.annotation.DateTimeFormat;


import com.core.common.SpringUtils;


import com.zy.asrs.service.BasWrkIotypeService;


import com.zy.asrs.entity.BasWrkIotype;


import com.core.common.SpringUtils;


import com.zy.system.service.UserService;


import com.zy.system.entity.User;


import java.text.SimpleDateFormat;


import java.util.Date;


import java.text.SimpleDateFormat;


import java.util.Date;


import java.text.SimpleDateFormat;


import java.util.Date;


import java.text.SimpleDateFormat;


import java.util.Date;


import java.text.SimpleDateFormat;


import java.util.Date;


import com.core.common.SpringUtils;


import com.zy.asrs.service.BasWrkStatusService;


import com.zy.asrs.entity.BasWrkStatus;


import com.baomidou.mybatisplus.annotations.TableId;


import com.baomidou.mybatisplus.enums.IdType;




import io.swagger.annotations.ApiModelProperty;


import lombok.Data;


import com.baomidou.mybatisplus.annotations.TableName;


@@ -205,7 +189,30 @@


        this.crnNo = crnNo;


        this.commandStep = commandStep;


    }




    public TaskWrkLog(TaskWrk taskWrk) {


        this.taskNo = taskWrk.getTaskNo();


        this.status = taskWrk.getStatus();


        this.wrkNo = taskWrk.getWrkNo();


        this.createTime = taskWrk.getCreateTime();


        this.ioType = taskWrk.getIoType();


        if (Cools.isEmpty(taskWrk.getIoPri())){


            taskWrk.setIoPri(1);


        }


        this.ioPri = (double)taskWrk.getIoPri();


        this.startPoint = taskWrk.getStartPoint();


        this.targetPoint = taskWrk.getTargetPoint();


        this.modiUser = taskWrk.getModiUser();


        this.modiTime = taskWrk.getModiTime();


        this.memo = taskWrk.getMemo();


        this.barcode = taskWrk.getBarcode();


        this.assignTime = taskWrk.getAssignTime();


        this.executeTime = taskWrk.getExecuteTime();


        this.completeTime = taskWrk.getCompleteTime();


        this.cancelTime = taskWrk.getCancelTime();


        this.wrkSts = taskWrk.getWrkSts();


        this.crnNo = taskWrk.getCrnNo();


        this.commandStep = taskWrk.getCommandStep();


    }


//    TaskWrkLog taskWrkLog = new TaskWrkLog(


//            null,    // wms任务号


//            null,    // 任务状态


@@ -237,9 +244,11 @@


            case 2:


                return "派发";


            case 3:


                return "完结";


                return "步序完成";


            case 4:


                return "取消";


            case 5:


                return "完结";


            default:


                return String.valueOf(this.status);


        }