From 2a125d08bd4437dbf0e93f2d25ea196715ce82a4 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 09 六月 2025 14:21:38 +0800 Subject: [PATCH] 下发执行功能优化 添加站点默认值 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 25 +++++++++++++++---------- rsf-admin/src/page/orders/outStock/OutStockPublic.jsx | 9 ++++++--- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java | 4 ++++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx index 9db27fa..5b60940 100644 --- a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx +++ b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx @@ -189,7 +189,7 @@ //鎻愪氦鎸夐挳 const SubmitButton = ({ selectedIds, setSelectedIds }) => { const submit = () => { - if (selectedIds.length < 1) {return} + if (selectedIds.length < 1) { return } console.log(selectedIds); } @@ -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> ); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java index 1bc5980..bb48d74 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java +++ b/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; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java index dbe8343..1194ff4 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java +++ b/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 @@ -400,26 +402,26 @@ @Override public R getOrderOutTaskItem(OrderOutTaskParam param) { - if (Cools.isEmpty(param.getWaveId())){ + if (Cools.isEmpty(param.getWaveId())) { throw new CoolException("绛栫暐鍙傛暟涓虹┖"); } - if (Cools.isEmpty(param.getOrderId())){ + 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)){ + if (Cools.isEmpty(waveRule)) { throw new CoolException("鏈壘鍒板綋鍓嶇瓥鐣�"); } List<OrderOutItemDto> locItems = null; if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) { - locItems = efficiencyFirst(param.getOrderId()); + 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){ + private List<LocItem> getEfficiencyFirstItemList(AsnOrderItem asnOrderItem) { QueryWrapper<LocItem> locItemQueryWrapper = new QueryWrapper<>(); locItemQueryWrapper.eq("matnr_code", asnOrderItem.getMatnrCode()); locItemQueryWrapper.eq("batch", asnOrderItem.getSplrBatch()); @@ -432,11 +434,11 @@ ); locItemQueryWrapper.apply(applySql); List<LocItem> locItems = locItemService.list(locItemQueryWrapper); - locItems.sort((s1,s2)-> LocUtils.isShallowLoc(s1.getLocCode())?-1:0); + locItems.sort((s1, s2) -> LocUtils.isShallowLoc(s1.getLocCode()) ? -1 : 0); return locItems; } - private List<OrderOutItemDto> efficiencyFirst(Long orderId){ + private List<OrderOutItemDto> efficiencyFirst(Long orderId) { List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>() .eq(AsnOrderItem::getAsnId, orderId) ); @@ -458,17 +460,20 @@ 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){ + if (issued.doubleValue() > 0) { ExistDto existDto = new ExistDto().setBatch(locItem.getBatch()).setMatnr(locItem.getMatnrCode()).setLocNo(locItem.getLocCode()); - if (existDtos.add(existDto)){ + if (existDtos.add(existDto)) { 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(); -- Gitblit v1.9.1