rsf-admin/src/i18n/zh.js

@@ -1046,7 +1046,7 @@
            },
            waveRule: {
                code: "编码",
                type: "类型",
                type: "波次类型",
                name: "名称",
            },
        }

 rsf-admin/src/page/orders/outStock/OutOrderList.jsx

@@ -197,7 +197,7 @@
        drawerVal={drawerVal}
        setDrawerVal={setDrawerVal}
      >
        <OutStockPublic record={select} />
        <OutStockPublic record={select} open={drawerVal}/>
      </PageEditDrawer>
    </Box >
  )

 rsf-admin/src/page/orders/outStock/OutStockPublic.jsx

@@ -34,15 +34,16 @@
    AutocompleteInput,
    DeleteButton,
    SimpleForm,
    required,
    Form,
    SaveButton,
    useRefresh,
    useGetList,
    useGetOne,
} from 'react-admin';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import { styled } from '@mui/material/styles';
import { DataGrid } from '@mui/x-data-grid';
import request from '@/utils/request';
import DictSelect from "../../components/DictSelect";
import ConfirmationNumberOutlinedIcon from '@mui/icons-material/ConfirmationNumberOutlined';
import CloseSharpIcon from '@mui/icons-material/CloseSharp';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -51,11 +52,41 @@
    '& .RaDatagrid-row': {
        cursor: 'auto'
    },
    '& .column-maktx': {
        width: 200
    }
}));


