From d7bb8c43b17253b46c6a466cff5545e8b4bcaad3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 11:10:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 84 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 36 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 43a083b..7d8c06a 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
@@ -7,7 +7,6 @@
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;
-import com.vincent.rsf.server.api.utils.SlaveProperties;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.*;
@@ -19,6 +18,8 @@
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,6 +30,8 @@
@Service("locItemService")
public class LocItemServiceImpl extends ServiceImpl<LocItemMapper, LocItem> implements LocItemService {
+
+ Logger logger = LoggerFactory.getLogger(LocItemServiceImpl.class);
@Autowired
private LocService locService;
@@ -55,7 +58,7 @@
@Override
@Synchronized
@Transactional(rollbackFor = Exception.class)
- public R generateTask(LocToTaskParams map, Long loginUserId) {
+ public void generateTask(LocToTaskParams map, Long loginUserId) throws Exception {
if (Objects.isNull(map.getSiteNo())) {
throw new CoolException("绔欑偣涓嶈兘涓虹┖锛�");
}
@@ -69,34 +72,24 @@
listMap.keySet().forEach(key -> {
Task task = new Task();
Loc loc = locService.getById(key);
+ logger.info("搴撲綅锛�>{}<UNK>", 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.鍑哄簱棰勭害鎿嶄綔锛侊紒");
+ }
+
loc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
if (!locService.updateById(loc)) {
throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐ワ紒锛�");
}
-
Task moveTask = new Task();
- if (!LocUtils.isShallowLoc(loc.getCode())) {
- //鑾峰彇娣卞簱浣嶅搴旀祬搴撲綅
- String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
- Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
- if (Objects.isNull(one)) {
- throw new CoolException("瀵瑰簲搴撲綅涓嶅瓨鍦紒锛�");
- }
- map.setOrgLoc(one.getCode());
- //浼樺厛鐢熸垚绉诲簱浠诲姟
- if (!one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
- moveTask = genMoveTask(map, loginUserId);
- }
- }
-
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
task.setOrgLoc(loc.getCode())
.setTaskCode(ruleCode)
- .setParentId(moveTask.getId())
.setTargSite(siteNo)
.setSort(Constants.TASK_SORT_DEFAULT_VALUE)
.setUpdateBy(loginUserId)
@@ -116,12 +109,12 @@
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("鎵樼洏浠诲姟鎵ц涓紝涓嶈兘閲嶅鍒涘缓锛�");
- }
+// 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)) {
+ 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) {
//鎷ｆ枡鍑哄簱
@@ -133,7 +126,6 @@
throw new CoolException("绔欑偣涓嶆敮鎸佹嫞鏂欏嚭搴擄紒锛�");
}
task.setTaskType(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type).setWarehType(deviceSite.getDevice());
-
} else {
//鍏ㄦ澘鍑哄簱
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
@@ -154,7 +146,6 @@
if (Objects.isNull(deviceSite)) {
throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洏鐐瑰嚭搴擄紒锛�");
}
-
task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(deviceSite.getDevice());
}
@@ -162,10 +153,36 @@
throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
}
+ if (!LocUtils.isShallowLoc(loc.getCode())) {
+ //鑾峰彇娣卞簱浣嶅搴旀祬搴撲綅
+ String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
+ Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
+ if (Objects.isNull(one)) {
+ throw new CoolException("瀵瑰簲搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ Task workTask = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, one.getBarcode()));
+ if (Objects.isNull(workTask)) {
+ map.setOrgLoc(one.getCode());
+ //浼樺厛鐢熸垚绉诲簱浠诲姟
+ if (one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+ moveTask = genMoveTask(map, loginUserId);
+ }
+ } else {
+ workTask.setSort(task.getSort() + 1).setParentId(task.getId());
+ if (!taskService.updateById(workTask)) {
+ throw new CoolException("浼樺厛绾т慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ }
+
if (!Objects.isNull(moveTask.getId())) {
- moveTask.setParentId(task.getId());
+ moveTask.setParentId(task.getId()).setSort(moveTask.getSort() + 1);
if (!taskService.saveOrUpdate(moveTask)) {
throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
+ }
+ task.setParentId(moveTask.getId());
+ if (!taskService.updateById(task)) {
+ throw new CoolException("涓讳换鍔″叧鑱斿け璐ワ紒锛�");
}
}
@@ -214,8 +231,6 @@
throw new CoolException("浠诲姟鏄庣粏鐢熸垚澶辫触锛侊紒");
}
});
-
- return R.ok("浠诲姟鐢熸垚瀹屾垚锛�!");
}
/**
@@ -231,25 +246,22 @@
if (Objects.isNull(map.getOrgLoc()) || StringUtils.isBlank(map.getOrgLoc())) {
throw new CoolException("婧愬簱浣嶄笉鑳戒负绌猴紒");
}
-
Loc orgLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.getOrgLoc()));
if (Objects.isNull(orgLoc)) {
throw new CoolException("婧愬簱浣嶄笉瀛樺湪锛侊紒");
}
-
// if (orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)
// || orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)
// || orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_X.type ) ) {
// throw new CoolException("婧愬簱浣嶆湁浠诲姟姝ｅ湪鎵ц涓�...");
// }
-
orgLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
if (!locService.updateById(orgLoc)) {
throw new CoolException("鍑哄簱棰勭害澶辫触锛侊紒");
}
- Loc targetLoc = new Loc();
+ Loc targetLoc;
if (Objects.isNull(map.getTarLoc()) || StringUtils.isBlank(map.getTarLoc())) {
//鐩爣搴撲綅涓虹┖锛岃嚜鍔ㄨ幏鍙栨柊搴撲綅
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
@@ -264,7 +276,7 @@
.setSourceStaNo(Integer.parseInt(deviceSite.getSite()))
.setLocType1(Integer.parseInt(orgLoc.getType())
);
- InTaskMsgDto locNo = null;
+ InTaskMsgDto locNo;
try {
locNo = wcsService.getLocNo(param);
} catch (Exception e) {
@@ -295,7 +307,7 @@
.setUpdateBy(loginUserId)
.setSort(Constants.TASK_SORT_DEFAULT_VALUE)
.setUpdateTime(new Date())
- .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+ .setTaskStatus(TaskStsType.GENERATE_IN.id)
.setBarcode(orgLoc.getBarcode());
if (!taskService.save(task)) {
@@ -316,8 +328,8 @@
.setSourceCode(item.getLocCode())
.setSource(item.getId())
.setUpdateTime(new Date())
- .setOrderType(OrderType.ORDER_OUT.type)
- .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER.type));
+ .setOrderType(OrderType.ORDER_IN.type)
+ .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
taskItems.add(taskItem);
}
if (!taskItemService.saveBatch(taskItems)) {
--
Gitblit v1.9.1