123

zhang

8 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -1,10 +1,12 @@
package com.zy.asrs.entity;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -14,7 +16,9 @@

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@Data
@TableName("asr_wrk_mast")
@@ -418,6 +422,43 @@
        }
        return null;
    }
    public String getOrderNo$(){
        WrkDetlService wrkDetlService = SpringUtils.getBean(WrkDetlService.class);
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(this.wrkNo);
        String orderNo = "";
        List<String> resultRecords = new ArrayList<>();
        if (!Cools.isEmpty(wrkDetls) && wrkDetls.size()!=0){
            if (wrkDetls.get(0).getOrderNo() != null) {
                for (WrkDetl wrkDetl : wrkDetls) {
                    String orderNo$ = "";
                    if(!wrkDetl.getOrderNo().startsWith("[") || !wrkDetl.getOrderNo().endsWith("]")) {
                        return wrkDetl.getOrderNo();
                    } else {
                        JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
                            resultRecords.add(detlDto.getOrderNo());
                        });
                    }
                }

            }
            int size = resultRecords.size();
            int i = 1;
            for (String resultRecord : resultRecords) {


                if (size == i) {
                    orderNo += resultRecord;
                } else {
                    orderNo += resultRecord + ";";
                }


                i++;
            }
            return String.valueOf(orderNo);
        }
        return "";
    }

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){