From 2b0e94aaf3aadc55db3069d69bc9f1b45455299d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 08:58:51 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
index 8a93ef2..e5a5103 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -8,10 +8,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.controller.params.CheckOrderItemParams;
-import com.vincent.rsf.server.manager.controller.params.CheckOrderParams;
-import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
+import com.vincent.rsf.server.manager.controller.params.*;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.enums.*;
@@ -239,7 +236,10 @@
* @version 1.0
*/
@Override
- public R getAllLocByMatnr(List<String> matnrs) {
+ public R getAllLocByMatnr(CheckLocQueryParams matnrs) {
+ if (Objects.isNull(matnrs.getMatnrCode()) && matnrs.getMatnrCode().isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
List<LocItem> locItems = locItemService.listByMatnr(matnrs);
if (!locItems.isEmpty()) {
List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_CHECK_IN.type);
@@ -251,7 +251,7 @@
throw new CoolException("搴撳彛涓嶄负绌猴紒锛�");
}
locItems.forEach(locItem -> {
- locItem.setSiteNo(deviceSite.getSite());
+ locItem.setSite(deviceSite.getSite());
});
}
return R.ok().add(locItems);
@@ -311,6 +311,7 @@
TaskItem taskItem = new TaskItem();
taskItem.setTaskId(task.getId())
.setOrderType(OrderType.ORDER_CHECK.type)
+ .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type))
.setAnfme(item.getAnfme())
.setWorkQty(0.0)
.setBatch(checkParam.getBatch())
@@ -318,11 +319,15 @@
.setMatnrCode(checkParam.getMatnrCode())
.setPlatOrderCode(checkParam.getPlatOrderCode())
.setPlatWorkCode(checkParam.getPlatWorkCode())
+ .setUnit(checkParam.getStockUnit())
.setSpec(checkParam.getSpec())
.setModel(checkParam.getModel())
.setFieldsIndex(checkParam.getFieldsIndex())
.setMatnrId(checkParam.getMatnrId())
.setCreateBy(loginUserId)
+ .setSource(checkParam.getId())
+ .setSourceId(checkParam.getOrderId())
+ .setSourceCode(checkParam.getOrderCode())
.setCreateTime(new Date())
.setUpdateBy(loginUserId)
.setUpdateTime(new Date())
--
Gitblit v1.9.1