From ecf0bb23387e5d33d5c802fa21bb9f84089d3567 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期三, 19 十一月 2025 18:41:26 +0800
Subject: [PATCH] 齣庫功能優化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 157 ++++++++++++++++++++++------------------------------
1 files changed, 66 insertions(+), 91 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 1d89aaa..c836f3e 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
@@ -11,17 +11,25 @@
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.StockItemServiceImpl;
+import com.vincent.rsf.server.manager.service.impl.StockServiceImpl;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.entity.FieldsItem;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.service.impl.FieldsItemServiceImpl;
import com.vincent.rsf.server.system.service.impl.FieldsServiceImpl;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import com.vincent.rsf.server.system.utils.SystemAuthUtils;
import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
@@ -50,6 +58,10 @@
private FieldsItemService fieldsItemService;
@Autowired
private FieldsService fieldsService;
+ @Autowired
+ private StockService stockService;
+ @Autowired
+ private StockItemServiceImpl stockItemService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -113,8 +125,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());
@@ -240,8 +252,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)) {
@@ -260,7 +272,7 @@
}
Double summed = items.stream().mapToDouble(TaskItem::getAnfme).sum();
//鍔犱笂鍘嗗彶鎷ｆ枡鏁伴噺
- Double pickQty = Math.round((orderItem.getQty() + summed) * 10000) / 10000.0;
+ Double pickQty = Math.round((orderItem.getQty() + summed) * 100) / 100.0;
if (pickQty.compareTo(orderItem.getAnfme()) > 0.0) {
throw new CoolException("鎾鏁伴噺涓嶈兘瓒呭嚭璁㈠崟闇�姹傛暟閲�");
}
@@ -270,12 +282,41 @@
throw new CoolException("鍑哄簱鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
}
+ Stock stock = new Stock();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
+ }
+ Double sum = taskItems.stream().mapToDouble(TaskItem::getAnfme).sum();
+ stock.setCode(ruleCode)
+ .setUpdateBy(SystemAuthUtils.getLoginUserId())
+ .setBarcode(task.getBarcode())
+ .setLocCode(task.getOrgLoc())
+ .setType(order.getType())
+ .setWkType(Short.parseShort(order.getWkType()))
+ .setSourceId(orderItem.getOrderId())
+ .setSourceCode(orderItem.getOrderCode())
+ .setUpdateTime(new Date())
+ .setAnfme(sum);
+
+ if (!stockService.save(stock)) {
+ throw new CoolException("鍑哄叆搴撳巻鍙蹭繚瀛樺け璐ワ紒锛�");
+ }
+
+ List<StockItem> stockItems = new ArrayList<>();
items.forEach(taskItem -> {
- taskItem.setQty(taskItem.getAnfme());
+ taskItem.setQty(taskItem.getAnfme()).setOrderId(order.getId()).setOrderItemId(orderItem.getId());
if (!taskItemService.updateById(taskItem)) {
throw new CoolException("鐘舵�佸畬鎴愬け璐ワ紒锛�");
}
+ StockItem stockItem = new StockItem();
+ BeanUtils.copyProperties(taskItem, stockItem);
+ stockItem.setStockId(stock.getId()).setStockCode(stock.getCode()).setSourceItemId(orderItem.getId());
+ stockItems.add(stockItem);
});
+ if (!stockItemService.saveBatch(stockItems)) {
+ throw new CoolException("鍑哄叆搴撳巻鍙叉槑缁嗕繚瀛樺け璐ワ紒锛�");
+ }
});
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, params.getOrderId()));
@@ -286,15 +327,15 @@
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
@@ -318,8 +359,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()));
@@ -329,84 +370,18 @@
}
});
- orderItems.forEach(orderItem -> {
- try {
- taskService.saveOutStockItem(taskItems, orderItem, null, null, SystemAuthUtils.getLoginUserId());
- } catch (Exception e) {
- throw new RuntimeException(e);
+ 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("浠诲姟鐘舵�佹洿鏂板け璐�");
+ }
}
- });
-
-// 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("浠诲姟鐘舵�佹洿鏂板け璐�");
+ } catch (Exception e) {
+ throw new CoolException("鍒嗘弨澶辫触");
}
-
return R.ok();
}
--
Gitblit v1.9.1