From dc82588470049e47e68dae6c30bc47e48a4af816 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 12 十二月 2025 09:51:02 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 145 ++++++++++++++++++++++++++++++------------------
1 files changed, 91 insertions(+), 54 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 b957470..a7612ae 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.api.enums.MatLocType;
+import com.zy.api.enums.MatType;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
@@ -701,15 +703,15 @@
throw new CoolException("缁勬墭鐗╂枡绫诲瀷涓嶄竴鑷达紝鍙湁鐩稿悓鐨勭墿鏂欏垎绫绘墠鍙互缁勬墭锛侊紒");
}
- BasContainer container = basContainerService.selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
- if (Objects.isNull(container)) {
- throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
- }
- if (container.getMixMax() < detlDtos.size()) {
- throw new CoolException("瓒呭嚭瀹瑰櫒鏈�澶ф贩瑁呮暟閲忥紝褰撳墠瀹瑰櫒鏈�澶ф暟閲忎负锛�" + container.getMixMax() + "!!");
- }
+// BasContainer container = basContainerService.selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
+// if (Objects.isNull(container)) {
+// throw new CoolException("鏁版嵁閿欒锛氬鍣ㄧ爜涓嶅瓨鍦紒锛�");
+// }
+// if (container.getMixMax() < detlDtos.size()) {
+// throw new CoolException("瓒呭嚭瀹瑰櫒鏈�澶ф贩瑁呮暟閲忥紝褰撳墠瀹瑰櫒鏈�澶ф暟閲忎负锛�" + container.getMixMax() + "!!");
+// }
//杩樺彲浠ユ斁鍏ュ灏戠鐗╂枡
- Integer suplus = container.getMixMax();
+// Integer suplus = container.getMixMax();
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
@@ -731,6 +733,7 @@
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(mat, waitPakin);
waitPakin.setOrderNo(detlDto.getOrderNo()); // 鍗曟嵁缂栧彿
+ waitPakin.setType(param.getType());
waitPakin.setOrderId(detlDto.getOrderId());
waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
@@ -1225,11 +1228,14 @@
* @version 1.0
*/
@Override
- public R callAgvMove(AgvCallParams params, Long userId) {
+ @Transactional
+ public synchronized R callAgvMove(AgvCallParams params, Long userId) {
if (Objects.isNull(params.getOrgSite())) {
throw new CoolException("婧愮珯鐐逛笉鑳戒负绌猴紒锛�");
}
+ BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>()
+ .eq("area_id",basAreas.getId())
.eq("frozen", 0)
.eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
// .eq("loc_no", params.getTarSite())
@@ -1239,7 +1245,12 @@
throw new CoolException("璇锋鏌ョ洰鏍囧簱浣嶆槸鍚﹂棽缃腑锛侊紒");
}
- generateAgvTask("agv", locCache, params.getOrgSite(), params.getBarcode(), userId);
+ try {
+ generateAgvTask("agv", locCache, params.getOrgSite(), params.getBarcode(), userId);
+ }catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+
return R.ok();
}
@@ -1282,28 +1293,58 @@
@Transactional(rollbackFor = Exception.class)
public R OutCallAgv(AgvCallParams params, Long userId) {
/**鑾峰彇鍏ュ簱鏈�鏃╃殑涓�鏉℃暟鎹�**/
- LocCache locCaches = locCacheService.selectOne(new EntityWrapper<LocCache>()
+ List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
.eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
.eq("frozen", 0)
- .orderDesc(Arrays.asList("sort", "first_time"))
- .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
- if (Objects.isNull(locCaches)) {
+ .orderDesc(Arrays.asList("sort", "first_time")));
+
+ if (locCaches.isEmpty()) {
throw new CoolException("鏆傛棤婊¤冻闇�姹傚簱浣嶏紒");
}
- BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
- .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
- .eq("dev_no", params.getTarSite()));
- if (Objects.isNull(station)) {
- throw new CoolException("绔欑偣姝ｅ湪鎵ц浠诲姟锛侊紒");
+
+ for (LocCache locCache : locCaches) {
+ //鑾峰彇缂撳瓨鍖轰俊鎭�
+ BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
+ if (Objects.isNull(basAreas)) {
+ throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
+ }
+
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("area_id", basAreas.getId())
+ .eq("loc_no", locCache.getLocNo()));
+ if (Objects.isNull(locDetls) || locDetls.isEmpty()) {
+ throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ Set<String> set = locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
+ List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().in("matnr", set));
+ if (Objects.isNull(matList) || matList.isEmpty()) {
+ throw new CoolException("鐗╂枡搴撲笉瀛樺湪璇ョ墿鏂�!!");
+ }
+ Set<Long> longs = matList.stream().map(Mat::getTagId).collect(Collectors.toSet());
+ if (!longs.isEmpty() && longs.size() > 1) {
+ throw new CoolException("鐗╂枡绫诲瀷涓嶄竴鑷�,璇锋鏌ユ暟鎹槸鍚︽纭�!!");
+ }
+
+ Mat mat = matList.stream().findFirst().get();
+
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
+ .eq("ctn_type", mat.getTagId())
+ .eq("dev_no", params.getTarSite()));
+ if (Objects.isNull(station)) {
+ continue;
+ }
+
+ /**鐢熸垚缂撳瓨鍖哄嚭搴撲换鍔�*/
+ generateCacheOutTask(station, locCache, userId);
+
+ /**鐢熸垚绔嬪簱鍑哄簱浠诲姟*/
+ generateCRNOutTask(station, locCache, userId);
+
+ return R.ok();
}
-
- /**鐢熸垚缂撳瓨鍖哄嚭搴撲换鍔�*/
- generateCacheOutTask(station, locCaches, userId);
-
- /**鐢熸垚绔嬪簱鍑哄簱浠诲姟*/
- generateCRNOutTask(station, locCaches, userId);
-
- return R.ok();
+ return R.error("鏈壘鍒颁笌绔欑偣绫诲瀷鍖归厤鐨勫簱瀛�");
}
@Override
@@ -1379,8 +1420,6 @@
throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦紒锛�");
}
-
-
List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().eq("barcode", barcode));
if (!tasks.isEmpty()) {
throw new CoolException("鎵樼洏宸插湪浠诲姟鎵ц涓�..");
@@ -1434,8 +1473,6 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
}
-
-
// 淇敼鐩爣搴撲綅鐘舵��
if (loc.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
@@ -1919,15 +1956,16 @@
throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦紒锛�");
}
- Set<String> set = locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
- List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().in("matnr", set));
- if (Objects.isNull(matList) || matList.isEmpty()) {
- throw new CoolException("鐗╂枡搴撲笉瀛樺湪璇ョ墿鏂�!!");
- }
- Set<Long> longs = matList.stream().map(Mat::getTagId).collect(Collectors.toSet());
- if (!longs.isEmpty() && longs.size() > 1) {
- throw new CoolException("鐗╂枡绫诲瀷涓嶄竴鑷�,璇锋鏌ユ暟鎹槸鍚︽纭�!!");
- }
+// Set<String> set = locDetls.stream().map(LocDetl::getMatnr).collect(Collectors.toSet());
+// List<Mat> matList = matService.selectList(new EntityWrapper<Mat>().in("matnr", set));
+//
+// if (Objects.isNull(matList) || matList.isEmpty()) {
+// throw new CoolException("鐗╂枡搴撲笉瀛樺湪璇ョ墿鏂�!!");
+// }
+// Set<Long> longs = matList.stream().map(Mat::getTagId).collect(Collectors.toSet());
+// if (!longs.isEmpty() && longs.size() > 1) {
+// throw new CoolException("鐗╂枡绫诲瀷涓嶄竴鑷�,璇锋鏌ユ暟鎹槸鍚︽纭�!!");
+// }
//鑾峰彇绔嬪簱鍖轰俊鎭�
BasAreas one = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_CRN.type));
@@ -2107,7 +2145,7 @@
task.setWrkNo(workNo)
.setIoTime(new Date())
.setWrkSts(11L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- .setIoType(loc.getLocSts().equals("D") ? 110 : 103) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setIoType(loc.getLocSts().equals("D") ? 110 : 101) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
.setTaskType("agv")
.setIoPri(10D)
.setFullPlt(loc.getLocSts().equals("D") ? "N" : "Y") // 婊℃澘锛歒
@@ -2218,11 +2256,10 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- List<TaskDetl> taskDetls = new ArrayList<>();
- pakins.forEach(pakin -> {
+ for (WaitPakin pakin :pakins){
TaskDetl wrkDetl = new TaskDetl();
BeanUtils.copyProperties(pakin, wrkDetl);
- wrkDetl.setWrkNo(workNo)
+ wrkDetl.setId(null).setWrkNo(workNo)
.setIoTime(new Date())
.setOrderNo(pakin.getOrderNo())
.setAnfme(pakin.getAnfme())
@@ -2235,22 +2272,22 @@
.setModel(pakin.getModel())
.setAppeTime(new Date())
.setModiUser(userId);
- taskDetls.add(wrkDetl);
- });
+ if (!taskDetlService.insert(wrkDetl)){
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
- //淇濆瓨宸ヤ綔妗ｆ槑缁�
- if (!taskDetlService.insertBatch(taskDetls)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
- pakins.forEach(pakin -> {
+
+ for (WaitPakin pakin : pakins){
pakin.setIoStatus("Y");
- });
-
- if (!waitPakinService.updateBatchById(pakins)) {
- throw new CoolException("鏇存柊缁勬墭淇℃伅澶辫触");
+ if (!waitPakinService.updateById(pakin)) {
+ throw new CoolException("鏇存柊缁勬墭淇℃伅澶辫触");
+ }
}
+
+
// 淇敼鐩爣搴撲綅鐘舵��
if (loc.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
loc.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.鍏ュ簱棰勭害
--
Gitblit v1.9.1