From 1e42773a05285543be5f18b352a8b5884c02273c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 11 六月 2025 17:16:14 +0800
Subject: [PATCH] 库口修改问题修复 下发执行单据明细添加多选显示功能 库存信息删除按钮显示问题修复 库存信息删除分页信息
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 6071fb1..3165298 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,7 +1,6 @@
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.entity.dto.InTaskMsgDto;
@@ -53,6 +52,7 @@
* 搴撳瓨鍑哄簱鐢熸垚鍑哄簱浠诲姟
* type: check 鐩樼偣, stock: 搴撳瓨鍑哄簱
*
+ * @param resouce
* @param map
* @param loginUserId
* @return
@@ -60,7 +60,7 @@
@Override
@Synchronized
@Transactional(rollbackFor = Exception.class)
- public void generateTask(LocToTaskParams map, Long loginUserId) throws Exception {
+ public void generateTask(Short resouce, LocToTaskParams map, Long loginUserId) throws Exception {
if (Objects.isNull(map.getSiteNo())) {
throw new CoolException("绔欑偣涓嶈兘涓虹┖锛�");
}
@@ -99,6 +99,7 @@
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)
@@ -204,15 +205,18 @@
.setBatch(item.getBatch())
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
- .setSource(item.getId())
- .setSourceId(item.getLocId())
- .setSourceCode(item.getLocCode())
.setCreateTime(new Date())
.setUpdateTime(new Date())
.setOrderType(OrderType.ORDER_OUT.type)
.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type));
if (map.getType().equals(Constants.TASK_TYPE_ORDER_OUT_STOCK)) {
- taskItem.setWkType(Short.parseShort(order.getWkType()));
+ taskItem.setWkType(Short.parseShort(order.getWkType()))
+ .setSourceCode(order.getCode())
+ .setSourceId(order.getId());
+ } else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK) || map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)) {
+ taskItem.setSource(item.getId())
+ .setSourceId(item.getLocId())
+ .setSourceCode(item.getLocCode());
}
taskItems.add(taskItem);
--
Gitblit v1.9.1