From f77481e1f51ea1eada83377ef067e7988f3db356 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 03 三月 2026 16:50:39 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index e87e8f8..2983a0e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -31,7 +31,6 @@
import com.zy.common.utils.HttpHandler;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
-import com.zy.system.service.impl.ConfigServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -1328,8 +1327,12 @@
throw new CoolException("璇锋鏌ョ洰鏍囧簱浣嶆槸鍚﹂棽缃腑锛侊紒");
}
+ String taskType = "M2";
+ if (!params.getIsNewIn().isEmpty()) {
+ taskType = "M1";
+ }
try {
- generateAgvTask("agv", locCache, params.getOrgSite(), params.getBarcode(), userId);
+ generateAgvTask("agv", locCache, params.getOrgSite(), params.getBarcode(), userId, taskType);
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
@@ -2484,7 +2487,7 @@
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
- public void generateAgvTask(String type, LocCache loc, String orgSite, String barcode, Long userId) {
+ public void generateAgvTask(String type, LocCache loc, String orgSite, String barcode, Long userId, String isNewIn) {
List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().eq("barcode", barcode));
if (!tasks.isEmpty()) {
throw new CoolException("鎵樼洏宸插湪浠诲姟鎵ц涓�..");
@@ -2499,6 +2502,7 @@
.setIoType(1) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
.setTaskType("agv")
.setIoPri(10D)
+ .setIsNewIn(isNewIn)
.setLocNo(loc.getLocNo()) // 鐩爣搴撲綅
.setFullPlt("Y") // 婊℃澘锛歒
.setPicking("N") // 鎷ｆ枡
@@ -2665,7 +2669,7 @@
try {
//绌哄彴杞﹀洖搴�
- generateAgvTask("agv_back", locCache, callAgvBackParam.getOrgSite(), station.getBarcode(), userId);
+ generateAgvTask("agv_back", locCache, callAgvBackParam.getOrgSite(), station.getBarcode(), userId, "M2");
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
@@ -2800,6 +2804,24 @@
}
/**
+ * 鑾峰彇缂撳瓨绔欑偣淇℃伅
+ * @param type
+ * @return
+ */
+ @Override
+ public R getCacheSites(String type) {
+ BasAreas areas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", type));
+ if (Objects.isNull(areas)) {
+ return R.error("搴撳尯涓嶅瓨鍦紒");
+ }
+ List<BasStation> stations = basStationService.selectList(new EntityWrapper<BasStation>().eq("area_id", areas.getId()));
+ if (Objects.isNull(stations) || stations.isEmpty()) {
+ return R.error("绔欑偣涓嶅瓨鍦紒");
+ }
+ return R.ok("鏌ヨ鎴愬姛").add(stations);
+ }
+
+ /**
* 鐢熸垚绉诲簱浠诲姟
*
* @param result
--
Gitblit v1.9.1