From a572f1428af7a5d6eeaf973363c33785ea182bd3 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 21 十一月 2025 17:19:31 +0800
Subject: [PATCH] 换绑功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 204 ++++++++++++++++++++++++++++----------------------
1 files changed, 115 insertions(+), 89 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 bda98ee..b9a4f10 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
@@ -8,10 +8,13 @@
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.WavePickItemsParams;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.LocItemWorkingServiceImpl;
import com.vincent.rsf.server.manager.service.impl.StockItemServiceImpl;
import com.vincent.rsf.server.manager.service.impl.StockServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -61,6 +64,10 @@
private StockService stockService;
@Autowired
private StockItemServiceImpl stockItemService;
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private LocItemWorkingService locItemWorkingService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -74,7 +81,6 @@
if (null == taskItems || taskItems.size() <= 0) {
return R.error("浠诲姟鍑洪敊锛屾湭鏌ヨ鍒扮浉鍏充换鍔℃槑缁�");
}
-
return R.ok(taskItems);
}
@@ -124,8 +130,8 @@
if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
- return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄弨鏂欑媭鎱�");
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet());
@@ -251,8 +257,8 @@
if (null == task) {
return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
- return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄弨鏂欑媭鎱�");
}
WkOrder order = asnOrderService.getById(params.getOrderId());
if (Objects.isNull(order)) {
@@ -325,12 +331,98 @@
if (!asnOrderService.updateById(order)) {
throw new CoolException("璁㈠崟鏁伴噺鏇存柊澶辫触锛侊紒");
}
- //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
- if (order.getAnfme().compareTo(order.getQty()) == 0) {
- order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
+// //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
+// if (order.getAnfme().compareTo(order.getQty()) == 0) {
+// order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+// if (!asnOrderService.updateById(order)) {
+// throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
+// }
+// }
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/11/19
+ * @description: 鑾峰彇鍑哄簱浠诲姟鎷ｈ揣鏄庣粏
+ * @version 1.0
+ */
+ @Override
+ public R getTaskItems(Map<String, String> params) {
+ if (Objects.isNull(params.get("barcode"))) {
+ throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ List<Integer> integers = Arrays.asList(TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type);
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskType, integers)
+ .eq(Task::getBarcode, params.get("barcode")), false);
+ if (Objects.isNull(task)) {
+ return R.error("鎵樼洏鎵�鍦ㄤ换鍔′笉瀛樺湪锛侊紒");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ taskItems.forEach(taskItem -> {
+ if (!Objects.isNull(taskItem.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(taskItem.getFieldsIndex());
+ taskItem.setExtendFields(fields);
}
+ });
+ return R.ok().add(taskItems);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/11/19
+ * @description: 淇敼鍑哄簱浠诲姟妗ｆ槑缁嗙エ鍙�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R modifyTaskItem(List<TaskItem> items) {
+ if (Objects.isNull(items) || items.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ for (TaskItem item : items) {
+ if (Objects.isNull(item.getCrushNo())) {
+ continue;
+ }
+ TaskItem byId = taskItemService.getById(item.getId());
+ if (!Objects.isNull(byId.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(byId.getFieldsIndex());
+ byId.setExtendFields(fields);
+ }
+ if (byId.getExtendFields().get("crushNo").equals(item.getCrushNo())) {
+ continue;
+ }
+ FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>()
+ .eq(FieldsItem::getValue, item.getCrushNo())
+ .last("limit 1"));
+ if (Objects.isNull(fieldsItem)) {
+ throw new CoolException("搴撳瓨涓嶅瓨鍦�!!");
+ }
+ String uuid = fieldsItem.getUuid();
+ item.setFieldsIndex(uuid).setExtendFields(null);
+ if (!taskItemService.updateById(item)) {
+ throw new CoolException("浠诲姟鏄庣粏淇敼澶辫触");
+ }
+ LocItemWorking oldOne = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
+ .eq(LocItemWorking::getMatnrCode, byId.getMatnrCode())
+ .eq(LocItemWorking::getFieldsIndex, byId.getFieldsIndex()));
+ if (Objects.isNull(oldOne)) {
+ throw new CoolException("鏄庣粏涓嶅瓨鍦ㄦ垨宸插嚭搴擄紒锛�");
+ }
+ LocItemWorking one = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
+ .eq(LocItemWorking::getMatnrCode, byId.getMatnrCode())
+ .eq(LocItemWorking::getFieldsIndex, uuid));
+ if (Objects.isNull(one)) {
+ throw new CoolException("鏄庣粏涓嶅瓨鍦ㄦ垨宸插嚭搴擄紒锛�");
+ }
+ one.setWorkQty(oldOne.getWorkQty());
+ oldOne.setWorkQty(0.0);
+
+ //鏇存柊搴撲綅淇℃伅
+ locItemWorkingService.updateById(oldOne);
+ locItemWorkingService.updateById(one);
+
}
return R.ok();
}
@@ -358,8 +450,8 @@
if (null == task) {
return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
- return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
+ if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
+ return R.error("浠诲姟鐘舵�佷笉鏄緟鎻�鐙�鎱�");
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
@@ -369,84 +461,18 @@
}
});
-// orderItems.forEach(orderItem -> {
-// try {
-// taskService.saveOutStockItem(taskItems, orderItem, null, null, SystemAuthUtils.getLoginUserId());
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
-// });
-
-// containerWaveParam.getOrderItems().forEach(orderItem -> {
-//
-// });
-// for (ContainerWaveDto containerWaveDto : containerWaveParam.getContainerWaveDtos()) {
-// //鍋氫竴娆℃牎楠岋紝鍒ゆ柇鍓嶇鎵�鏈夊嚭搴撴暟閲忔槸鍚﹁秴杩囨湰鎵樺嚭搴撴暟閲�
-// 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)) {
-// throw new CoolException("鎾鏁伴噺涓嶇瓑浜庡鍣ㄥ嚭搴撴暟閲忥紝璇锋鏌�");
-// }
-// for (WkOrderItem oldOrderItem : containerWaveDto.getWkOrderItems()) {
-// if (Double.compare(oldOrderItem.getDemandQty(), 0.0) == 0) {
-// continue;
-// }
-// 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("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
-// }
-//
-// if (Objects.isNull(oldOrderItem.getFieldsIndex())) {
-// throw new CoolException("绁ㄥ彿涓嶈兘涓虹┖锛侊紒");
-// }
-// //Fix 杩欓噷鍙拡瀵瑰笇鏃ラ」鐩殑绁ㄥ彿鍔熻兘锛岀エ鍙峰拰uuid涓轰竴瀵逛竴鐨勬儏鍐碉紝涓嶄細鍑虹幇閲嶅鐨勬儏鍐�
-// FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getValue, oldOrderItem.getFieldsIndex()).last("limit 1"));
-// if (!Objects.isNull(fieldsItem)) {
-// orderItem.setFieldsIndex(fieldsItem.getUuid());
-// }
-// orderItem.setQty(new BigDecimal(orderItem.getQty().toString()).add(orderDemandQty).doubleValue());
-// if (!asnOrderItemService.updateById(orderItem)) {
-// throw new CoolException("鍗曟嵁鏄庣粏鏇存柊澶辫触");
-// }
-// //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
-// Boolean orderChecked = checkOrderComplete(orderItem);
-// 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("娉㈡鍗曟洿鏂扮姸鎬佸け璐�");
-//// }
-//// }
-// }
-
- task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
- if (!taskService.updateById(task)) {
- throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
+ try {
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
+ taskService.pickOrCheckTask(task.getId(), "");
+ } else {
+ task.setTaskStatus(TaskStsType.UPDATED_OUT.id);
+ if (!taskService.updateById(task)) {
+ throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
+ }
+ }
+ } catch (Exception e) {
+ throw new CoolException("鍒嗘嫞澶辫触");
}
-
return R.ok();
}
--
Gitblit v1.9.1