From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 188 ++++++++++++++++++++++++++++++++--------------
1 files changed, 130 insertions(+), 58 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 e86379e..2e83811 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,14 +1,13 @@
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.controller.erp.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.CheckLocQueryParams;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
@@ -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;
@@ -42,12 +45,19 @@
private DeviceSiteService deviceSiteService;
@Autowired
private WcsService wcsService;
+ @Autowired
+ private OutStockService outStockService;
+ @Autowired
+ private WaveService waveService;
+ @Autowired
+ private BasStationService basStationService;
/**
* 搴撳瓨鍑哄簱鐢熸垚鍑哄簱浠诲姟
* type: check 鐩樼偣, stock: 搴撳瓨鍑哄簱
*
+ * @param resouce
* @param map
* @param loginUserId
* @return
@@ -55,55 +65,61 @@
@Override
@Synchronized
@Transactional(rollbackFor = Exception.class)
- public R generateTask(LocToTaskParams map, Long loginUserId) {
+ 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));
+ WkOrder order;
+ Wave wave;
+ if (!Objects.isNull(map.getSourceId())) {
+ if (map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
+ order = new WkOrder();
+ wave = waveService.getById(map.getSourceId());
+ } else {
+ wave = new Wave();
+ order = outStockService.getById(map.getSourceId());
+ }
+ } else {
+ wave = new Wave();
+ order = new WkOrder();
+ }
+
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();
- 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())
+ .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());
+ .setBarcode(loc.getBarcode())
+ .setMemo(map.getMemo());
List<LocItem> locItems = this.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, key));
if (locItems.isEmpty()) {
@@ -111,33 +127,26 @@
}
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)) {
- Double useQty = Math.round((outQty + workQty) * 10000) / 10000.0;
- if (orgQty.compareTo(useQty) > 0) {
- //鎷ｆ枡鍑哄簱
-
+ 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(!Objects.isNull(loc.getChannel()),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(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel())
.eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_OUT.type));
if (Objects.isNull(deviceSite)) {
throw new CoolException("绔欑偣涓嶆敮鎸佸叏鏉垮嚭搴擄紒锛�");
@@ -148,20 +157,52 @@
} else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK)) {
//鐩樼偣鍑哄簱
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
- .eq(DeviceSite::getChannel, loc.getChannel())
+ .eq(!Objects.isNull(loc.getChannel()), 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();
@@ -173,8 +214,22 @@
.setCreateBy(loginUserId)
.setCreateTime(new Date())
.setUpdateTime(new Date())
- .setOrderType(OrderType.ORDER_OUT.type)
- .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type));
+ .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())
+ .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER.type))
+ .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;
@@ -204,8 +259,6 @@
throw new CoolException("浠诲姟鏄庣粏鐢熸垚澶辫触锛侊紒");
}
});
-
- return R.ok("浠诲姟鐢熸垚瀹屾垚锛�!");
}
/**
@@ -221,38 +274,37 @@
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("婧愬簱浣嶆湁浠诲姟姝ｅ湪鎵ц涓�...");
- }
-
+// 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>()
- .eq(DeviceSite::getType, TaskType.TASK_TYPE_LOC_MOVE.type)
- .eq(DeviceSite::getChannel, orgLoc.getChannel()), false);
+ .eq(DeviceSite::getType, TaskType.TASK_TYPE_LOC_MOVE.type)
+ .eq(!Objects.isNull(orgLoc.getChannel()), 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;
+ .setOrgLoc(map.getOrgLoc())
+ .setSourceStaNo(deviceSite.getSite())
+ .setLocType1(Integer.parseInt(orgLoc.getType())
+ );
+ InTaskMsgDto locNo;
try {
locNo = wcsService.getLocNo(param);
} catch (Exception e) {
@@ -281,9 +333,11 @@
.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());
+ .setBarcode(orgLoc.getBarcode())
+ .setMemo(map.getMemo());
if (!taskService.save(task)) {
throw new CoolException("鏂板缓绉诲簱浠诲姟澶辫触锛侊紒");
@@ -299,6 +353,9 @@
.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));
@@ -310,4 +367,19 @@
}
return task;
}
+
+ /**
+ * @author Ryan
+ * @date 2025/7/16
+ * @description: 鑾峰彇褰撳墠鐗╂枡鎵�鏈夊簱瀛樹俊鎭�
+ * @version 1.0
+ */
+ @Override
+ public List<LocItem> listByMatnr(CheckLocQueryParams matnr) {
+ LambdaQueryWrapper<LocItem> wrapper = new LambdaQueryWrapper<LocItem>()
+ .eq(StringUtils.isNotBlank(matnr.getLocCode()), LocItem::getLocCode, matnr.getLocCode())
+// .eq(StringUtils.isNotBlank(matnr.getChannel()), LocItem::getChannel, matnr.getChannel())
+ .in(!matnr.getMatnrCode().isEmpty(), LocItem::getMatnrCode, matnr.getMatnrCode());
+ return this.baseMapper.listByMatnr(LocStsType.LOC_STS_TYPE_F.type, matnr.getChannel(), wrapper);
+ }
}
--
Gitblit v1.9.1