From e6f52d432bc670e909ee2e5d69164b48fb9ad4bb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 17:46:53 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index ad363be..ebf1007 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -393,6 +393,9 @@
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
//53.鎷ｆ枡鍐嶅叆搴�
pickComplateInStock(task);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
+ //57.鐩樼偣鍐嶅叆搴�
+ pickComplateInStock(task);
}
}
}
@@ -413,10 +416,11 @@
if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) {
//鍏ㄦ墭鍑哄簱
complateOutStock(task);
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) {
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
//鎷ｆ枡鍑哄簱
-// Task seviceOne = pickTask(task.getId());
- //绉婚櫎鍘熷搴撳瓨
+ complateOutStock(task);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
+ //鐩樼偣鍑哄簱
complateOutStock(task);
}
}
@@ -454,7 +458,10 @@
for (TaskItem taskItem : taskItems) {
LocItem locItem = new LocItem();
LocItemWorking locWorking = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
- .eq(LocItemWorking::getTaskId, taskItem.getTaskId()));
+ .eq(LocItemWorking::getTaskId, taskItem.getTaskId())
+ .eq(StringUtils.isNotBlank(taskItem.getBatch()), LocItemWorking::getBatch, taskItem.getBatch())
+ .eq(StringUtils.isNotBlank(taskItem.getFieldsIndex()), LocItemWorking::getFieldsIndex, taskItem.getFieldsIndex())
+ .eq(LocItemWorking::getMatnrId, taskItem.getMatnrId()));
if (Objects.isNull(locWorking)) {
throw new CoolException("鏁版嵁閿欒锛屼綔涓氫腑搴撳瓨鏁版嵁涓㈠け锛侊紒");
}
@@ -472,6 +479,11 @@
if (!locItemService.saveBatch(items)) {
throw new CoolException("浣滀笟搴撳瓨鍥炲啓澶辫触锛侊紒");
}
+
+ TaskItem taskItem = taskItems.stream().findFirst().get();
+ //淇濆瓨鍏ュ嚭搴撴祦姘�
+ saveStockItems(taskItems, null, null, taskItem.getWkType(), taskItem.getOrderType());
+
if (!locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()))) {
throw new CoolException("浣滀笟涓簱瀛樺垹闄ゅけ璐ワ紒锛�");
@@ -527,7 +539,7 @@
.eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type)
);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
@@ -561,13 +573,26 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Task pickTask(Long id) throws Exception {
+ public Task pickOrCheckTask(Long id, String oType) throws Exception {
Task task = this.getById(id);
if (Objects.isNull(task)) {
throw new CoolException("褰撳墠浠诲姟涓嶅瓨鍦紒锛�");
}
- if (!task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) {
- throw new CoolException("闈炴嫞鏂欏嚭搴� 锛屼笉鍙墽琛屾鎿嶄綔锛侊紒");
+ Integer type;
+ if (oType.equals("check")) {
+ //鐩樼偣鍏ュ簱
+ type = TaskType.TASK_TYPE_CHECK_IN.type;
+
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
+ throw new CoolException("闈炵洏鐐瑰嚭搴� 锛屼笉鍙墽琛屾鎿嶄綔锛侊紒");
+ }
+ } else {
+ //鎷ｆ枡鍏ュ簱
+ type = TaskType.TASK_TYPE_PICK_IN.type;
+
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
+ throw new CoolException("闈炴嫞鏂欏嚭搴� 锛屼笉鍙墽琛屾鎿嶄綔锛侊紒");
+ }
}
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
@@ -579,13 +604,14 @@
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, task);
//鏇存柊浠诲姟涓诲崟
task.setTaskCode(ruleCode)
- .setTaskType(TaskType.TASK_TYPE_PICK_IN.type)
+ .setTaskType(type)
.setBarcode(task.getBarcode())
.setTaskStatus(TaskStsType.GENERATE_IN.id);
+ //TODO 鏍规嵁鐗╂枡鐨勫簱浣嶇被鍨嬬敓鎴愭柊鐨勫簱浣�
TaskInParam param = new TaskInParam();
param.setSourceStaNo(Integer.parseInt(task.getTargSite()))
- .setIoType(Integer.parseInt(TaskType.TASK_TYPE_PICK_IN.type + ""))
+ .setIoType(type)
.setLocType1(Integer.parseInt(loc.getType()));
InTaskMsgDto locInfo = wcsService.getLocNo(param);
@@ -644,7 +670,7 @@
for (LocItem item : locItems) {
LocItemWorking working = new LocItemWorking();
BeanUtils.copyProperties(item, working);
- working.setId(null).setTaskId(task.getId());
+ working.setId(null).setTaskId(task.getId()).setLocItemId(item.getId());
workings.add(working);
}
@@ -656,6 +682,7 @@
//鏇存柊搴撲綅鏄庣粏
subtractLocItem(loc);
} catch (Exception e) {
+ log.error("<UNK>", e);
throw new CoolException(e.getMessage());
}
@@ -694,7 +721,7 @@
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- if (!task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) {
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || !task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
if (!this.update(new LambdaUpdateWrapper<Task>()
.eq(Task::getId, task.getId())
.set(Task::getTaskStatus, TaskStsType.UPDATED_OUT.id))) {
@@ -809,7 +836,7 @@
List<TaskItem> items = orderMap.get(key);
try {
//淇濆瓨搴撳瓨鏄庣粏
- saveStockItems(items, pakinItem);
+ saveStockItems(items, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType());
//绉诲嚭鏀惰揣鍖哄簱瀛橈紝 淇敼缁勬墭鐘舵��
removeReceiptStock(pakinItem);
} catch (Exception e) {
@@ -896,19 +923,20 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public void saveStockItems(List<TaskItem> items, WaitPakinItem order) throws Exception {
+ public void saveStockItems(List<TaskItem> items, Long id, String code, Short wkType, String type) throws
+ Exception {
Stock stock = new Stock();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
double sum = items.stream().mapToDouble(TaskItem::getAnfme).sum();
- stock.setSourceId(order.getId())
+ stock.setSourceId(id)
.setCode(ruleCode)
- .setSourceCode(order.getAsnCode())
+ .setSourceCode(code)
.setAnfme(sum)
- .setWkType(order.getWkType())
- .setType(order.getType());
+ .setWkType(wkType)
+ .setType(type);
if (!stockService.save(stock)) {
throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
}
--
Gitblit v1.9.1