From c69781e2b78ed7a5ffe9b59c0c555f07deabe735 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 07 二月 2026 11:08:48 +0800
Subject: [PATCH] 出库完结
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 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 52a5c8c..67775d1 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
@@ -43,6 +43,7 @@
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.Date;
@Service
public class PdaOutStockServiceImpl implements PdaOutStockService {
@@ -98,7 +99,7 @@
if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
+ if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
@@ -248,7 +249,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R wavePickItems(WavePickItemsParams params) {
+ public synchronized R wavePickItems(WavePickItemsParams params) {
if (Objects.isNull(params.getBarcode())) {
return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
}
@@ -280,10 +281,10 @@
if (Objects.isNull(orderItem)) {
throw new CoolException("鏁版嵁閿欒锛屾嫞鏂欎笉鍦ㄥ崟鎹渶姹備腑锛侊紒");
}
-
+ //taskItems涓烘嫞璐ф槑缁嗭紝浣滃弬鏁颁笂鎶�
Double summed = items.stream().mapToDouble(TaskItem::getAnfme).sum();
//鍔犱笂鍘嗗彶鎷ｆ枡鏁伴噺
- Double pickQty = Math.round((orderItem.getQty() + summed) * 100) / 100.0;
+ Double pickQty = Math.round((orderItem.getQty() + summed) * 1000000) / 1000000.0;
Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_OVER_CHANGE));
//鍒ゆ柇鏄惁鍏佽瓒呮敹锛屼笉鍏佽瓒呮敹娣诲姞鎷掓敹鍒ゆ柇
if (!Objects.isNull(config)) {
@@ -326,20 +327,68 @@
TaskItem item = taskItemService.getById(taskItem.getId());
//鍒ゆ柇鏄惁鍏佽瓒呮敹锛屼笉鍏佽瓒呮敹娣诲姞鎷掓敹鍒ゆ柇
if (!Objects.isNull(config)) {
+ TaskItem serviceOne = taskItemService.getOne(new LambdaQueryWrapper<TaskItem>()
+ .eq(TaskItem::getTaskId, task.getId())
+ .eq(TaskItem::getFieldsIndex, item.getFieldsIndex()));
+ if (Objects.isNull(serviceOne)) {
+ throw new CoolException("缂撳瓨鏁版嵁涓㈠け锛侊紒");
+ }
+ LocItemWorking workItem = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
+ .eq(LocItemWorking::getTaskId, task.getId())
+ .eq(LocItemWorking::getFieldsIndex, item.getFieldsIndex()));
+ if (Objects.isNull(workItem)) {
+ throw new CoolException("缂撳瓨鏁版嵁涓㈠け锛侊紒");
+ }
+ Double v1 = Math.round((workItem.getAnfme() - serviceOne.getQty()) * 1000000) / 1000000.0;
+ //涓嶇鏄惁鍏佽瓒呮敹锛岄兘闇�鍒ゆ柇鏄惁瓒呭嚭搴撳瓨鑼冨洿
+ if (taskItem.getAnfme().compareTo(v1) > 0) {
+ throw new CoolException("鎷ｈ揣鏁伴噺瓒呭嚭褰撳墠绁ㄥ彿搴撳瓨鏁伴噺锛侊紒");
+ }
if (!Boolean.parseBoolean(config.getVal())) {
- if (item.getAnfme().compareTo(item.getQty() + taskItem.getAnfme()) < 0.0) {
+ Double v = Math.round((item.getQty() + taskItem.getAnfme()) * 1000000) / 1000000.0;
+ if (item.getAnfme().compareTo(v) < 0.0) {
throw new CoolException("鍓嶅綋鐗╂枡宸茶秴鍑哄彲鎷ｈ寖鍥达紝璇锋牳瀵瑰悗鍐嶆搷浣滐紒锛�");
}
}
}
- item.setQty(item.getQty() + taskItem.getAnfme()).setOrderId(order.getId()).setOrderItemId(orderItem.getId());
+ Double picQty = Math.round((item.getQty() + taskItem.getAnfme()) * 1000000) / 1000000.0;
+ item.setQty(picQty).setOrderId(order.getId()).setOrderItemId(orderItem.getId());
if (!taskItemService.updateById(item)) {
throw new CoolException("鐘舵�佸畬鎴愬け璐ワ紒锛�");
}
+
+ // 鎵ｅ噺搴撲綅鏄庣粏搴撳瓨锛堜笌鍑哄簱瀹屾垚閫昏緫淇濇寔涓�鑷达級
+ if (StringUtils.isNotBlank(task.getOrgLoc())) {
+ LocItem locItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
+ .eq(LocItem::getLocCode, task.getOrgLoc())
+ .eq(LocItem::getMatnrId, item.getMatnrId())
+ .eq(StringUtils.isNotBlank(item.getBatch()), LocItem::getBatch, item.getBatch())
+ .eq(StringUtils.isNotBlank(item.getFieldsIndex()), LocItem::getFieldsIndex, item.getFieldsIndex()));
+
+ if (Objects.nonNull(locItem)) {
+ // 浣跨敤瀹為檯鎷ｈ揣鏁伴噺锛坱askItem.getAnfme()锛夋墸鍑忓簱浣嶆槑缁�
+ Double newAnfme = Math.round((locItem.getAnfme() - taskItem.getAnfme()) * 1000000) / 1000000.0;
+
+ if (newAnfme.compareTo(0.0) <= 0) {
+ // 鏁伴噺灏忎簬绛変簬0锛屽垹闄ゅ簱浣嶆槑缁�
+ locItemService.removeById(locItem.getId());
+ } else {
+ // 鏇存柊搴撲綅鏄庣粏鏁伴噺
+ locItem.setAnfme(newAnfme)
+ .setUpdateBy(SystemAuthUtils.getLoginUserId())
+ .setUpdateTime(new Date());
+ if (!locItemService.updateById(locItem)) {
+ throw new CoolException("搴撲綅鏄庣粏鏁伴噺鎵ｅ噺澶辫触锛侊紒");
+ }
+ }
+ }
+ }
+
StockItem stockItem = new StockItem();
- BeanUtils.copyProperties(taskItem, stockItem);
- stockItem.setStockId(stock.getId()).setStockCode(stock.getCode()).setSourceItemId(orderItem.getId());
+ BeanUtils.copyProperties(item, stockItem);
+ //taskItem涓轰笂鎶ユ暟鎹�
+ stockItem.setStockId(stock.getId()).setAnfme(taskItem.getAnfme()).setStockCode(stock.getCode()).setSourceItemId(orderItem.getId());
stockItems.add(stockItem);
});
if (!stockItemService.saveBatch(stockItems)) {
@@ -348,9 +397,10 @@
});
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, params.getOrderId()));
- double total = orderItems.stream().mapToDouble(WkOrderItem::getQty).sum();
+ Double total = orderItems.stream().mapToDouble(WkOrderItem::getQty).sum();
Double wkQty = orderItems.stream().mapToDouble(WkOrderItem::getWorkQty).sum();
- order.setQty(total).setWorkQty(order.getWorkQty().compareTo(wkQty) < 0 ? 0.0 : (total - wkQty));
+ double v = order.getWorkQty().compareTo(wkQty) < 0 ? 0.0 : Math.round((total - wkQty) * 1000000) / 1000000.0;
+ order.setQty(total).setWorkQty(v);
if (!asnOrderService.updateById(order)) {
throw new CoolException("璁㈠崟鏁伴噺鏇存柊澶辫触锛侊紒");
}
@@ -428,13 +478,15 @@
throw new CoolException("浠诲姟鏄庣粏淇敼澶辫触");
}
LocItemWorking oldOne = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
+ .eq(LocItemWorking::getTaskId, byId.getTaskId())
.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::getTaskId, byId.getTaskId())
+ .eq(LocItemWorking::getMatnrCode, byId.getMatnrCode())
.eq(LocItemWorking::getFieldsIndex, uuid));
if (Objects.isNull(one)) {
throw new CoolException("鏄庣粏涓嶅瓨鍦ㄦ垨宸插嚭搴擄紒锛�");
--
Gitblit v1.9.1