const OutStockPublic = (props) => {
    const { record } = props;
    const { record, open } = props;
    const notify = useNotify();
    const translate = useTranslate();
    const [formData, setFormData] = useState({
        orderId: record?.id
    });
    useEffect(() => {
        getWaveRule()
    }, [formData, open])

    const getWaveRule = async () => {
        if (formData.waveId == null && formData.waveId == undefined) {
            return
        }
        const res = await request.post('/outStock/order/getOutTaskItems', { ...formData });
        if (res?.data?.code === 200) {
            setRows(res.data.data.records)
        } else {
            notify(res.data.msg);
        }
    }

    const handleChange = (value, name) => {
        setFormData((prevData) => ({
            ...prevData,
            [name]: value
        }));
    };

    return (
        <>
@@ -63,6 +94,26 @@
                <Grid sx={{ display: "flex" }} container rowSpacing={2} columnSpacing={2}>
                    <Grid item xl={6} gap={2} >
                        <Card>
                            <Form>
                                <ReferenceInput
                                    source="type"
                                    reference="waveRule"
                                >
                                    <AutocompleteInput
                                        label="table.field.waveRule.type"
                                        onChange={(e) => handleChange(e, 'waveId')}
                                        value={formData.type}
                                        validate={required()}
                                    />
                                </ReferenceInput>
                            </Form>
                            {/* <DictSelect
                                label={translate("table.field.waveRule.type")}
                                onChange={(e) => handleChange(e.target.value, 'type')}
                                value={formData.type}
                                dictTypeCode="sys_wave_rule_code"
                                required
                            /> */}
                            <List
                                resource="outStockItem"
                                storeKey='outStockItem'
@@ -77,7 +128,9 @@
                                empty={false}
                                filter={{ asnId: record?.id, deleted: 0 }}
                                sort={{ field: "create_time", order: "desc" }}
                                actions={false}
                                actions={(
                                    <SelectColumnsButton preferenceKey='outStock' />
                                )}
                                perPage={DEFAULT_ITEM_PAGE_SIZE}
                            >
                                <LinearProgress
@@ -87,7 +140,7 @@
                                    preferenceKey='outStockItem'
                                    bulkActionButtons={false}
                                    rowClick={false}
                                    omit={['id', 'splrName', 'qty']}
                                    omit={['id', 'splrName', 'qty', 'poCode', 'workQty']}
                                >
                                    <NumberField source="id" />
                                    <TextField source="asnCode" label="table.field.outStockItem.asnCode" />
@@ -120,6 +173,10 @@
                                    disableRowSelectionOnClick
                                />
                            </Box>
                            <Box sx={{ textAlign: 'center' }}>
                                <Button label="toolbar.close" variant="outlined" size="medium" startIcon={<CloseSharpIcon />} sx={{ margin: '3.5em' }} />
                                <Button label="toolbar.confirm" variant="contained" size="medium" startIcon={<ConfirmationNumberOutlinedIcon />} />
                            </Box>
                        </Card>
                    </Grid>
                </Grid>
@@ -129,6 +186,7 @@
}



const rows = [
    { id: 1, locCode: '03-02-1-2-1', container: 'Snow', batch: 'Jon', curQty: 14 },
    { id: 2, locCode: '03-02-1-2-1', container: 'Lannister', batch: 'Cersei', curQty: 31 },

 rsf-admin/src/page/waveRule/WaveRuleCreate.jsx

@@ -33,7 +33,7 @@

const WaveRuleCreate = (props) => {
    const { open, setOpen } = props;

    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_wave_rule_code')) || [];
    const translate = useTranslate();
    const notify = useNotify();

@@ -85,18 +85,14 @@
                        <DialogContent sx={{ mt: 2 }}>
                            <Grid container rowSpacing={2} columnSpacing={2}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.waveRule.code"
                                        source="code"
                                        parse={v => v}
                                        autoFocus
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                    <AutocompleteInput
                                        choices={dicts}
                                        optionText="label"
                                        label="table.field.waveRule.type"
                                        source="type"
                                    />
                                        optionValue="value"
                                        parse={v => v}
                                        validate={[required()]} />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput

 rsf-admin/src/page/waveRule/WaveRuleEdit.jsx

@@ -42,6 +42,7 @@

const WaveRuleEdit = () => {
    const translate = useTranslate();
    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_wave_rule_code')) || [];

    return (
        <Edit
@@ -68,14 +69,19 @@
                                label="table.field.waveRule.code"
                                source="code"
                                parse={v => v}
                                readOnly
                                autoFocus
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                            <AutocompleteInput
                                choices={dicts}
                                optionText="label"
                                label="table.field.waveRule.type"
                                source="type"
                            />
                                optionValue="value"
                                parse={v => v}
                                validate={[required()]} />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput

 rsf-admin/src/page/waveRule/WaveRuleList.jsx

@@ -97,7 +97,7 @@
                    marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                }}
                title={"menu.waveRule"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                empty={false}
                filters={filters}
                sort={{ field: "create_time", order: "desc" }}
                actions={(
@@ -120,9 +120,8 @@
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.waveRule.code" />
                    <NumberField source="type" label="table.field.waveRule.type" />
                    <TextField source="type$" label="table.field.waveRule.type" />
                    <TextField source="name" label="table.field.waveRule.name" />

                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java

New file
@@ -0,0 +1,94 @@
package com.vincent.rsf.server.api.controller.mcp;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.DeviceSite;
import com.vincent.rsf.server.manager.entity.LocItem;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.service.DeviceSiteService;
import com.vincent.rsf.server.manager.service.LocItemService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;
import java.util.Map;
import java.util.Objects;

@RestController
@RequestMapping("/mcp")
@Api(tags = "mcp接口")
public class McpController extends BaseController {

    @Autowired
    private LocItemService locItemService;
    @Autowired
    private DeviceSiteService deviceSiteService;


    @PostMapping("/locItem/useF/list")
    public R locUseOPage(@RequestBody Map<String, Object> map) {
        QueryWrapper<LocItem> locItemQueryWrapper = new QueryWrapper<>();
        if (null != map.get("matnr") && !Cools.isEmpty(map.get("matnr"))){
            locItemQueryWrapper.eq("matnr_code", map.get("matnr"));
        }else {
            return R.error("物料编码为空");
        }
        String applySql = String.format(
                "EXISTS (SELECT 1 FROM man_loc ml " +
                        "WHERE ml.use_status = '%s'" +
                        "AND ml.id = man_loc_item.loc_id " +
                        ")",
                LocStsType.LOC_STS_TYPE_F.type
        );
        locItemQueryWrapper.apply(applySql);
        List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
        for (LocItem locItem : locItems) {
            if (!Objects.isNull(locItem.getFieldsIndex())) {
                Map<String, String> fields = FieldsUtils.getFields(locItem.getFieldsIndex());
                locItem.setExtendFields(fields);
            }
        }
        return R.ok().add(locItems);
    }


    @PostMapping("/selectStaList/list")
    public R selectStaList(@RequestBody Map<String, Object> map) {
        List<String> longs = null;
        if (map.get("type") != null) {
            longs = JSONArray.parseArray(map.get("type").toString(), String.class);
            map.entrySet().removeIf(next -> next.getKey().equals("type"));
        }
        List<DeviceSite> list = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, longs));
        return R.ok().add(list);
    }

    @ApiOperation("生成库存出库任务")
    @PostMapping("/generate/task")
    public R generateTask(@RequestBody LocToTaskParams param) {
        if (Objects.isNull(param)) {
            return R.error("参数不能为空！！");
        }
        param.setType(Constants.TASK_TYPE_OUT_STOCK);

        return locItemService.generateTask(param, getLoginUserId());
    }



}

 rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java

@@ -52,7 +52,8 @@
            "/v3/api-docs/**",
            "/swagger-ui/**",
            "/ws/**",
            "/wcs/**"
            "/wcs/**",
            "/mcp/**"
    };

    @Resource

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

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.annotation.OperationLog;
@@ -231,4 +232,14 @@
        }
        return outStockService.updateOrderItem(params, getLoginUserId());
    }

    @PostMapping("/outStock/order/getOutTaskItems")
    @PreAuthorize("hasAuthority('manager:outStock:list')")
    public R getOrderOutTaskItem(@RequestBody OrderOutTaskParam param){
        if (Cools.isEmpty(param)){
            return R.error("参数不能为空");
        }

        return outStockService.getOrderOutTaskItem(param);
    }
}

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

