From 3798e0f2250a01493dc7b238cc3878aaade7aec0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 28 四月 2025 22:59:35 +0800
Subject: [PATCH] 优化出库单新增功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 123 ++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 49 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 78e4034..d4b4f22 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.server.api.entity.enums.OrderType;
import com.vincent.rsf.server.api.entity.enums.TaskStsType;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.enums.TaskType;
+import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
@@ -62,6 +64,11 @@
@Autowired
private LocItemService locItemService;
+ @Autowired
+ private DeviceBindService deviceBindService;
+ @Autowired
+ private WarehouseAreasService warehouseAreasService;
+
/**
* @param
@@ -82,6 +89,20 @@
if (Objects.isNull(deviceSite)) {
throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
}
+ DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(Integer.valueOf(deviceSite.getSite())));
+ if (Cools.isEmpty(deviceBind)) {
+ throw new CoolException("搴撲綅瑙勫垯鏈煡");
+ }
+ WarehouseAreas warehouseArea = warehouseAreasService.getById(deviceBind.getTypeId());
+ if (Cools.isEmpty(warehouseArea)) {
+ throw new CoolException("鏈壘鍒版墍灞炲簱鍖轰俊鎭�");
+ }
+
+ /**鑾峰彇搴撲綅*/
+ String targetLoc = LocManageUtil.getTargetLoc(warehouseArea.getId());
+ if (Cools.isEmpty(targetLoc)) {
+ throw new CoolException("璇ョ珯鐐瑰搴斿簱鍖烘湭鎵惧埌搴撲綅");
+ }
/**鑾峰彇缁勬嫋*/
List<Long> ids = waitPakin.getWaitPakins().stream().map(WaitPakin::getId).collect(Collectors.toList());
List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
@@ -100,12 +121,29 @@
task.setTaskCode(ruleCode)
.setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
.setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
- .setTargLoc(LocManageUtil.getTargetLoc())
+ .setTargLoc(targetLoc)
.setBarcode(pakin.getBarcode())
- .setTargSite(deviceSite.getDeviceCode())
+ .setOrgSite(deviceSite.getSite())
+ .setTargSite(deviceSite.getDeviceSite())
.setCreateBy(loginUserId)
- .setUpdateBy(loginUserId)
- .setTargSite(LocManageUtil.getTargetSite());
+ .setUpdateBy(loginUserId);
+// if (!Objects.isNull(waitPakin.getSiteId()) && waitPakin.getSiteId() > 0) {
+// DeviceSite site = deviceSiteService.getById(waitPakin.getSiteId());
+// task.setTargSite(site.getSite() + "");
+// } else {
+// task.setTargSite(LocManageUtil.getTargetSite());
+// }
+// if (!Objects.isNull(waitPakin.getLocCode()) && StringUtils.isNotBlank(waitPakin.getLocCode())) {
+// List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, waitPakin.getLocCode()));
+//// if (!locs.isEmpty()) {
+//// throw new CoolException("搴撲綅閿欒锛氱浉鍚屽簱浣嶅簲鍙竴鏉�")
+//// }
+// Loc loc = locs.stream().findFirst().get();
+// task.setTargSite(loc.getCode());
+// } else {
+// task.setTargSite(LocManageUtil.getTargetSite());
+// }
+
if (!this.save(task)) {
throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
}
@@ -121,13 +159,12 @@
waitPakinItems.forEach(item -> {
TaskItem taskItem = new TaskItem();
BeanUtils.copyProperties(item, taskItem);
- AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, item.getAsnId()));
- if (Objects.isNull(order)) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
+// AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, item.getAsnId()));
+// if (Objects.isNull(order)) {
+// throw new CoolException("鏁版嵁閿欒: 鍗曟嵁涓嶅瓨鍦紒锛�");
+// }
taskItem.setTaskId(task.getId())
.setOrderType(OrderType.ORDER_RECEIPT.type)
- .setWkType(Short.parseShort(order.getWkType()))
.setSource(item.getId())
.setTrackCode(item.getTrackCode())
.setCreateBy(loginUserId)
@@ -163,7 +200,7 @@
return;
}
List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList());
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, list));
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, list));
if (taskItems.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -181,15 +218,19 @@
});
/**瀵逛换鍔℃槑缁嗘寜璁㈠崟杩涜鍒嗙粍*/
- Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
+ Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
orderMap.keySet().forEach(key -> {
- AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getId, key)
- .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
+ WaitPakinItem pakinItem = waitPakinItemService.getById(key);
+// AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
+// .eq(AsnOrder::getId, key)
+// .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
+ if (null == pakinItem) {
+ throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨暟鎹笉瀛樺湪锛岃鑱旂郴绠＄悊鍛橈紒锛�");
+ }
List<TaskItem> items = orderMap.get(key);
//淇濆瓨搴撳瓨鏄庣粏
try {
- saveStockItems(items, order);
+ saveStockItems(items, pakinItem);
} catch (Exception e) {
throw new CoolException("搴撳瓨绠＄悊淇濆瓨鏇存柊澶辫触锛侊紒");
}
@@ -198,7 +239,7 @@
if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).in(Loc::getCode, locCodes))) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- if (!this.update(new LambdaUpdateWrapper<Task>().set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
+ if (!this.update(new LambdaUpdateWrapper<Task>().in(Task::getId, list).set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
@@ -211,17 +252,17 @@
* @time 2025/4/15 15:28
*/
@Transactional(rollbackFor = Exception.class)
- private void saveLocItem(List<TaskItem> items, Long taskId) throws Exception {
+ public void saveLocItem(List<TaskItem> items, Long taskId) throws Exception {
Task task = this.getById(taskId);
if (Objects.isNull(task)) {
throw new CoolException("浠诲姟涓嶅瓨鍦�!!");
}
List<LocItem> locItems = new ArrayList<>();
items.forEach(taskItem -> {
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()), false);
LocItem item = new LocItem();
BeanUtils.copyProperties(taskItem, item);
- item.setLocId(loc.getId()).setType(taskItem.getOrderType());
+ item.setLocCode(loc.getCode()).setId(null).setLocId(loc.getId()).setType(taskItem.getOrderType());
locItems.add(item);
});
if (!locItemService.saveBatch(locItems)) {
@@ -235,7 +276,7 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- private void saveStockItems(List<TaskItem> items, AsnOrder order) throws Exception {
+ public void saveStockItems(List<TaskItem> items, WaitPakinItem order) throws Exception {
Stock stock = new Stock();
// if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
// Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
@@ -247,7 +288,13 @@
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
- stock.setSourceId(order.getId()).setSourceCode(order.getCode());
+ double sum = items.stream().mapToDouble(TaskItem::getAnfme).sum();
+ stock.setSourceId(order.getId())
+ .setCode(ruleCode)
+ .setSourceCode(order.getAsnCode())
+ .setAnfme(sum)
+ .setWkType(order.getWkType())
+ .setType(order.getType());
if (!stockService.save(stock)) {
throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
}
@@ -255,15 +302,15 @@
List<StockItem> stockItems = new ArrayList<>();
for (TaskItem item : items) {
/**閫氳繃浠诲姟鏄庣粏涓殑taskId鏌ヨ,鑾峰彇TASK鐨勭洰鏍囧簱浣嶄俊鎭�*/
- AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
- if (Objects.isNull(orderItem)) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
- }
+// AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
+// if (Objects.isNull(orderItem)) {
+// throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+// }
StockItem stockItem = new StockItem();
- BeanUtils.copyProperties(orderItem, stockItem);
+ BeanUtils.copyProperties(item, stockItem);
stockItem.setSourceItemId(item.getOrderItemId())
.setStockCode(stock.getCode())
- .setSourceItemId(orderItem.getId())
+ .setSourceItemId(item.getOrderItemId())
.setId(null)
.setStockId(stock.getId());
stockItems.add(stockItem);
@@ -272,26 +319,4 @@
throw new CoolException("搴撳瓨淇敼鏋跺け璐ワ紒锛�");
}
}
-
-// public void generateOrders() {
-// Map<Long, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
-// listMap.keySet().forEach(key -> {
-// double sum = listMap.get(key).stream().mapToDouble(TaskItem::getAnfme).sum();
-// listMap.get(key).forEach(taskItem -> {
-// Order order = new Order();
-// String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MANAGE_ORDER_CODE, taskItem);
-// if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
-// throw new CoolException("缂栫爜瑙勫垯閿欒锛�" + "璇锋煡鐪嬬紪鐮侊細" + "銆孲YS_MANAGE_ORDER_CODE銆�" + "鏄惁璁剧疆");
-// }
-// order.setCode(ruleCode).setAnfme(sum).setSourceId(taskItem.getOrderId());
-// });
-// });
-//
-// if (!orderItemService.saveBatch(orderItems)) {
-// throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
-// }
-// }
-
-
-
}
--
Gitblit v1.9.1