#

luxiaotao1123

2024-09-23 0da1f34e1419d91ff26927b14f9fc7828dc28d9f

#

 zy-acs-flow/src/i18n/en.js

@@ -421,7 +421,7 @@
            },
            bus: {
                uuid: "uuid",
                seqNum: "seq num",
                busNo: "bus no",
                startTime: "start time",
                endTime: "end time",
                busSts: "bus status",

 zy-acs-flow/src/i18n/zh.js

@@ -420,7 +420,7 @@
            },
            bus: {
                uuid: "编号",
                seqNum: "总线编号",
                busNo: "总批号",
                startTime: "开始时间",
                endTime: "结束时间",
                busSts: "总线状态",

 zy-acs-flow/src/page/bus/BusCreate.jsx

@@ -94,21 +94,9 @@
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.bus.seqNum"
                                        source="seqNum"
                                        label="table.field.bus.busNo"
                                        source="busNo"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <DateInput
                                        label="table.field.bus.startTime"
                                        source="startTime"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <DateInput
                                        label="table.field.bus.endTime"
                                        source="endTime"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>

 zy-acs-flow/src/page/bus/BusEdit.jsx

@@ -73,8 +73,8 @@
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.bus.seqNum"
                                source="seqNum"
                                label="table.field.bus.busNo"
                                source="busNo"
                                parse={v => v}
                            />
                        </Stack>

 zy-acs-flow/src/page/bus/BusList.jsx

@@ -63,7 +63,7 @@
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <TextInput source="uuid" label="table.field.bus.uuid" />,
    <TextInput source="seqNum" label="table.field.bus.seqNum" />,
    <TextInput source="busNo" label="table.field.bus.busNo" />,
    <DateInput source="startTime" label="table.field.bus.startTime" />,
    <DateInput source="endTime" label="table.field.bus.endTime" />,
    <ReferenceInput source="busSts" label="table.field.bus.busSts" reference="busSts">
@@ -123,7 +123,7 @@
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.bus.uuid" />
                    <TextField source="seqNum" label="table.field.bus.seqNum" />
                    <TextField source="busNo" label="table.field.bus.busNo" />
                    <DateField source="startTime" label="table.field.bus.startTime" showTime />
                    <DateField source="endTime" label="table.field.bus.endTime" showTime />
                    <ReferenceField source="busSts" label="table.field.bus.busSts" reference="busSts" link={false} sortable={false}>

 zy-acs-flow/src/page/bus/BusPanel.jsx

@@ -23,7 +23,7 @@
                                overflow: 'hidden',
                                textOverflow: 'ellipsis',
                            }}>
                                {Common.camelToPascalWithSpaces(translate('table.field.bus.seqNum'))}: {record.seqNum}
                                {Common.camelToPascalWithSpaces(translate('table.field.bus.busNo'))}: {record.seqNum}
                            </Typography>
                            {/*  inherit, primary, secondary, textPrimary, textSecondary, error */}
                            <Typography variant="h6" gutterBottom align="right" >
@@ -48,8 +48,8 @@
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.bus.seqNum" 
                                property={record.seqNum}
                                title="table.field.bus.busNo" 
                                property={record.busNo}
                            />
                        </Grid>
                        <Grid item xs={6}>

 zy-acs-flow/src/page/bus/index.jsx

@@ -13,6 +13,6 @@
    edit: BusEdit,
    show: ShowGuesser,
    recordRepresentation: (record) => {
        return `${record.seqNum}`
        return `${record.busNo}`
    }
};

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -110,7 +110,7 @@
        Date now = new Date();
        Bus bus = new Bus();
        bus.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        bus.setSeqNum(batch);
        bus.setBusNo(batch);
        bus.setStartTime(now);
        bus.setBusSts(BusStsType.RECEIVE.val());
        bus.setMemo(memo);

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java

@@ -94,10 +94,10 @@
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<Bus> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(Bus::getSeqNum, condition);
            wrapper.like(Bus::getBusNo, condition);
        }
        busService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getSeqNum()))
                item -> vos.add(new KeyValVo(item.getId(), item.getBusNo()))
        );
        return R.ok().add(vos);
    }

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java

@@ -201,7 +201,7 @@
        BusService service = SpringUtils.getBean(BusService.class);
        Bus bus = service.getById(this.busId);
        if (!Cools.isEmpty(bus)){
            return String.valueOf(bus.getUuid());
            return String.valueOf(bus.getBusNo());
        }
        return null;
    }

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java

@@ -34,8 +34,8 @@
    /**
     * 任务编号
     */
    @ApiModelProperty(value= "任务编号")
    private String seqNum;
    @ApiModelProperty(value= "总批号")
    private String busNo;

    /**
     * 开始时间
@@ -108,42 +108,6 @@
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    public Bus() {}

    public Bus(String uuid,String seqNum,Date startTime,Date endTime,Long busSts,String phase,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.uuid = uuid;
        this.seqNum = seqNum;
        this.startTime = startTime;
        this.endTime = endTime;
        this.busSts = busSts;
        this.phase = phase;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
    }

//    Bus bus = new Bus(
//            null,    // 编号
//            null,    // 任务编号
//            null,    // 开始时间
//            null,    // 结束时间
//            null,    // 进度
//            null,    // 环节
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
//            null,    // 添加人员
//            null,    // 添加时间[非空]
//            null,    // 修改人员
//            null,    // 修改时间
//            null    // 备注
//    );

    public String getBusSts$(){
        BusStsService service = SpringUtils.getBean(BusStsService.class);

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java

@@ -273,7 +273,7 @@
        BusService service = SpringUtils.getBean(BusService.class);
        Bus bus = service.getById(this.busId);
        if (!Cools.isEmpty(bus)){
            return String.valueOf(bus.getUuid());
            return String.valueOf(bus.getBusNo());
        }
        return null;
    }