@@ -11,7 +11,10 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.WaveRule;
import com.vincent.rsf.server.manager.service.WaveRuleService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -59,6 +62,10 @@
        waveRule.setCreateTime(new Date());
        waveRule.setUpdateBy(getLoginUserId());
        waveRule.setUpdateTime(new Date());
        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAVE_RULE_CODE, null);
        if (!StringUtils.isBlank(ruleCode)) {
               waveRule.setCode(ruleCode);
        }
        if (!waveRuleService.save(waveRule)) {
            return R.error("Save Fail");
        }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/ExistDto.java

New file
@@ -0,0 +1,12 @@
package com.vincent.rsf.server.manager.controller.dto;

import lombok.Data;
import lombok.experimental.Accessors;

@Data
@Accessors(chain = true)
public class ExistDto {
    private String locNo;
    private String matnr;
    private String batch;
}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java

New file
@@ -0,0 +1,29 @@
package com.vincent.rsf.server.manager.controller.dto;

import com.vincent.rsf.server.manager.entity.LocItem;
import com.vincent.rsf.server.manager.utils.Synchro;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Delegate;

import java.util.List;

@Data
public class OrderOutItemDto  {
    @Delegate
    private LocItem locItem;


    private List<staListDto> staNos;

    @Data
    public static class staListDto{
        private String staNo;
        private String staName;
    }


    public void sync(Object source) {
        Synchro.Copy(source, this);
    }
}

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

New file
@@ -0,0 +1,15 @@
package com.vincent.rsf.server.manager.controller.params;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.io.Serializable;
@Data
@ApiModel(value = "OrderOutTaskParam", description = "订单出库param")
public class OrderOutTaskParam implements Serializable {

    private Long waveId;

    private Long orderId;

}

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

@@ -3,6 +3,11 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -20,6 +25,7 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
import java.util.Objects;

@Data
@TableName("man_wave_rule")
@@ -133,6 +139,18 @@
//            null    // 备注
//    );

    public String getType$() {
        if (null == this.type){ return null; }
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
                .eq(DictData::getDictTypeCode, DictTypeCode.SYS_WAVE_RULE_CODE)
                .eq(DictData::getValue, this.type));
        if (Objects.isNull(dictData)) {
            return null;
        }
        return dictData.getLabel();
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WaveRuleType.java

New file
@@ -0,0 +1,17 @@
package com.vincent.rsf.server.manager.enums;

public enum WaveRuleType {

    Efficiency_First("1","效率优先"),
    First_In_First_Out("2","先进先出")

    ;

    public Integer type;
    public String desc;

    WaveRuleType(String type, String desc) {
        this.type = Integer.parseInt(type);
        this.desc = desc;
    }
}

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;

import java.util.List;
@@ -18,4 +19,6 @@
    R saveOutStock(AsnOrderAndItemsParams params, Long loginUserId);

    R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId);

    R getOrderOutTaskItem(OrderOutTaskParam param);
}

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

@@ -1,17 +1,19 @@
package com.vincent.rsf.server.manager.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.manager.controller.dto.ExistDto;
import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.POExceStatus;
import com.vincent.rsf.server.manager.enums.WaveExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
@@ -23,8 +25,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import com.vincent.rsf.server.manager.enums.WaveRuleType;

