From e81a3446617207688cd60fe5b1717a18c5cb9e32 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 26 五月 2025 18:14:36 +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 | 175 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 120 insertions(+), 55 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 7b7266f..cac3725 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
@@ -5,17 +5,19 @@
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.manager.entity.Loc;
-import com.vincent.rsf.server.manager.entity.Task;
-import com.vincent.rsf.server.manager.entity.TaskItem;
+import com.vincent.rsf.server.api.controller.params.TaskInParam;
+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.*;
import com.vincent.rsf.server.manager.enums.*;
+import com.vincent.rsf.server.manager.enums.LocType;
import com.vincent.rsf.server.manager.mapper.LocItemMapper;
-import com.vincent.rsf.server.manager.entity.LocItem;
-import com.vincent.rsf.server.manager.service.LocItemService;
+import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.manager.service.LocService;
-import com.vincent.rsf.server.manager.service.TaskItemService;
-import com.vincent.rsf.server.manager.service.TaskService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.Synchronized;
@@ -25,10 +27,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.lang.reflect.Array;
+import java.util.*;
import java.util.stream.Collectors;
@Service("locItemService")
@@ -42,6 +42,12 @@
private TaskItemService taskItemService;
@Autowired
private LocItemService locItemService;
+ @Autowired
+ private DeviceSiteService deviceSiteService;
+ @Autowired
+ private SlaveProperties slaveProperties;
+ @Autowired
+ private WcsService wcsService;
/**
@@ -54,21 +60,16 @@
@Override
@Synchronized
@Transactional(rollbackFor = Exception.class)
- public R generateTask(Map<String, Object> map) {
- String type;
- if (!Objects.isNull(map.get("type")) && StringUtils.isNotBlank(map.get("type").toString())) {
- type = map.get("type").toString();
- } else {
- type = "stock";
- }
- if (Objects.isNull(map.get("siteNo"))) {
+ public R generateTask(LocToTaskParams map) {
+ if (Objects.isNull(map.getSiteNo())) {
throw new CoolException("绔欑偣涓嶈兘涓虹┖锛�");
}
- if (Objects.isNull(map.get("items"))) {
+ if (Objects.isNull(map.getItems()) || map.getItems().isEmpty()) {
throw new CoolException("鏄庣粏涓嶈兘涓虹┖锛�");
}
- String siteNo = map.get("siteNo").toString();
- List<LocItem> items = JSONArray.parseArray(JSONArray.toJSONString(map.get("items")), LocItem.class);
+
+ String siteNo = map.getSiteNo();
+ List<LocItem> items = map.getItems();
Map<Long, List<LocItem>> listMap = items.stream().collect(Collectors.groupingBy(LocItem::getLocId));
listMap.keySet().forEach(key -> {
Task task = new Task();
@@ -82,9 +83,25 @@
throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐ワ紒锛�");
}
+ Task moveTask = new Task();
+ if (!LocUtils.isShallowLoc(slaveProperties, loc.getCode())) {
+ //鑾峰彇娣卞簱浣嶅搴旀祬搴撲綅
+ String shallowLoc = LocUtils.getShallowLoc(slaveProperties, 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);
+ }
+ }
+
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
task.setOrgLoc(loc.getCode())
.setTaskCode(ruleCode)
+ .setParentId(moveTask.getId())
.setTargSite(siteNo)
.setTaskStatus(TaskStsType.GENERATE_OUT.id)
.setBarcode(loc.getBarcode());
@@ -104,20 +121,41 @@
throw new CoolException("鎵樼洏浠诲姟鎵ц涓紝涓嶈兘閲嶅鍒涘缓锛�");
}
- if (type.equals("stock")) {
- Double useQty = Math.round((outQty + workQty) * 10000) / 10000.0;
+ if (map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)) {
+ Double useQty = Math.round((outQty + workQty) * 10000) / 10000.0;
if (orgQty.compareTo(useQty) > 0) {
//鎷ｆ枡鍑哄簱
task.setTaskType(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type);
+
+ DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+ .eq(DeviceSite::getSite, siteNo)
+ .eq(DeviceSite::getChannel, loc.getChannel())
+ .eq(DeviceSite::getType, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type));
+ if (Objects.isNull(deviceSite)) {
+ throw new CoolException("绔欑偣涓嶆敮鎸佹嫞鏂欏嚭搴擄紒锛�");
+ }
} else {
//鍏ㄦ澘鍑哄簱
task.setTaskType(TaskType.TASK_TYPE_OUT.type);
+ DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+ .eq(DeviceSite::getChannel, loc.getChannel())
+ .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_OUT.type));
+ if (Objects.isNull(deviceSite)) {
+ throw new CoolException("绔欑偣涓嶆敮鎸佸叏鏉垮嚭搴擄紒锛�");
+ }
}
- } else if (type.equals("check")) {
+ } else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK)) {
//鐩樼偣鍑哄簱
task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type);
+ DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+ .eq(DeviceSite::getChannel, loc.getChannel())
+ .eq(DeviceSite::getSite, siteNo)
+ .eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type));
+ if (Objects.isNull(deviceSite)) {
+ throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洏鐐瑰嚭搴擄紒锛�");
+ }
}
-
+
if (!taskService.save(task)) {
throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
}
@@ -136,6 +174,10 @@
LocItem locItem = locItemService.getById(item.getId());
if (Objects.isNull(locItem)) {
throw new CoolException("搴撳瓨淇℃伅涓嶅瓨鍦紒");
+ }
+
+ if (item.getOutQty().compareTo(0.0) < 0) {
+ throw new CoolException("鍑哄簱鏁伴噷涓嶈兘灏忎簬0锛侊紒");
}
if (locItem.getAnfme().compareTo(qty) < 0) {
@@ -159,32 +201,59 @@
/**
* 鐢熸垚绉诲簱浠诲姟
+ *
* @param map
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R genMoveTask(Map<String, Object> map) {
- if (Objects.isNull(map.get("tarLoc")) || StringUtils.isBlank(map.get("tarLoc").toString())) {
- throw new CoolException("鐩爣搴撲綅涓嶈兘涓虹┖锛�");
- }
- if (Objects.isNull(map.get("orgLoc")) || StringUtils.isBlank(map.get("orgLoc").toString())) {
+ public Task genMoveTask(LocToTaskParams map) {
+ if (Objects.isNull(map.getOrgLoc()) || StringUtils.isBlank(map.getOrgLoc())) {
throw new CoolException("婧愬簱浣嶄笉鑳戒负绌猴紒");
}
- Loc orgLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("orgLoc")));
+ 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("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
+ throw new CoolException("鍑哄簱棰勭害澶辫触锛侊紒");
}
+ Loc targetLoc = new Loc();
+ 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::getChannel, orgLoc.getChannel()), false);
+ if (Objects.isNull(deviceSite)) {
+ throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ TaskInParam param = new TaskInParam();
+ param.setIoType(TaskType.TASK_TYPE_OUT.type)
+ .setSourceStaNo(Integer.parseInt(deviceSite.getSite()))
+ .setLocType1(Integer.parseInt(orgLoc.getType()));
+ InTaskMsgDto locNo = null;
+ try {
+ locNo = wcsService.getLocNo(param);
+ } catch (Exception e) {
+ log.error("<UNK>", e);
+ throw new CoolException(e.getMessage());
+ }
+ targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locNo.getLocNo()));
+ } else {
+ targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.getTarLoc()));
+ }
- Loc targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("tarLoc").toString()));
if (Objects.isNull(targetLoc)) {
throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�");
}
@@ -209,26 +278,22 @@
}
List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
- if (locItems.isEmpty()) {
- throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紒锛�");
+ if (!locItems.isEmpty()) {
+ List<TaskItem> taskItems = new ArrayList<>();
+ for (LocItem item : locItems) {
+ TaskItem taskItem = new TaskItem();
+ BeanUtils.copyProperties(item, taskItem);
+ taskItem.setTaskId(task.getId())
+ .setAnfme(item.getAnfme())
+ .setBatch(item.getBatch())
+ .setOrderType(OrderType.ORDER_IN.type)
+ .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
+ taskItems.add(taskItem);
+ }
+ if (!taskItemService.saveBatch(taskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏鐢熸垚澶辫触锛侊紒");
+ }
}
-
- List<TaskItem> taskItems = new ArrayList<>();
- for (LocItem item : locItems) {
- TaskItem taskItem = new TaskItem();
- BeanUtils.copyProperties(item, taskItem);
- taskItem.setTaskId(task.getId())
- .setAnfme(item.getAnfme())
- .setBatch(item.getBatch())
- .setOrderType(OrderType.ORDER_IN.type)
- .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
- taskItems.add(taskItem);
- }
- if (!taskItemService.saveBatch(taskItems)) {
- throw new CoolException("浠诲姟鏄庣粏鐢熸垚澶辫触锛侊紒");
- }
-
- return R.ok(task);
+ return task;
}
-
}
--
Gitblit v1.9.1