From 328c07b9d166ede675ecde0aeaae00c4a119824e Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期一, 09 六月 2025 15:23:06 +0800 Subject: [PATCH] # --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 25 ++++++++++--------------- rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java | 7 ++++--- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java | 5 ++--- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java index 8940c25..823b303 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java @@ -84,9 +84,10 @@ if (Objects.isNull(param)) { return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } - param.setType(Constants.TASK_TYPE_OUT_STOCK); - - return locItemService.generateTask(param, getLoginUserId()); + return R.ok(param); +// param.setType(Constants.TASK_TYPE_OUT_STOCK); +// +// return locItemService.generateTask(param, getLoginUserId()); } 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 bb48d74..17feb1e 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 @@ -2,7 +2,6 @@ import com.vincent.rsf.server.manager.entity.LocItem; import com.vincent.rsf.server.manager.utils.Synchro; -import io.swagger.annotations.ApiOperation; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -15,8 +14,7 @@ @Accessors(chain = true) public class OrderOutItemDto { - - @Delegate(excludes = Synchro.class) + @Delegate(types = LocItem.class) private LocItem locItem; private List<staListDto> staNos; @@ -29,6 +27,7 @@ private String staName; } + public void sync(Object source) { Synchro.Copy(source, this); } 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 1194ff4..dbe8343 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,7 +28,6 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; - import com.vincent.rsf.server.manager.enums.WaveRuleType; /** @@ -369,7 +368,6 @@ } return R.ok(); } - /** * @param * @return @@ -402,26 +400,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()); @@ -434,11 +432,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) ); @@ -460,20 +458,17 @@ 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