From 1fe0e87293c9f89ca29c4e29299c700e6115aee3 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 04 三月 2026 15:34:50 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/InBoundService.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java | 13 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java | 76 ++++++++++++++++++++++++++++++++++++++
3 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
index f6e6c60..188e7f2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.api.controller.pda;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.InBoundService;
@@ -35,4 +36,16 @@
return inBoundService.checkAgvStation(param, getLoginUserId());
}
+ @PostMapping("/check/non/order")
+ @ApiOperation("闈炶鍗曞嚭搴�")
+ public R checkNonOrder(@RequestBody PdaGeneralParam param) {
+ if (Cools.isEmpty(param.getTransferStationNo())) {
+ return R.error("鐩爣绔欑偣涓虹┖锛侊紒锛�");
+ }
+ if (Cools.isEmpty(param.getLocNo())) {
+ return R.error("璇烽�夋嫨璧风偣搴撲綅锛侊紒锛�");
+ }
+ return inBoundService.checkNonOrder(param, getLoginUserId());
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/InBoundService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/InBoundService.java
index 487b551..3bda3ee 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/InBoundService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/InBoundService.java
@@ -11,4 +11,5 @@
R generateTasks(PdaGeneralParam param, Long loginUserId);
R checkAgvStation(PdaGeneralParam param, Long loginUserId);
+ R checkNonOrder(PdaGeneralParam param, Long loginUserId);
}
\ No newline at end of file
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
index a82c6c0..c5ece92 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -25,6 +25,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -48,7 +49,11 @@
@Autowired
private LocService locService;
@Autowired
+ private LocItemService locItemService;
+ @Autowired
private TaskService taskService;
+ @Autowired
+ private TaskItemService taskItemService;
private BasStation checkStaStatus(String barcode, String sta) {
@@ -285,4 +290,75 @@
return R.ok(basStation);
}
+ @Override
+ public R checkNonOrder(PdaGeneralParam param, Long loginUserId) {
+
+ BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, param.getTransferStationNo()));
+ if (Objects.isNull(station) || !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type) ) {
+ throw new CoolException("鐩爣绔欑偣涓嶅瓨鍦ㄦ垨绔欑偣涓嶅浜庣┖搴撶姸鎬侊紒锛�");
+ }
+
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, param.getLocNo()));
+ if (Objects.isNull(loc) || !loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type) ) {
+ throw new CoolException("璧风偣搴撲綅涓嶅瓨鍦ㄦ垨涓嶅浜庡湪搴撶姸鎬侊紒锛�");
+ }
+ List<LocItem> itemParams = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));
+
+ if (itemParams.isEmpty()) {
+ throw new CoolException("璧风偣搴撲綅搴撳瓨鏄庣粏涓虹┖锛屽紓甯革紒锛�");
+ }
+ Task task = new Task();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ task.setOrgLoc(loc.getCode())
+ .setTaskCode(ruleCode)
+ .setOrgLoc(loc.getCode())
+ .setTargSite(station.getStationName())
+ .setResource(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)
+ .setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
+ .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)
+ .setBarcode(param.getContainerNo())
+ .setCreateTime(new Date())
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date())
+ .setCreateBy(loginUserId)
+ .setBarcode(loc.getBarcode());
+
+ if (!taskService.save(task)) {
+ throw new CoolException("鐩樼偣浠诲姟鐢熸垚澶辫触锛侊紒");
+ }
+ List<TaskItem> taskItems = new ArrayList<>();
+ for (LocItem item : itemParams) {
+ TaskItem taskItem = new TaskItem();
+ BeanUtils.copyProperties(item, taskItem);
+ taskItem.setTaskId(task.getId())
+ .setAnfme(item.getAnfme())
+ .setBatch(item.getBatch())
+ .setUpdateBy(loginUserId)
+ .setSourceId(item.getLocId())
+ .setSourceCode(item.getLocCode())
+ .setSource(item.getId())
+ .setUpdateTime(new Date())
+ .setSplrBatch(item.getBatch())
+ .setPlatWorkCode(item.getPlatWorkCode())
+ .setPlatItemId(item.getPlatItemId())
+ .setOrderType(OrderType.ORDER_IN.type)
+ .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
+ taskItems.add(taskItem);
+ }
+ if (!taskItemService.saveBatch(taskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅棰勭害鍑哄簱澶辫触锛侊紒");
+ }
+ return R.ok();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1