From 06d7fb698ce6d0efc7ff4224c6b68d2f50feb716 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 21 四月 2025 16:23:46 +0800
Subject: [PATCH] DO单修改及优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 219 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 162 insertions(+), 57 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 2f22214..39a5d8a 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
@@ -7,7 +7,9 @@
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.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.mapper.TaskMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -48,7 +50,17 @@
private StockService stockService;
@Autowired
private StockItemService stockItemService;
+ @Autowired
+ private DeviceSiteService deviceSiteService;
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderItemService orderItemService;
+
+ @Autowired
+ private LocItemService locItemService;
/**
@@ -61,15 +73,22 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public synchronized R generateTasks(List<WaitPakin> waitPakin, Long loginUserId) {
- if (Objects.isNull(waitPakin) || waitPakin.isEmpty()) {
+ public synchronized R generateTasks(GenerateTaskParams waitPakin, Long loginUserId) {
+ if (Objects.isNull(waitPakin) || waitPakin.getWaitPakins().isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+
+ DeviceSite deviceSite = deviceSiteService.getById(waitPakin.getSiteId());
+ if (Objects.isNull(deviceSite)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+ }
/**鑾峰彇缁勬嫋*/
- List<Long> ids = waitPakin.stream().map(WaitPakin::getId).collect(Collectors.toList());
- List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().in(WaitPakin::getId, ids));
+ List<Long> ids = waitPakin.getWaitPakins().stream().map(WaitPakin::getId).collect(Collectors.toList());
+ List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
+ .in(WaitPakin::getId, ids)
+ .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)));
if (waitPakins.isEmpty()) {
- throw new CoolException("缁勬嫋淇℃伅涓嶅瓨鍦紒锛�");
+ throw new CoolException("璇锋鏌ョ粍鎷栫姸鎬佹槸鍚﹀畬鎴愶紒锛�");
}
waitPakins.forEach(pakin -> {
List<TaskItem> taskItems = new ArrayList<>();
@@ -83,18 +102,34 @@
.setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
.setTargLoc(LocManageUtil.getTargetLoc())
.setBarcode(pakin.getBarcode())
+ .setTargSite(deviceSite.getDeviceCode())
.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("浠诲姟淇濆瓨澶辫触锛侊紒");
}
- if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, pakin.getCode())
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, task.getTargLoc())
.set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type).set(Loc::getBarcode, pakin.getBarcode()))) {
throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒");
}
-
/**鑾峰彇缁勬嫋鏄庣粏**/
List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakin.getId()));
if (waitPakinItems.isEmpty()) {
@@ -103,6 +138,10 @@
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("鏁版嵁閿欒: 鍗曟嵁涓嶅瓨鍦紒锛�");
+// }
taskItem.setTaskId(task.getId())
.setOrderType(OrderType.ORDER_RECEIPT.type)
.setSource(item.getId())
@@ -118,12 +157,18 @@
}
});
+ if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
+ .in(WaitPakin::getId, ids)
+ .set(WaitPakin::getUpdateBy, loginUserId)
+ .set(WaitPakin::getCreateBy, loginUserId)
+ .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val))) {
+ throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
return R.ok("浠诲姟鐢熸垚瀹屾瘯锛�");
}
-
/**
- * 瀹屾垚浠诲姟
+ * 瀹屾垚浠诲姟 鏇存柊搴撲綅鏄庣粏淇℃伅锛屽皢鍗曟嵁搴撳瓨鏇存柊鍒板崟鎹簱瀛樿〃
* @param tasks
* @throws Exception
*/
@@ -134,63 +179,123 @@
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("浠诲姟鏄庣粏涓嶈兘涓虹┖锛侊紒");
+ throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
}
+ List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList());
+ Map<Long, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getTaskId));
+ /**瀵逛换鍔℃槑缁嗘寜浠诲姟涓诲崟杩涜鍒嗙粍*/
+ listMap.keySet().forEach(key -> {
+ List<TaskItem> items = listMap.get(key);
+ //鏇存柊搴撲綅鏄庣粏
+ try {
+ saveLocItem(items, key);
+ } catch (Exception e) {
+ throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+ });
+
/**瀵逛换鍔℃槑缁嗘寜璁㈠崟杩涜鍒嗙粍*/
- Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
- List<StockItem> stockItems = new ArrayList<>();
+ 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));
- 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()));
- if (!Objects.isNull(purchase)) {
- stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
- }
- }
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
- if (StringUtils.isBlank(ruleCode)) {
- throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
- }
- stock.setAsnId(order.getId()).setAsnCode(order.getCode());
- if (!stockService.save(stock)) {
- throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
+ 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);
- for (TaskItem item : items) {
- /**閫氳繃浠诲姟鏄庣粏涓殑taskId鏌ヨ,鑾峰彇TASK鐨勭洰鏍囧簱浣嶄俊鎭�*/
- Task taskServiceOne = this.getOne(new LambdaQueryWrapper<Task>()
- .select(Task::getId, Task::getTargLoc, Task::getOrgLoc, Task::getBarcode)
- .eq(Task::getId, item.getTaskId()));
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, taskServiceOne.getTargLoc()));
- if (Objects.isNull(loc)) {
- 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);
- stockItem.setAsnItemId(item.getOrderItemId())
- .setBarcode(taskServiceOne.getBarcode())
- .setLocId(loc.getId())
- .setId(null)
- .setStockId(stock.getId());
- stockItems.add(stockItem);
- }
- if (!stockItemService.saveBatch(stockItems)) {
- throw new CoolException("搴撳瓨淇敼鏋跺け璐ワ紒锛�");
+ //淇濆瓨搴撳瓨鏄庣粏
+ try {
+ saveStockItems(items, pakinItem);
+ } catch (Exception e) {
+ throw new CoolException("搴撳瓨绠＄悊淇濆瓨鏇存柊澶辫触锛侊紒");
}
});
/**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
- List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList());
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))) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+ /**
+ * @author Ryan
+ * @description 鏇存柊搴撲綅鏄庣粏
+ * @param
+ * @return
+ * @time 2025/4/15 15:28
+ */
+ @Transactional(rollbackFor = Exception.class)
+ 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()), false);
+ LocItem item = new LocItem();
+ BeanUtils.copyProperties(taskItem, item);
+ item.setLocId(loc.getId()).setType(taskItem.getOrderType());
+ locItems.add(item);
+ });
+ if (!locItemService.saveBatch(locItems)) {
+ throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+ }
+
+ /**
+ * 鐢熸垚搴撳瓨鏄庣粏
+ * @param items
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ 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()));
+// if (!Objects.isNull(purchase)) {
+// stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
+// }
+// }
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
+ }
+ 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("搴撳瓨淇濆瓨澶辫触锛侊紒");
+ }
+
+ 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("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+// }
+ StockItem stockItem = new StockItem();
+ BeanUtils.copyProperties(item, stockItem);
+ stockItem.setSourceItemId(item.getOrderItemId())
+ .setStockCode(stock.getCode())
+ .setSourceItemId(item.getOrderItemId())
+ .setId(null)
+ .setStockId(stock.getId());
+ stockItems.add(stockItem);
+ }
+ if (!stockItemService.saveBatch(stockItems)) {
+ throw new CoolException("搴撳瓨淇敼鏋跺け璐ワ紒锛�");
+ }
}
}
--
Gitblit v1.9.1