From 8a42df9f13c1328b36ba5919258b2636dce455fe Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 24 六月 2025 16:25:48 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index 7d8c06a..36d255b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -1,7 +1,6 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
@@ -45,12 +44,15 @@
private DeviceSiteService deviceSiteService;
@Autowired
private WcsService wcsService;
+ @Autowired
+ private OutStockService outStockService;
/**
* 搴撳瓨鍑哄簱鐢熸垚鍑哄簱浠诲姟
* type: check 鐩樼偣, stock: 搴撳瓨鍑哄簱
*
+ * @param resouce
* @param map
* @param loginUserId
* @return
@@ -58,7 +60,7 @@
@Override
@Synchronized
@Transactional(rollbackFor = Exception.class)
- public void generateTask(LocToTaskParams map, Long loginUserId) throws Exception {
+ public void generateTask(Short resouce, LocToTaskParams map, Long loginUserId) throws Exception {
if (Objects.isNull(map.getSiteNo())) {
throw new CoolException("绔欑偣涓嶈兘涓虹┖锛�");
}
@@ -69,16 +71,22 @@
String siteNo = map.getSiteNo();
List<LocItem> items = map.getItems();
Map<Long, List<LocItem>> listMap = items.stream().collect(Collectors.groupingBy(LocItem::getLocId));
+ AsnOrder order;
+ if (!Objects.isNull(map.getSourceId())) {
+ order = outStockService.getById(map.getSourceId());
+ } else {
+ order = new AsnOrder();
+ }
+
listMap.keySet().forEach(key -> {
Task task = new Task();
Loc loc = locService.getById(key);
- logger.info("搴撲綅锛�>{}<UNK>", loc.getCode());
-
+ logger.info("搴撲綅锛�>{}", loc.getCode());
if (Objects.isNull(loc)) {
throw new CoolException("鏁版嵁閿欒锛氭墍閫夊簱瀛樹俊鎭笉瀛樺湪锛侊紒");
}
if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
- throw new CoolException("搴撲綅:" + loc.getCode() + ",涓嶅浜嶧.鍦ㄥ簱鐘舵�侊紝涓嶅彲鎵цR.鍑哄簱棰勭害鎿嶄綔锛侊紒");
+ throw new CoolException("搴撲綅:" + loc.getCode() + ",涓嶅浜嶧.鍦ㄥ簱鐘舵�侊紝涓嶅彲鎵цR.鍑哄簱棰勭害鎿嶄綔锛侊紒");
}
loc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
@@ -90,6 +98,7 @@
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
task.setOrgLoc(loc.getCode())
.setTaskCode(ruleCode)
+ .setResource(resouce)
.setTargSite(siteNo)
.setSort(Constants.TASK_SORT_DEFAULT_VALUE)
.setUpdateBy(loginUserId)
@@ -105,18 +114,11 @@
}
Double orgQty = locItems.stream().mapToDouble(LocItem::getAnfme).sum();
- Double workQty = locItems.stream().mapToDouble(LocItem::getWorkQty).sum();
List<LocItem> locItemList = listMap.get(key);
Double outQty = locItemList.stream().mapToDouble(LocItem::getOutQty).sum();
-// Task serviceOne = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, loc.getBarcode()));
-// if (!Objects.isNull(serviceOne)) {
-// throw new CoolException("鎵樼洏浠诲姟鎵ц涓紝涓嶈兘閲嶅鍒涘缓锛�");
-// }
-
if (map.getType().equals(Constants.TASK_TYPE_OUT_STOCK) || map.getType().equals(Constants.TASK_TYPE_ORDER_OUT_STOCK)) {
- Double useQty = Math.round((outQty + workQty) * 10000) / 10000.0;
- if (orgQty.compareTo(useQty) > 0) {
+ if (orgQty.compareTo(outQty) > 0) {
//鎷ｆ枡鍑哄簱
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
.eq(DeviceSite::getSite, siteNo)
@@ -195,13 +197,19 @@
.setBatch(item.getBatch())
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
- .setSource(item.getId())
- .setSourceId(item.getLocId())
- .setSourceCode(item.getLocCode())
.setCreateTime(new Date())
.setUpdateTime(new Date())
.setOrderType(OrderType.ORDER_OUT.type)
.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type));
+ if (map.getType().equals(Constants.TASK_TYPE_ORDER_OUT_STOCK)) {
+ taskItem.setWkType(Short.parseShort(order.getWkType()))
+ .setSourceCode(order.getCode())
+ .setSourceId(order.getId());
+ } else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK) || map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)) {
+ taskItem.setSource(item.getId())
+ .setSourceId(item.getLocId())
+ .setSourceCode(item.getLocCode());
+ }
taskItems.add(taskItem);
Double qty = Math.round((item.getWorkQty() + item.getOutQty()) * 10000) / 10000.0;
@@ -265,7 +273,7 @@
if (Objects.isNull(map.getTarLoc()) || StringUtils.isBlank(map.getTarLoc())) {
//鐩爣搴撲綅涓虹┖锛岃嚜鍔ㄨ幏鍙栨柊搴撲綅
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(DeviceSite::getType, TaskType.TASK_TYPE_LOC_MOVE.type)
+ .eq(DeviceSite::getType, TaskType.TASK_TYPE_LOC_MOVE.type)
.eq(DeviceSite::getChannel, orgLoc.getChannel()), false);
if (Objects.isNull(deviceSite)) {
throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦紒锛�");
--
Gitblit v1.9.1