From 5c90daa2c919f3f07df0a154ff91f0e015bf8d66 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 17:07:28 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 26 ++++++++++++++++++++------
1 files changed, 20 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 e2893b3..6b434a1 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);
@@ -280,6 +280,10 @@
if (Objects.isNull(loc)) {
throw new CoolException("褰撳墠搴撲綅涓嶅瓨鍦紒锛�");
}
+ Task task1 = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, key));
+ if (!Objects.isNull(task1)) {
+ throw new CoolException("鎵樼洏浠诲姟宸插瓨鍦紒锛�");
+ }
List<CheckOrderItemParams> itemParams = listMap.get(key);
CheckOrderItemParams checkItem = itemParams.stream().findFirst().get();
Task task = new Task();
@@ -294,6 +298,8 @@
.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
.setTaskStatus(TaskStsType.GENERATE_OUT.id)
.setCreateTime(new Date())
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date())
.setCreateBy(loginUserId)
.setBarcode(key);
@@ -304,8 +310,8 @@
itemParams.forEach(item -> {
TaskItem taskItem = new TaskItem();
taskItem.setTaskId(task.getId())
- .setOrderId(checkParam.getOrderId())
.setOrderType(OrderType.ORDER_CHECK.type)
+ .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type))
.setAnfme(item.getAnfme())
.setWorkQty(0.0)
.setBatch(checkParam.getBatch())
@@ -313,12 +319,20 @@
.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())
+ .setOrderItemId(checkParam.getId())
+ .setOrderId(checkParam.getOrderId())
.setPlatItemId(checkParam.getPlatItemId());
items.add(taskItem);
--
Gitblit v1.9.1