下发执行功能优化 添加站点默认值

skyouc

3 天以前 2a125d08bd4437dbf0e93f2d25ea196715ce82a4

下发执行功能优化
添加站点默认值

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

@@ -229,7 +229,7 @@
    { field: 'unit', headerName: '单位', width: 90 },
    { field: 'workQty', headerName: '本次出库数量', width: 110 },
    {
        field: 'staNo',
        field: 'siteNo',
        headerName: '出库口',
        width: 90,
        type: 'singleSelect',
@@ -296,7 +296,10 @@
        >
            {staNos.map((option) => {
                return (
                    <MenuItem key={option} value={option.staNo}>
                    <MenuItem
                        key={option}
                        value={option.staNo}
                    >
                        <ListItemText sx={{ overflow: 'hidden' }} primary={option.staNo} />
                    </MenuItem>
                );

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

@@ -5,12 +5,14 @@
import io.swagger.annotations.ApiOperation;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import lombok.experimental.Delegate;

import java.util.List;


@Data
@Accessors(chain = true)
public class OrderOutItemDto {


@@ -19,6 +21,8 @@

    private List<staListDto> staNos;

    private String siteNo;

    @Data
    public static class staListDto{
        private String staNo;

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

@@ -28,6 +28,7 @@
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

import com.vincent.rsf.server.manager.enums.WaveRuleType;

/**
@@ -368,6 +369,7 @@
        }
        return R.ok();
    }

    /**
     * @param
     * @return
@@ -464,11 +466,14 @@
                        locItem.setWorkQty(issued.doubleValue() >= locItem.getAnfme() ? locItem.getAnfme() : issued.doubleValue());
                        OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
                        orderOutItemDto.setLocItem(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)
                        );
                        if (!deviceSites.isEmpty()) {
                            DeviceSite deviceSite = deviceSites.stream().findFirst().get();
                            orderOutItemDto.setSiteNo(deviceSite.getSite());
                        }
                        List<OrderOutItemDto.staListDto> maps = new ArrayList<>();
                        for (DeviceSite sta : deviceSites) {
                            OrderOutItemDto.staListDto staListDto = new OrderOutItemDto.staListDto();