From f2833c7f3e01c997e94a66bd5dd9be738b5c6cc7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 26 六月 2025 13:31:08 +0800
Subject: [PATCH] 波次任务下发功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 357 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 355 insertions(+), 2 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 9cc069f..62b4973 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,12 +1,365 @@
package com.vincent.rsf.server.manager.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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;
+import com.vincent.rsf.server.api.service.WcsService;
+import com.vincent.rsf.server.api.utils.LocUtils;
+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.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.system.constant.SerialRuleCode;
+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;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
@Service("locItemService")
public class LocItemServiceImpl extends ServiceImpl<LocItemMapper, LocItem> implements LocItemService {
+ Logger logger = LoggerFactory.getLogger(LocItemServiceImpl.class);
+
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private TaskItemService taskItemService;
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private DeviceSiteService deviceSiteService;
+ @Autowired
+ private WcsService wcsService;
+ @Autowired
+ private OutStockService outStockService;
+ @Autowired
+ private WaveService waveService;
+
+
+ /**
+ * 搴撳瓨鍑哄簱鐢熸垚鍑哄簱浠诲姟
+ * type: check 鐩樼偣, stock: 搴撳瓨鍑哄簱
+ *
+ * @param resouce
+ * @param map
+ * @param loginUserId
+ * @return
+ */
+ @Override
+ @Synchronized
+ @Transactional(rollbackFor = Exception.class)
+ public void generateTask(Short resouce, LocToTaskParams map, Long loginUserId) throws Exception {
+ if (Objects.isNull(map.getSiteNo())) {
+ throw new CoolException("绔欑偣涓嶈兘涓虹┖锛�");
+ }
+ if (Objects.isNull(map.getItems()) || map.getItems().isEmpty()) {
+ throw new CoolException("鏄庣粏涓嶈兘涓虹┖锛�");
+ }
+
+ String siteNo = map.getSiteNo();
+ List<LocItem> items = map.getItems();
+ Map<Long, List<LocItem>> listMap = items.stream().collect(Collectors.groupingBy(LocItem::getLocId));
+ AsnOrder order;
+ Wave wave;
+ if (!Objects.isNull(map.getSourceId())) {
+ if (map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
+ order = new AsnOrder();
+ wave = waveService.getById(map.getSourceId());
+ } else {
+ wave = new Wave();
+ order = outStockService.getById(map.getSourceId());
+ }
+ } else {
+ wave = new Wave();
+ order = new AsnOrder();
+ }
+
+ listMap.keySet().forEach(key -> {
+ Task task = new Task();
+ Loc loc = locService.getById(key);
+ 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.鍑哄簱棰勭害鎿嶄綔锛侊紒");
+ }
+
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+ Task moveTask = new Task();
+ 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)
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+ .setBarcode(loc.getBarcode());
+
+ List<LocItem> locItems = this.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, key));
+ if (locItems.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氭墍閫夊簱瀛樻槑缁嗕笉瀛樺湪锛侊紒");
+ }
+
+ Double orgQty = locItems.stream().mapToDouble(LocItem::getAnfme).sum();
+ List<LocItem> locItemList = listMap.get(key);
+ Double outQty = locItemList.stream().mapToDouble(LocItem::getOutQty).sum();
+
+ if (map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)
+ || map.getType().equals(Constants.TASK_TYPE_ORDER_OUT_STOCK)
+ || map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
+ if (orgQty.compareTo(outQty) > 0) {
+ //鎷ｆ枡鍑哄簱 -- 鐩樼偣鍑哄簱
+ 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("绔欑偣涓嶆敮鎸佹嫞鏂欏嚭搴擄紒锛�");
+ }
+ task.setTaskType(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type).setWarehType(deviceSite.getDevice());
+ } else {
+ //鍏ㄦ澘鍑哄簱
+ 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("绔欑偣涓嶆敮鎸佸叏鏉垮嚭搴擄紒锛�");
+ }
+ task.setTaskType(TaskType.TASK_TYPE_OUT.type).setWarehType(deviceSite.getDevice());
+
+ }
+ } else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK)) {
+ //鐩樼偣鍑哄簱
+ 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("褰撳墠绔欑偣涓嶆敮鎸佺洏鐐瑰嚭搴擄紒锛�");
+ }
+ task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(deviceSite.getDevice());
+ }
+
+ if (!taskService.save(task)) {
+ 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()).setSort(moveTask.getSort() + 1);
+ if (!taskService.saveOrUpdate(moveTask)) {
+ throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
+ }
+ task.setParentId(moveTask.getId());
+ if (!taskService.updateById(task)) {
+ throw new CoolException("涓讳换鍔″叧鑱斿け璐ワ紒锛�");
+ }
+ }
+
+ List<TaskItem> taskItems = new ArrayList<>();
+ listMap.get(key).forEach(item -> {
+ TaskItem taskItem = new TaskItem();
+ BeanUtils.copyProperties(item, taskItem);
+ taskItem.setTaskId(task.getId())
+ .setAnfme(item.getOutQty())
+ .setBatch(item.getBatch())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setOrderType(OrderType.ORDER_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_WAVE_OUT_STOCK)) {
+ taskItem.setSourceId(wave.getId())
+ .setSourceCode(wave.getCode())
+ .setSource(item.getSource());
+ } else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK) || map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)) {
+ taskItem.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type))
+ .setSource(item.getId())
+ .setSourceId(item.getLocId())
+ .setSourceCode(item.getLocCode());
+ }
+ taskItems.add(taskItem);
+
+ Double qty = Math.round((item.getWorkQty() + item.getOutQty()) * 10000) / 10000.0;
+ 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) {
+ Double minusQty = Math.round((locItem.getAnfme() - locItem.getWorkQty()) * 10000) / 10000.0;
+ item.setWorkQty(minusQty);
+ } else {
+ item.setWorkQty(qty);
+ }
+ item.setUpdateBy(loginUserId).setUpdateTime(new Date());
+
+ if (!locItemService.updateById(item)) {
+ throw new CoolException("搴撳瓨淇℃伅淇敼澶辫触锛侊紒");
+ }
+ });
+
+ if (!taskItemService.saveBatch(taskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏鐢熸垚澶辫触锛侊紒");
+ }
+ });
+ }
+
+ /**
+ * 鐢熸垚绉诲簱浠诲姟
+ *
+ * @param map
+ * @param loginUserId
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Task genMoveTask(LocToTaskParams map, Long loginUserId) {
+ 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;
+ 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)
+ .setOrgLoc(map.getOrgLoc())
+ .setSourceStaNo(Integer.parseInt(deviceSite.getSite()))
+ .setLocType1(Integer.parseInt(orgLoc.getType())
+ );
+ InTaskMsgDto locNo;
+ 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()));
+ }
+
+ if (Objects.isNull(targetLoc)) {
+ throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�");
+ }
+
+ targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+
+ if (!locService.updateById(targetLoc)) {
+ throw new CoolException("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
+ }
+
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ Task task = new Task();
+ task.setOrgLoc(orgLoc.getCode())
+ .setTaskCode(ruleCode)
+ .setTaskType(TaskType.TASK_TYPE_LOC_MOVE.type)
+ .setTargLoc(targetLoc.getCode())
+ .setUpdateBy(loginUserId)
+ .setSort(Constants.TASK_SORT_DEFAULT_VALUE)
+ .setUpdateTime(new Date())
+ .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setBarcode(orgLoc.getBarcode());
+
+ if (!taskService.save(task)) {
+ throw new CoolException("鏂板缓绉诲簱浠诲姟澶辫触锛侊紒");
+ }
+
+ List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
+ 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())
+ .setUpdateBy(loginUserId)
+ .setSourceId(item.getLocId())
+ .setSourceCode(item.getLocCode())
+ .setSource(item.getId())
+ .setUpdateTime(new Date())
+ .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 task;
+ }
}
--
Gitblit v1.9.1