lsh#

1

1 天以前 fb98f31695ffbd2129335870913195d37d44ab96

lsh#

 rsf-admin/src/i18n/en.js

@@ -944,6 +944,8 @@
                deviceSite: "deviceSite",
                flagInit: "flagInit",
                channel: "channel",
                areaIdStart: "areaIdStart",
                areaIdEnd: "areaIdEnd",
            },
            waitPakin: {
                code: "code",

 rsf-admin/src/i18n/zh.js

@@ -990,6 +990,8 @@
                flagInit: "是否初始化",
                wcsCode: "wcs编号",
                channel: "巷道",
                areaIdStart: "起点库区",
                areaIdEnd: "目标库区",
            },
            waitPakin: {
                code: "编码",

 rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx

@@ -144,6 +144,18 @@
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.deviceSite.areaIdStart"
                                        source="areaIdStart"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.deviceSite.areaIdEnd"
                                        source="areaIdEnd"
                                    />
                                </Grid>

                                <Grid item xs={6} display="flex" gap={1}>
                                    <StatusSelectInput />

 rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx

@@ -127,6 +127,18 @@
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.deviceSite.areaIdStart"
                                source="areaIdStart"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.deviceSite.areaIdEnd"
                                source="areaIdEnd"
                            />
                        </Stack>

                    </Grid>
                    <Grid item xs={12} md={4}>

 rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx

@@ -72,6 +72,8 @@
    <TextInput source="device" label="table.field.deviceSite.device" />,
    <TextInput source="deviceCode" label="table.field.deviceSite.deviceCode" />,
    <TextInput source="deviceSite" label="table.field.deviceSite.deviceSite" />,
    <NumberInput source="deviceSite" label="table.field.deviceSite.areaIdStart" />,
    <NumberInput source="deviceSite" label="table.field.deviceSite.areaIdEnd" />,

    <TextInput label="common.field.memo" source="memo" />,
    <SelectInput

 rsf-admin/src/page/basicInfo/deviceSite/DeviceSitePanel.jsx

@@ -88,6 +88,18 @@
                                property={record.deviceSite}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title={translate('table.field.deviceSite.areaIdStart')}
                                property={record.areaIdStart}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title={translate('table.field.deviceSite.areaIdEnd')}
                                property={record.areaIdEnd}
                            />
                        </Grid>

                    </Grid>
                </CardContent>

 rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx

@@ -159,6 +159,16 @@
                                // type="number"
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <ReferenceInput source="areaIdStart" label="table.field.deviceBind.typeId" reference="warehouseAreas" filter={{}}>
                                    <AutocompleteInput optionValue="id" optionText="name" label={translate('table.field.deviceSite.areaIdStart')} />
                                </ReferenceInput>
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <ReferenceInput source="areaIdEnd" label="table.field.deviceBind.typeId" reference="warehouseAreas" filter={{}}>
                                    <AutocompleteInput optionValue="id" optionText="name" label={translate('table.field.deviceSite.areaIdEnd')} />
                                </ReferenceInput>
                            </Grid>
                            <Grid item xs={4}>
                                <SelectInput
                                    label="table.field.deviceSite.flagInit"

 rsf-admin/src/page/waitPakin/SelectSiteModel.jsx

@@ -107,6 +107,8 @@
                            <TextField source="createBy$" label="common.field.createBy" />
                            <DateField source="createTime" label="common.field.createTime" showTime />
                            <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                            <NumberField source="deviceSite" label="table.field.deviceSite.areaIdStart" />,
                            <NumberField source="deviceSite" label="table.field.deviceSite.areaIdEnd" />,
                            <TextField source="memo" label="common.field.memo" sortable={false} />
                            <WrapperField cellClassName="opt" label="common.field.opt">
                                <SelectSiteButton source={source} setOpen={setOpen} refresh={refresh} notify={notify} />

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java

@@ -34,4 +34,11 @@
    @ApiModelProperty("巷道")
    private Integer channel;

    @ApiModelProperty("源库区")
    private Long areaIdStart;

    @ApiModelProperty("目标库区")
    private Long areaIdEnd;


}

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

@@ -156,6 +156,12 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    @ApiModelProperty("源库区")
    private Long areaIdStart;

    @ApiModelProperty("目标库区")
    private Long areaIdEnd;

    public DeviceSite() {}

    public DeviceSite(String type,String site,String name,String wcsCode,String label,String device,String deviceCode,String deviceSite,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java

@@ -14,7 +14,7 @@

    R generateFlatWarehouseTasks(WaitPakin waitPakins, String locCode, Long loginUserId);

    R generateAGVTasks(WaitPakin waitPakins, String locCode, String orgSta, Long loginUserId);
    R generateAGVTasks(WaitPakin waitPakins, String locCode, String orgSta, String targSite, Long loginUserId);

    void completeTask(List<Task> task) throws Exception;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java

@@ -75,6 +75,8 @@
                                .setDeviceSite(basStation2.getStationName())
                                .setTarget(target)
                                .setDeviceCode(param.getDeviceCode())
                                .setAreaIdStart(param.getAreaIdStart())
                                .setAreaIdEnd(param.getAreaIdEnd())
                                .setChannel(param.getChannel())
                                ;
                        deviceSites.add(site1);

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -125,7 +125,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public synchronized R generateAGVTasks(WaitPakin pakins, String locCode, String orgSta, Long loginUserId) {
    public synchronized R generateAGVTasks(WaitPakin pakins, String locCode, String orgSta,String targSite, Long loginUserId) {
        if (Cools.isEmpty(pakins) || Cools.isEmpty(locCode)) {
            throw new CoolException("参数不能为空！！");
        }
@@ -154,7 +154,7 @@
                    .setTaskType(TaskType.TASK_TYPE_IN.type)
                    .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)
                    .setTargLoc(targetLoc)
                    .setTargSite(orgSta)
                    .setTargSite(targSite)
                    .setOrgSite(orgSta)
                    .setBarcode(pakin.getBarcode())
                    .setCreateBy(loginUserId)