#

Junjie

2024-06-13 8886bbc44af55fb99aa4f6bcee9ade7d9c5f242c

#

 zy-asrs-flow/src/pages/task/task/index.jsx

@@ -197,6 +197,20 @@
            />,
        },
        {
            title: 'WMS任务号',
            dataIndex: 'wmsTaskNo',
            valueType: 'text',
            hidden: false,
            width: 140,
            copyable: true,
            filterDropdown: (props) => <TextFilter
                name='wmsTaskNo'
                {...props}
                actionRef={actionRef}
                setSearchParam={setSearchParam}
            />,
        },
        {
            title: '序列号',
            dataIndex: 'serialNum',
            valueType: 'text',

 zy-asrs-flow/src/pages/task/taskLog/index.jsx

@@ -157,6 +157,20 @@
            />,
        },
        {
            title: 'WMS任务号',
            dataIndex: 'wmsTaskNo',
            valueType: 'text',
            hidden: false,
            width: 140,
            copyable: true,
            filterDropdown: (props) => <TextFilter
                name='wmsTaskNo'
                {...props}
                actionRef={actionRef}
                setSearchParam={setSearchParam}
            />,
        },
        {
            title: '序列号',
            dataIndex: 'serialNum',
            valueType: 'text',

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java

@@ -100,6 +100,7 @@
        Task task = new Task();
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
        task.setWmsTaskNo(param.getTaskNo());
        task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
        task.setTaskCtg(taskCtg.getId());
        task.setPriority(priority);
@@ -167,6 +168,7 @@
        Task task = new Task();
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
        task.setWmsTaskNo(param.getTaskNo());
        task.setTaskSts(TaskStsType.NEW_OUTBOUND.sts);
        task.setTaskCtg(taskCtg.getId());
        task.setPriority(priority);
@@ -217,6 +219,7 @@
        Task task = new Task();
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
        task.setWmsTaskNo(param.getTaskNo());
        task.setTaskSts(TaskStsType.NEW_MANUAL.sts);
        task.setTaskCtg(taskCtg.getId());
        task.setPriority(priority);
@@ -286,6 +289,7 @@
        Task task = new Task();
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
        task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
        task.setWmsTaskNo(param.getTaskNo());
        task.setTaskSts(TaskStsType.NEW_MOVE.sts);
        task.setTaskCtg(taskCtg.getId());
        task.setPriority(priority);

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/domain/param/CreateInTaskParam.java

@@ -5,6 +5,9 @@
@Data
public class CreateInTaskParam {

    //任务号
    private String taskNo;

    //入库库位
    private String destLoc;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/domain/param/CreateManualTakeTaskParam.java

@@ -5,6 +5,9 @@
@Data
public class CreateManualTakeTaskParam {

    //任务号
    private String taskNo;

    //源库位
    private String originLoc;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/domain/param/CreateMoveTaskParam.java

@@ -5,6 +5,9 @@
@Data
public class CreateMoveTaskParam {

    //任务号
    private String taskNo;

    //小车号
    private Integer shuttleNo;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/domain/param/CreateOutTaskParam.java

@@ -5,6 +5,9 @@
@Data
public class CreateOutTaskParam {

    //任务号
    private String taskNo;

    //出库库位
    private String originLoc;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java

@@ -260,10 +260,16 @@
    @ApiModelProperty(value= "是否记录库位信息")
    private String recordLoc;

    /**
     * WMS任务号
     */
    @ApiModelProperty(value= "WMS任务号")
    private String wmsTaskNo;


    public Task() {}

    public Task(String uuid, Long busId, String taskNo, String serialNum, String title, Long taskSts, Long taskCtg, Integer priority, String originSite, String originLoc, String destSite, String destLoc, Integer emptyMk, String zpallet, String phase, Date ioTime, Date startTime, Date endTime, Date exceptionTime, String exceptionDesc, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, Integer shuttleNo, Integer liftNo, Integer crnNo, Integer rgvNo, Integer agvNo, String recordLoc) {
    public Task(String uuid, Long busId, String taskNo, String serialNum, String title, Long taskSts, Long taskCtg, Integer priority, String originSite, String originLoc, String destSite, String destLoc, Integer emptyMk, String zpallet, String phase, Date ioTime, Date startTime, Date endTime, Date exceptionTime, String exceptionDesc, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, Integer shuttleNo, Integer liftNo, Integer crnNo, Integer rgvNo, Integer agvNo, String recordLoc, String wmsTaskNo) {
        this.uuid = uuid;
        this.busId = busId;
        this.taskNo = taskNo;
@@ -298,6 +304,7 @@
        this.rgvNo = rgvNo;
        this.agvNo = agvNo;
        this.recordLoc = recordLoc;
        this.wmsTaskNo = wmsTaskNo;
    }

    //    Task task = new Task(

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/TaskLog.java

@@ -247,9 +247,15 @@
    @ApiModelProperty(value= "是否记录库位信息")
    private String recordLoc;

    /**
     * WMS任务号
     */
    @ApiModelProperty(value= "WMS任务号")
    private String wmsTaskNo;

    public TaskLog() {}

    public TaskLog(String uuid,Long busId,String taskNo,String serialNum,String title,Long taskSts,Long taskCtg,Integer priority,String originSite,String originLoc,String destSite,String destLoc,Integer emptyMk,String zpallet,String phase,Date ioTime,Date startTime,Date endTime,Date exceptionTime,String exceptionDesc,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,Integer shuttleNo,Integer liftNo,Integer crnNo,Integer rgvNo,Integer agvNo,String recordLoc) {
    public TaskLog(String uuid, Long busId, String taskNo, String serialNum, String title, Long taskSts, Long taskCtg, Integer priority, String originSite, String originLoc, String destSite, String destLoc, Integer emptyMk, String zpallet, String phase, Date ioTime, Date startTime, Date endTime, Date exceptionTime, String exceptionDesc, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, Integer shuttleNo, Integer liftNo, Integer crnNo, Integer rgvNo, Integer agvNo, String recordLoc, String wmsTaskNo) {
        this.uuid = uuid;
        this.busId = busId;
        this.taskNo = taskNo;
@@ -284,9 +290,10 @@
        this.rgvNo = rgvNo;
        this.agvNo = agvNo;
        this.recordLoc = recordLoc;
        this.wmsTaskNo = wmsTaskNo;
    }

//    TaskLog taskLog = new TaskLog(
    //    TaskLog taskLog = new TaskLog(
//            null,    // 编号
//            null,    // 总线
//            null,    // 任务号

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java

@@ -223,7 +223,7 @@
                                devpThread.writeWorkSta(staProtocol.getSiteId(), dto.getWorkNo().shortValue(), dto.getStaNo().shortValue());
                                devpThread.setPakMk(staProtocol.getSiteId(), false);

                            } else if (code == 500) {
                            }else {
                                if (ledThread != null) {
                                    String errorMsg = jsonObject.getString("msg");
                                    if (!Cools.isEmpty(errorMsg)) {
@@ -232,18 +232,6 @@
                                    }
                                }
                                News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v2", JSON.toJSONString(param), response);
                            } else if (code == 700) {
//                            staProtocol.setWorkNo((short) 32002);
//                            staProtocol.setRollback102(1);//102站回退信号
//                            devpThread.setPakMk(staProtocol.getSiteId(), false);
//                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(5, staProtocol));

                                // led 异常显示
                                if (ledThread != null) {
                                    String errorMsg = barcode + "托盘识别异常，请先进行组托！";
                                    ledThread.error(errorMsg);
                                    ledThread.setLedMk(false);
                                }
                            }
                        } catch (Exception e) {
                            e.printStackTrace();