From ee536f9aedaf642d64ba2681778fd4e74731d00c Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 16 一月 2026 16:47:28 +0800
Subject: [PATCH] lsh#空板流程
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 68 ++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 6 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 38 ++++++------
rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java | 5 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocItemService.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocToTaskParams.java | 2
7 files changed, 101 insertions(+), 21 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 893c0c6..8427aa3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -10,10 +10,10 @@
import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.common.constant.Constants;
+import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.StationTypeEnum;
-import com.vincent.rsf.server.manager.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl;
import lombok.Synchronized;
@@ -48,6 +48,8 @@
private LocService locService;
@Autowired
private BasContainerServiceImpl basContainerService;
+ @Autowired
+ private LocItemService locItemService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -257,14 +259,14 @@
if (Cools.isEmpty(basContainer)){
throw new CoolException("鏈煡璇㈠埌鐩稿叧瀹瑰櫒瑙勫垯");
}
- String barcodeType = "barcode REGEXP "+basContainer.getCodeType();
+ String barcodeType = "barcode REGEXP '"+basContainer.getCodeType()+"'";
//瀹瑰櫒绫诲瀷鏌ヨ 璧风偣
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
.apply(barcodeType)
.eq(Loc::getDeleted, 0)
.eq(Loc::getStatus, 1)
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type)
.in(Loc::getAreaId, areaList)
- .eq(Loc::getUseStatus, "O")
.orderByDesc(Loc::getId)
.last("LIMIT 1"),
false);
@@ -272,21 +274,17 @@
if (Cools.isEmpty(loc)){
throw new CoolException("鏈煡璇㈠埌绗﹀悎鏉′欢鐨勬墭鐩�");
}
-// if (basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
-// //鍏夌數绔欑偣锛�
-// Long area = basStation.getArea();
-// //鏄惁闇�瑕佽浆闈炲厜鐢电珯鐐�
-// //绔嬪簱鍑哄簱==銆嬬粨鏉�
-// //AGV==銆嬬珛搴�==銆嬬粨鏉�
-// } else {
-// //闈炲厜鐢电珯鐐�
-// //鏄惁闇�瑕佽浆鍏夌數绔欑偣
-// //AGV==銆嬬粨鏉�
-// //绔嬪簱鍑哄簱==銆婣GV==銆嬬粨鏉�
-//
-// }
-
- return R.ok().add(loc);
+ //鐢熸垚鐩樼偣浠诲姟鍙傛暟
+ LocToTaskParams locToTaskParams = new LocToTaskParams();
+ locToTaskParams.setType(Constants.TASK_TYPE_OUT_STOCK_EMPTY)
+ .setSiteNo(basStation.getStationName())
+ .setOrgLoc(loc.getId().toString());
+ try{
+ locItemService.generateTaskEmpty(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val,locToTaskParams,loginUserId);
+ } catch (Exception e){
+ throw new CoolException(e.getMessage());
+ }
+ return R.ok();
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java
index 8b6e00e..e562231 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java
@@ -98,6 +98,11 @@
public static final String TASK_TYPE_OUT_STOCK = "outStock";
/**
+ * 瀹瑰櫒鍑哄簱
+ */
+ public static final String TASK_TYPE_OUT_STOCK_EMPTY = "empty";
+
+ /**
* 搴撳瓨鐩樼偣鍑哄簱
*/
public static final String TASK_TYPE_OUT_CHECK = "check";
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocToTaskParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocToTaskParams.java
index 6f4700d..b2aafe3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocToTaskParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocToTaskParams.java
@@ -14,7 +14,7 @@
@ApiModel(value = "LocToTaskParams", description = "搴撳瓨鍑哄簱鍙傛暟")
public class LocToTaskParams {
- @ApiModelProperty("绫诲瀷锛� check:鐩樼偣鍑哄簱锛� outStock: 搴撳瓨鍑哄簱")
+ @ApiModelProperty("绫诲瀷锛� check:鐩樼偣鍑哄簱锛� outStock: 搴撳瓨鍑哄簱锛� empty锛氱┖鏉垮嚭搴�")
private String type;
@ApiModelProperty("鍘熷崟鎹甀D (鐢ㄦ埛鍗曟嵁鍑哄簱鏌ユ壘涓氬姟绫诲瀷")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java
index 3e72343..3794f30 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java
@@ -16,6 +16,8 @@
TASK_RESOUCE_CHECK_TYPE("5", "鐩樼偣鍑哄簱浠诲姟"),
+ TASK_RESOUCE_EMPTY_TYPE("6", "绌哄鍣ㄥ嚭搴撲换鍔�"),
+
;
TaskResouceType(String val, String desc) {
this.val = Short.parseShort(val);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 44ee6df..d5f77f6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.schedules;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -8,6 +9,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.cfg.CoercionAction;
import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.config.RemotesInfoProperties;
@@ -255,6 +257,10 @@
BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName,
task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id) ? task.getOrgSite() : task.getTargSite()));
+ if (Cools.isEmpty(station)){
+ log.info("闈炲厜鐢电珯鐐逛换鍔′笅鍙戯細绔欑偣淇℃伅寮傚父锛屼换鍔′俊鎭細"+ JSON.toJSONString(task));
+ continue;
+ }
if (station.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
continue;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocItemService.java
index 544c3e2..a7694f1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocItemService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocItemService.java
@@ -11,6 +11,7 @@
public interface LocItemService extends IService<LocItem> {
void generateTask(Short resouce, LocToTaskParams map, Long loginUserId) throws Exception;
+ void generateTaskEmpty(Short resouce, LocToTaskParams map, Long loginUserId) throws Exception;
Task genMoveTask(LocToTaskParams map, Long loginUserId);
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 fb68257..a8de2f5 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
@@ -55,6 +55,74 @@
/**
* 搴撳瓨鍑哄簱鐢熸垚鍑哄簱浠诲姟
+ * type: 绌烘澘鍑哄簱
+ *
+ * @param resouce
+ * @param map
+ * @param loginUserId
+ * @return
+ */
+ @Override
+ @Synchronized
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized void generateTaskEmpty(Short resouce, LocToTaskParams map, Long loginUserId) throws Exception {
+ if (Objects.isNull(map.getSiteNo())) {
+ throw new CoolException("鐩爣绔欑偣涓嶈兘涓虹┖锛�");
+ }
+ if (Objects.isNull(map.getOrgLoc())) {
+ throw new CoolException("婧愬簱浣嶄笉鑳戒负绌猴紒");
+ }
+ String siteNo = map.getSiteNo();
+ Task task = new Task();
+ Loc loc = locService.getById(Long.decode(map.getOrgLoc()));
+ logger.info("搴撲綅锛�>{}", loc.getCode());
+ if (Objects.isNull(loc)) {
+ throw new CoolException("鏁版嵁閿欒锛氭墍閫夊簱瀛樹俊鎭笉瀛樺湪锛侊紒");
+ }
+ if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_D.type)) {
+ throw new CoolException("搴撲綅:" + loc.getCode() + ",涓嶅浜嶥.绌烘澘鐘舵�侊紝涓嶅彲鎵цR.鍑哄簱棰勭害鎿嶄綔锛侊紒");
+ }
+
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+ 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)
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+ .setBarcode(loc.getBarcode())
+ .setMemo(map.getMemo());
+
+ if (map.getType().equals(Constants.TASK_TYPE_OUT_STOCK_EMPTY)) {
+ //绌哄鍣ㄥ嚭搴�
+ DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+ .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel())
+ .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPITY_OUT.type));
+ if (Objects.isNull(deviceSite)) {
+ throw new CoolException("绔欑偣涓嶆敮鎸佺┖瀹瑰櫒鍑哄簱锛侊紒");
+ }
+ task.setTaskType(TaskType.TASK_TYPE_EMPITY_OUT.type).setWarehType(deviceSite.getDevice());
+ } else {
+ throw new CoolException("绌哄鍣ㄥ嚭搴擄紒锛佸叾浠栫被鍨嬫棤鏁堬紝杩涘叆绫诲瀷锛�"+map.getType());
+ }
+
+ if (!taskService.save(task)) {
+ throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
+ }
+ }
+
+
+ /**
+ * 搴撳瓨鍑哄簱鐢熸垚鍑哄簱浠诲姟
* type: check 鐩樼偣, stock: 搴撳瓨鍑哄簱
*
* @param resouce
--
Gitblit v1.9.1