From 225018d0b2e66c2066c83dfbc0d6701593ddac9a Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 05 三月 2026 10:02:39 +0800
Subject: [PATCH] #备货
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 440 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 354 insertions(+), 86 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 2d4054d..8de9724 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -1,29 +1,32 @@
package com.vincent.rsf.server.api.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.api.entity.dto.ContainerWaveDto;
+import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
+import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.common.constant.Constants;
+import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.TaskResouceType;
-import com.vincent.rsf.server.manager.enums.TaskStsType;
-import com.vincent.rsf.server.manager.enums.WaveExceStatus;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.Synchronized;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -41,20 +44,32 @@
private AsnOrderItemService asnOrderItemService;
@Autowired
private WaveOrderRelaService waveOrderRelaService;
+ @Autowired
+ private BasStationService basStationService;
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private BasContainerServiceImpl basContainerService;
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
@Override
public R getOutStockTaskItem(String barcode) {
LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Task::getBarcode, barcode);
- Task task = taskService.getOne(lambdaQueryWrapper);
- if (null == task){
+ Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));
+ if (null == task) {
return R.error("鏈煡璇㈠埌鐩稿叧浠诲姟");
}
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
- if (null == taskItems || taskItems.size() <= 0){
+ List<TaskItem> taskItems = taskItemService
+ .list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (null == taskItems || taskItems.size() <= 0) {
return R.error("浠诲姟鍑洪敊锛屾湭鏌ヨ鍒扮浉鍏充换鍔℃槑缁�");
}
-
return R.ok(taskItems);
}
@@ -63,23 +78,24 @@
public R saveOutTaskSts(String barcode) {
LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Task::getBarcode, barcode);
- Task task = taskService.getOne(lambdaQueryWrapper);
- if (null == task){
+ Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));
+ if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)){
+ if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
}
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ List<TaskItem> taskItems = taskItemService
+ .list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
Map<Long, List<TaskItem>> maps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
maps.keySet().forEach(key -> {
- AsnOrderItem orderItem = asnOrderItemService.getById(key);
- if (Objects.isNull(orderItem)) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
- }
+ WkOrderItem orderItem = asnOrderItemService.getById(key);
+ if (Objects.isNull(orderItem)) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
});
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
- if (!taskService.updateById(task)){
+ if (!taskService.updateById(task)) {
return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
}
@@ -87,9 +103,192 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public R containerRebinding(PdaGeneralParam param, Long userId) {
+ if (Cools.isEmpty(param.getContainerNo())) {
+ throw new CoolException("鏃犲鍣ㄥ彿");
+ }
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, param.getContainerNo()));
+ if (null == task) {
+ throw new CoolException("鏈壘鍒颁换鍔�");
+ }
+ if (!task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)) {
+ throw new CoolException("褰撳墠鎵樼洏涓嶆槸澶囪揣鍑哄簱浠诲姟");
+ }
+ if (Cools.isEmpty(param.getTaskItemList())) {
+ throw new CoolException("浠诲姟鏄庣粏涓虹┖");
+ }
+
+ WaitPakin waitPakin = waitPakinService
+ .getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, param.getNewContainerNo()));
+ if (Cools.isEmpty(waitPakin)) {
+ WaitPakin waitPakin1 = new WaitPakin();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAIT_PAKIN_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�");
+ }
+ waitPakin1.setCode(ruleCode)
+ .setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_HOLD.val)
+ .setAnfme(param.getTaskItemList().stream()
+ .map(TaskItem::getInputQty)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add)
+ .doubleValue())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
+ .setBarcode(param.getNewContainerNo());
+ if (!waitPakinService.save(waitPakin1)) {
+ throw new CoolException("缁勬墭涓诲崟淇濆瓨澶辫触锛侊紒");
+ }
+ List<WaitPakinItem> items = new ArrayList<>();
+ for (TaskItem taskItem : param.getTaskItemList()) {
+ WaitPakinItem pakinItem = new WaitPakinItem();
+ pakinItem.setAnfme(taskItem.getInputQty().doubleValue())
+ .setPakinId(waitPakin1.getId())
+ .setSource(taskItem.getId())
+ .setAsnId(taskItem.getSourceId())
+ .setAsnCode(taskItem.getSourceCode())
+ .setAsnItemId(taskItem.getSource())
+ .setIsptResult(taskItem.getIsptResult())
+ .setPlatItemId(taskItem.getPlatItemId())
+ .setPlatOrderCode(taskItem.getPlatOrderCode())
+ .setPlatWorkCode(taskItem.getPlatWorkCode())
+ .setProjectCode(taskItem.getProjectCode())
+ .setBatch(taskItem.getSplrBatch())
+ .setUnit(taskItem.getUnit())
+ .setFieldsIndex(taskItem.getFieldsIndex())
+ .setMatnrId(taskItem.getMatnrId())
+ .setMaktx(taskItem.getMaktx())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
+ .setMatnrCode(taskItem.getMatnrCode());
+ WkOrder order = asnOrderService.getById(taskItem.getSourceId());
+ if (!Objects.isNull(order)) {
+ pakinItem.setType(null == order.getType() ? null : order.getType())
+ .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
+ }
+ items.add(pakinItem);
+ }
+ if (!waitPakinItemService.saveBatch(items)) {
+ throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ } else {
+ double sum = param.getTaskItemList().stream()
+ .map(TaskItem::getInputQty)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add)
+ .doubleValue();
+ waitPakin
+ .setAnfme(waitPakin.getAnfme() + sum)
+ .setUpdateBy(userId)
+ .setCreateBy(userId);
+ if (!waitPakinService.updateById(waitPakin)) {
+ throw new CoolException("缁勬墭涓诲崟淇濆瓨澶辫触锛侊紒");
+ }
+ List<WaitPakinItem> existPakinItems = waitPakinItemService
+ .list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
+ List<WaitPakinItem> items = new ArrayList<>();
+ for (TaskItem taskItem : param.getTaskItemList()) {
+ Optional<WaitPakinItem> optionalItem = existPakinItems.stream()
+ .filter(e -> Objects.equals(e.getMatnrCode(), taskItem.getMatnrCode())
+ && Objects.equals(e.getBatch(), taskItem.getSplrBatch())
+ && Objects.equals(e.getPlatWorkCode(), taskItem.getPlatWorkCode())
+ && Objects.equals(e.getPlatItemId(), taskItem.getPlatItemId())
+ )
+ .findFirst();
+
+ if (optionalItem.isPresent()) {
+ WaitPakinItem existItem = optionalItem.get();
+ existItem.setAnfme(existItem.getAnfme() + taskItem.getInputQty().doubleValue())
+ .setUpdateBy(userId);
+ if (!items.contains(existItem)) {
+ items.add(existItem);
+ }
+ } else {
+ WaitPakinItem pakinItem = new WaitPakinItem();
+ pakinItem.setAnfme(taskItem.getInputQty().doubleValue())
+ .setPakinId(waitPakin.getId())
+ .setSource(taskItem.getId())
+ .setAsnId(taskItem.getSourceId())
+ .setAsnCode(taskItem.getSourceCode())
+ .setAsnItemId(taskItem.getSource())
+ .setIsptResult(taskItem.getIsptResult())
+ .setPlatItemId(taskItem.getPlatItemId())
+ .setPlatOrderCode(taskItem.getPlatOrderCode())
+ .setPlatWorkCode(taskItem.getPlatWorkCode())
+ .setProjectCode(taskItem.getProjectCode())
+ .setBatch(taskItem.getSplrBatch())
+ .setUnit(taskItem.getUnit())
+ .setFieldsIndex(taskItem.getFieldsIndex())
+ .setMatnrId(taskItem.getMatnrId())
+ .setMaktx(taskItem.getMaktx())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
+ .setMatnrCode(taskItem.getMatnrCode());
+ WkOrder order = asnOrderService.getById(taskItem.getSourceId());
+ if (!Objects.isNull(order)) {
+ pakinItem.setType(null == order.getType() ? null : order.getType())
+ .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
+ }
+ items.add(pakinItem);
+ existPakinItems.add(pakinItem);
+ }
+ }
+ if (!waitPakinItemService.saveOrUpdateBatch(items)) {
+ throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ }
+
+ Map<Long, BigDecimal> taskItemInputQtyMap = param.getTaskItemList().stream()
+ .filter(Objects::nonNull)
+ .filter(e -> !Objects.isNull(e.getId()))
+ .collect(Collectors.toMap(TaskItem::getId,
+ e -> Objects.isNull(e.getInputQty()) ? BigDecimal.ZERO : e.getInputQty(),
+ BigDecimal::add));
+ if (taskItemInputQtyMap.isEmpty()) {
+ throw new CoolException("浠诲姟鏄庣粏鍙傛暟閿欒");
+ }
+ List<TaskItem> toUpdateTaskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
+ .eq(TaskItem::getTaskId, task.getId())
+ .in(TaskItem::getId, taskItemInputQtyMap.keySet()));
+ if (Cools.isEmpty(toUpdateTaskItems) || toUpdateTaskItems.size() != taskItemInputQtyMap.size()) {
+ throw new CoolException("鏈壘鍒板搴斾换鍔℃槑缁�");
+ }
+ toUpdateTaskItems.forEach(item -> {
+ double currentWorkQty = Objects.isNull(item.getWorkQty()) ? 0D : item.getWorkQty();
+ BigDecimal inputQty = taskItemInputQtyMap.getOrDefault(item.getId(), BigDecimal.ZERO);
+ item.setWorkQty(BigDecimal.valueOf(currentWorkQty).add(inputQty).doubleValue())
+ .setUpdateBy(userId);
+ });
+ if (!taskItemService.updateBatchById(toUpdateTaskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏鏇存柊澶辫触");
+ }
+
+ return R.ok();
+ }
+
+ @Override
+ public R taskItemList(PdaGeneralParam param, Long loginUserId) {
+ if (Cools.isEmpty(param.getContainerNo())) {
+ throw new CoolException("鏃犲鍣ㄥ彿");
+ }
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, param.getContainerNo()));
+ if (null == task) {
+ throw new CoolException("鏈壘鍒颁换鍔�");
+ }
+ if (!task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)) {
+ throw new CoolException("褰撳墠鎵樼洏涓嶆槸澶囪揣鍑哄簱浠诲姟");
+ }
+ List<TaskItem> taskItems = taskItemService
+ .list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+
+ return R.ok(taskItems);
+ }
+
+ @Override
public R getWaveListItem(String barcode) {
LambdaQueryWrapper<Wave> lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(!Cools.isEmpty(barcode),Wave::getCode,barcode);
+ lambdaQueryWrapper.eq(!Cools.isEmpty(barcode), Wave::getCode, barcode);
List<Wave> waveList = waveService.list(lambdaQueryWrapper);
return R.ok(waveList);
}
@@ -98,45 +297,47 @@
public R getContainerWaveList(Map<String, String> map) {
String barcode = map.get("barcode");
- if (Cools.isEmpty(barcode) ){
+ if (Cools.isEmpty(barcode)) {
throw new CoolException("鍙傛暟鏈夎");
}
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode));
- if (null == task){
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode).last("limit 1"));
+ if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)){
+ if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
}
ArrayList<ContainerWaveDto> containerWaveDtos = new ArrayList<>();
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ List<TaskItem> taskItems = taskItemService
+ .list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
for (TaskItem taskItem : taskItems) {
ContainerWaveDto containerWaveDto = new ContainerWaveDto();
containerWaveDto.setTaskItem(taskItem);
Wave wave = waveService.getById(taskItem.getSourceId());
- if (null == wave){
+ if (null == wave) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲娉㈡");
}
- List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>().eq(WaveOrderRela::getWaveId, wave.getId()));
- if (Cools.isEmpty(waveOrderRelas)){
+ List<WaveOrderRela> waveOrderRelas = waveOrderRelaService
+ .list(new LambdaQueryWrapper<WaveOrderRela>().eq(WaveOrderRela::getWaveId, wave.getId()));
+ if (Cools.isEmpty(waveOrderRelas)) {
throw new CoolException("娉㈡瀵瑰簲鍏宠仈鍗曟湭鎵惧埌");
}
- List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
- ArrayList<AsnOrderItem> list = new ArrayList<>();
- List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
- for (AsnOrder asnOrder : asnOrderList) {
- AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, asnOrder.getId())
- .eq(AsnOrderItem::getMatnrCode, taskItem.getMatnrCode())
- .eq(AsnOrderItem::getSplrBatch, taskItem.getBatch())
+ Set<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
+ ArrayList<WkOrderItem> list = new ArrayList<>();
+ List<WkOrder> wkOrderList = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
+ for (WkOrder wkOrder : wkOrderList) {
+ List<WkOrderItem> orderItem = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, wkOrder.getId())
+ .eq(StringUtils.isNotEmpty(taskItem.getMatnrCode()), WkOrderItem::getMatnrCode,
+ taskItem.getMatnrCode())
+ // .eq(StringUtils.isNotEmpty(taskItem.getBatch()), WkOrderItem::getSplrBatch,
+ // taskItem.getBatch())
);
- if (null != orderItem){
- list.add(orderItem);
+ if (null != orderItem) {
+ list.addAll(orderItem);
}
-
-
}
- containerWaveDto.setAsnOrderItems(list);
+ containerWaveDto.setWkOrderItems(list);
containerWaveDtos.add(containerWaveDto);
}
@@ -147,87 +348,154 @@
@Transactional(rollbackFor = Exception.class)
@Synchronized
public R saveWavePick(ContainerWaveParam containerWaveParam, Long loginUserId) {
- if (null == containerWaveParam || containerWaveParam.getContainerWaveDtos().size() <= 0){
+ if (null == containerWaveParam || containerWaveParam.getContainerWaveDtos().size() <= 0) {
return R.error("鍙傛暟閿欒");
}
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode,containerWaveParam.getContainer()));
- if (null == task){
+ Task task = taskService.getOne(
+ new LambdaQueryWrapper<Task>().eq(Task::getBarcode, containerWaveParam.getContainer()).last("limit 1"));
+ if (null == task) {
return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)){
+ if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
}
for (ContainerWaveDto containerWaveDto : containerWaveParam.getContainerWaveDtos()) {
- //鍋氫竴娆℃牎楠岋紝鍒ゆ柇鍓嶇鎵�鏈夊嚭搴撴暟閲忔槸鍚﹁秴杩囨湰鎵樺嚭搴撴暟閲�
- double sum = containerWaveDto.getAsnOrderItems().stream().mapToDouble(AsnOrderItem::getDemandQty).sum();
+ // 鍋氫竴娆℃牎楠岋紝鍒ゆ柇鍓嶇鎵�鏈夊嚭搴撴暟閲忔槸鍚﹁秴杩囨湰鎵樺嚭搴撴暟閲�
+ double sum = containerWaveDto.getWkOrderItems().stream().mapToDouble(WkOrderItem::getDemandQty).sum();
BigDecimal total = new BigDecimal(String.valueOf(sum));
BigDecimal anfme = new BigDecimal(containerWaveDto.getTaskItem().getAnfme().toString());
- if (!anfme.equals(total)){
+ if (!anfme.equals(total)) {
throw new CoolException("鎾鏁伴噺涓嶇瓑浜庡鍣ㄥ嚭搴撴暟閲忥紝璇锋鏌�");
}
- for (AsnOrderItem oldOrderItem : containerWaveDto.getAsnOrderItems()) {
- AsnOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
- if (Double.compare(orderItem.getDemandQty(), 0.0) == 0) {
+ for (WkOrderItem oldOrderItem : containerWaveDto.getWkOrderItems()) {
+ if (Double.compare(oldOrderItem.getDemandQty(), 0.0) == 0) {
continue;
}
- BigDecimal num = new BigDecimal(orderItem.getWorkQty().toString()).subtract(new BigDecimal(orderItem.getQty().toString()));
- BigDecimal orderDemandQty = new BigDecimal(orderItem.getDemandQty().toString());
- if (num.compareTo(orderDemandQty) < 0){
+ WkOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
+ BigDecimal num = new BigDecimal(orderItem.getWorkQty().toString())
+ .subtract(new BigDecimal(orderItem.getQty().toString()));
+ BigDecimal orderDemandQty = new BigDecimal(oldOrderItem.getDemandQty().toString());
+ if (num.compareTo(orderDemandQty) < 0) {
throw new CoolException("鎾鏁伴噺澶т簬鍗曟嵁鍑哄簱鏁伴噺锛岃妫�鏌�");
}
+ WkOrder wkOrder = asnOrderService.getById(orderItem.getOrderId());
+ if (Cools.isEmpty(wkOrder)) {
+ throw new CoolException("鍑哄簱鍗曚富鍗曟湭鎵惧埌");
+ }
+ wkOrder.setQty(new BigDecimal(wkOrder.getQty().toString()).add(orderDemandQty).doubleValue());
+ if (!asnOrderService.updateById(wkOrder)) {
+ throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
+ }
orderItem.setQty(new BigDecimal(orderItem.getQty().toString()).add(orderDemandQty).doubleValue());
- if (!asnOrderItemService.updateById(orderItem)){
+ if (!asnOrderItemService.updateById(orderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏鏇存柊澶辫触");
}
- //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
+ // 妫�鏌ュ崟鎹槸鍚﹀畬鎴�
Boolean orderChecked = checkOrderComplete(orderItem);
- if (orderChecked){
- AsnOrder asnOrder = asnOrderService.getById(orderItem.getAsnId());
- if (Cools.isEmpty(asnOrder)){
- throw new CoolException("鍑哄簱鍗曚富鍗曟湭鎵惧埌");
- }
- asnOrder.setQty(new BigDecimal(asnOrder.getQty().toString()).add(orderDemandQty).doubleValue());
- asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
- if (!asnOrderService.updateById(asnOrder)){
+ if (orderChecked) {
+ wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+ if (!asnOrderService.updateById(wkOrder)) {
throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
}
}
}
- //妫�鏌ユ尝娆℃槸鍚﹀畬鎴�
-// Boolean waveChecked = checkWaveComplete(containerWaveDto.getTaskItem());
-// if (waveChecked){
-// Wave wave = waveService.getById(containerWaveDto.getTaskItem().getSourceId());
-// if (null == wave){
-// throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲娉㈡");
-// }
-// wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_TASK.val);
-// if (!waveService.updateById(wave)){
-// throw new CoolException("娉㈡鍗曟洿鏂扮姸鎬佸け璐�");
-// }
-// }
+ // 妫�鏌ユ尝娆℃槸鍚﹀畬鎴�
+ // Boolean waveChecked = checkWaveComplete(containerWaveDto.getTaskItem());
+ // if (waveChecked){
+ // Wave wave =
+ // waveService.getById(containerWaveDto.getTaskItem().getSourceId());
+ // if (null == wave){
+ // throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲娉㈡");
+ // }
+ // wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_TASK.val);
+ // if (!waveService.updateById(wave)){
+ // throw new CoolException("娉㈡鍗曟洿鏂扮姸鎬佸け璐�");
+ // }
+ // }
}
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
- if (!taskService.updateById(task)){
+ if (!taskService.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
}
-
return R.ok();
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @Synchronized
+ public R callForEmptyContainers(CallForEmptyContainersParam containerWaveParam, Long loginUserId) {
+ // 鍙傛暟鏍￠獙
+ if (Objects.isNull(containerWaveParam) || StringUtils.isEmpty(containerWaveParam.getStaNo())) {
+ throw new CoolException("鍙傛暟閿欒锛岀珯鐐瑰彿涓嶈兘涓虹┖");
+ }
+ // 1. 绔欑偣淇℃伅鍒ゆ柇 - 缁堢偣
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, containerWaveParam.getStaNo())
+ .orderByDesc(BasStation::getId)
+ .last("LIMIT 1"));
+ if (Objects.isNull(basStation)) {
+ throw new CoolException(containerWaveParam.getStaNo() + "绔欑偣涓嶅瓨鍦紒锛�");
+ }
+ if (!basStation.getUseStatus().equals("O")) {
+ throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
+ }
+
+ List<Long> areaList = basStation.getCrossZoneArea();
+ if (Cools.isEmpty(areaList)) {
+ throw new CoolException("褰撳墠绔欑偣搴撳尯鏈厤缃�");
+ }
+
+ BasContainer basContainer = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>()
+ .in(BasContainer::getContainerType, containerWaveParam.getType(), false).last("limit 1"));
+ if (Cools.isEmpty(basContainer)) {
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧瀹瑰櫒瑙勫垯");
+ }
+ String barcodeType = "barcode REGEXP '" + basContainer.getCodeType() + "'";
+ // 瀹瑰櫒绫诲瀷鏌ヨ 璧风偣
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .apply(barcodeType)
+ .eq(Loc::getDeleted, 0)
+ .eq(Loc::getStatus, 1)
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type)
+ .in(Loc::getAreaId, areaList)
+ .orderByDesc(Loc::getId)
+ .last("LIMIT 1"),
+ false);
+
+ if (Cools.isEmpty(loc)) {
+ throw new CoolException("鏈煡璇㈠埌绗﹀悎鏉′欢鐨勬墭鐩�");
+ }
+ // 鐢熸垚浠诲姟鍙傛暟
+ LocToTaskParams locToTaskParams = new LocToTaskParams();
+ locToTaskParams.setType(Constants.TASK_TYPE_OUT_STOCK_EMPTY)
+ .setSiteNo(basStation.getStationName())
+ .setOrgLoc(loc.getId().toString());
+ try {
+ locItemService.generateTaskEmpty(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, locToTaskParams, loginUserId,
+ containerWaveParam.getTaskNo());
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ return R.ok();
+ }
private Boolean checkWaveComplete(TaskItem taskItem) {
Wave wave = waveService.getById(taskItem.getSourceId());
- List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWaveId, wave.getId()));
- return asnOrderList.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
+ List<WkOrder> wkOrderList = asnOrderService
+ .list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getWaveId, wave.getId()));
+ return wkOrderList.stream().allMatch(
+ item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
}
- private Boolean checkOrderComplete(AsnOrderItem orderItem) {
- List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, orderItem.getAsnCode()));
- return asnOrderItems.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
+ private Boolean checkOrderComplete(WkOrderItem orderItem) {
+ List<WkOrderItem> wkOrderItems = asnOrderItemService
+ .list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()));
+ return wkOrderItems.stream().allMatch(
+ item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
}
}
--
Gitblit v1.9.1