/**
 * @author Ryan
@@ -56,6 +60,14 @@
    private OutStockItemService outStockItemService;
    @Autowired
    private OutStockService outStockService;
    @Autowired
    private WaveRuleService waveRuleService;
    @Autowired
    private LocItemService locItemService;
    @Autowired
    private DeviceSiteService deviceSiteService;
    @Autowired
    private LocService locService;


    /**
@@ -386,6 +398,97 @@
        return R.ok();
    }

    @Override
    public R getOrderOutTaskItem(OrderOutTaskParam param) {
        if (Cools.isEmpty(param.getWaveId())){
            throw new CoolException("策略参数为空");
        }
        if (Cools.isEmpty(param.getOrderId())){
            throw new CoolException("单据id为空");
        }
        WaveRule waveRule = waveRuleService.getOne(new LambdaQueryWrapper<WaveRule>().eq(WaveRule::getId, param.getWaveId()));
        if (Cools.isEmpty(waveRule)){
            throw new CoolException("未找到当前策略");
        }
        List<OrderOutItemDto> locItems = null;
        if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
            locItems =  efficiencyFirst(param.getOrderId());
        } else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {

        }
        return R.ok(locItems);
    }

    private List<LocItem> getEfficiencyFirstItemList(AsnOrderItem asnOrderItem){
        QueryWrapper<LocItem> locItemQueryWrapper = new QueryWrapper<>();
        locItemQueryWrapper.eq("matnr_code", asnOrderItem.getMatnrCode());
        locItemQueryWrapper.eq("batch", asnOrderItem.getSplrBatch());
        String applySql = String.format(
                "EXISTS (SELECT 1 FROM man_loc ml " +
                        "WHERE ml.use_status = '%s'" +
                        "AND ml.id = man_loc_item.loc_id " +
                        ")",
                LocStsType.LOC_STS_TYPE_F.type
        );
        locItemQueryWrapper.apply(applySql);
        List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
        locItems.sort((s1,s2)-> LocUtils.isShallowLoc(s1.getLocCode())?-1:0);
        return locItems;
    }

    private List<OrderOutItemDto> efficiencyFirst(Long orderId){
        List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
                .eq(AsnOrderItem::getAsnId, orderId)
        );

        List<OrderOutItemDto> list = new ArrayList<>();

        Set<String> exist = new HashSet<>();
        Set<ExistDto> existDtos = new HashSet<>();

        for (AsnOrderItem asnOrderItem : asnOrderItems) {
            BigDecimal issued = new BigDecimal(asnOrderItem.getAnfme().toString())
                    .subtract(new BigDecimal(asnOrderItem.getWorkQty().toString())
                    );
            if (issued.doubleValue() <= 0) {
                continue;
            }
            List<LocItem> locItems = null;
            locItems = getEfficiencyFirstItemList(asnOrderItem);
            for (LocItem locItem : locItems) {
                Loc loc = locService.getById(locItem.getLocId());
                List<LocItem> itemList = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, locItem.getLocCode()));
                if (issued.doubleValue() > 0){
                    ExistDto existDto = new ExistDto().setBatch(locItem.getBatch()).setMatnr(locItem.getMatnrCode()).setLocNo(locItem.getLocCode());
                    if (existDtos.add(existDto)){
                        OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
                        orderOutItemDto.sync(locItem);
                        List<DeviceSite> deviceSites = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>()
                                .eq(DeviceSite::getChannel, loc.getChannel())
                                .eq(DeviceSite::getType, issued.doubleValue() >= locItem.getAnfme() && itemList.size() == 1 ? TaskType.TASK_TYPE_OUT.type : TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
                        );
                        List<OrderOutItemDto.staListDto> maps = new ArrayList<>();
                        for (DeviceSite sta : deviceSites) {
                            OrderOutItemDto.staListDto staListDto = new OrderOutItemDto.staListDto();
                            staListDto.setStaNo(sta.getSite());
                            staListDto.setStaName(sta.getSite());
                            maps.add(staListDto);
                        }
                        orderOutItemDto.setStaNos(maps);

                        list.add(orderOutItemDto);

                        issued = issued.subtract(new BigDecimal(locItem.getAnfme().toString()));
                    }
                }

            }
        }

        return list;

    }

    /**
     * @param
     * @param wave

 rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/Synchro.java

New file
@@ -0,0 +1,39 @@
package com.vincent.rsf.server.manager.utils;


import com.vincent.rsf.framework.exception.CoolException;

import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;

/**
 * Created by vincent on 2022/4/1
 */
public class Synchro {

    public static void Copy(Object source, Object dest) {
        try {
            BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(),Object.class);
            PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
            BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
            PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
            for (PropertyDescriptor propertyDescriptor : sourceProperty) {
                for (PropertyDescriptor descriptor : destProperty) {
                    if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) {
                        Method readMethod = propertyDescriptor.getReadMethod();
                        Method writeMethod = descriptor.getWriteMethod();
                        if (null != writeMethod && null != readMethod) {
                            writeMethod.invoke(dest, readMethod.invoke(source));
                        }
                    }
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            throw new CoolException("属性复制失败:" + e.getMessage());
        }
    }

}

 rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java

@@ -65,4 +65,9 @@
    /**PO单执行状态*/
    public final static String SYS_PO_EXCE_STATUS =  "sys_po_exce_status";

    /**
     *波次策略类型
     */
    public final static String SYS_WAVE_RULE_CODE =  "sys_wave_rule_code";

}

 rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java

@@ -80,6 +80,10 @@
    /**企业编码*/
    public final static String SYS_COMPANYS_CODE = "sys_companys_code";

    /**
     * 波次策略
     */
    public final static String SYS_WAVE_RULE_CODE = "sys_wave_type";


}