From 4693c6fa42d2cb72594b6b58e9fab9e0d4c224aa Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 08 十二月 2025 15:58:43 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 221 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 172 insertions(+), 49 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 15df4a6..f5b2ed2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -13,6 +13,8 @@
import com.zy.asrs.entity.result.HIKResultDTO;
import com.zy.asrs.enums.*;
import com.zy.asrs.enums.OrderSettle;
+import com.zy.asrs.enums.LocAreaType;
+import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
@@ -626,6 +628,12 @@
waitPakin.setIoStatus("N");
waitPakin.setAnfme(detlDto.getAnfme());
waitPakin.setStatus("Y");
+ waitPakin.setStandby1(detlDto.getStandby1());
+ waitPakin.setStandby2(detlDto.getStandby2());
+ waitPakin.setStandby3(detlDto.getStandby3());
+ waitPakin.setBoxType1(detlDto.getBoxType1());
+ waitPakin.setBoxType2(detlDto.getBoxType2());
+ waitPakin.setBoxType3(detlDto.getBoxType3());
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
@@ -1279,41 +1287,131 @@
/**鐢熸垚缂撳瓨鍖哄嚭搴撲换鍔�*/
generateCacheOutTask(station, locCaches, userId);
-// /**鐢熸垚绔嬪簱鍑哄簱浠诲姟*/
+ /**鐢熸垚绔嬪簱鍑哄簱浠诲姟*/
generateCRNOutTask(station, locCaches, userId);
return R.ok();
}
@Override
- public R callEmptyCar(AgvCallParams params) {
- List<LocCache> locSts = locCacheService.selectList(new EntityWrapper<LocCache>().eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type));
- if (locSts.isEmpty()){
+ public R callEmptyCar(AgvCallParams params, Long userId) {
+
+ BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("name", params.getOrgSite()));
+
+
+ List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type)
+ .eq("area_id", basAreas.getId())
+ );
+ if (locCaches.isEmpty()) {
throw new CoolException("鏆傛棤绌烘澘搴撲綅");
}
- HIKApiDTO hikApiDTO =new HIKApiDTO()
- .setOrg(locSts.get(0).getLocNo())
- .setOrgType("05")
- .setTar(params.getTarSite())
- .setTarType("05")
- .setTaskType("GT5")
- .setPriority("1")
- .setCtnrType("2")
- ;
- HIKResultDTO hikResultDTO = sendAgvTask(hikApiDTO, HIKApiConstant.AGV_CALL_IN_PATH);
- if (!hikResultDTO.isSuccess()){
- return R.error(hikResultDTO.getMessage());
+ 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("绔欑偣姝ｅ湪鎵ц浠诲姟锛侊紒");
}
+ generateCacheOutTask(station, locCaches.get(0), userId);
+
+
+// HIKApiDTO hikApiDTO =new HIKApiDTO()
+// .setOrg(locCaches.get(0).getLocNo())
+// .setOrgType("05")
+// .setTar(params.getTarSite())
+// .setTarType("05")
+// .setTaskType("GT5")
+// .setPriority("1")
+// .setCtnrType("2")
+// ;
+// HIKResultDTO hikResultDTO = sendAgvTask(hikApiDTO, HIKApiConstant.AGV_CALL_IN_PATH);
+// if (!hikResultDTO.isSuccess()){
+// return R.error(hikResultDTO.getMessage());
+// }
+
+ return R.ok();
+ }
+
+ @Override
+// @Transactional(rollbackFor = Exception.class)
+ public R collectionInCall(AgvCallParams params, Long userId) {
+ if (Objects.isNull(params.getOrgSite())) {
+ throw new CoolException("婧愮珯鐐逛笉鑳戒负绌猴紒锛�");
+ }
+
+ List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().eq("barcode", params.getBarcode()));
+ if (!tasks.isEmpty()) {
+ throw new CoolException("鎵樼洏鐮佸凡鐢熸垚浠诲姟");
+ }
+
+ BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("name", params.getTarSite()));
+
+ List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
+ .in("loc_sts", LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_D.type)
+ .eq("area_id", basAreas.getId()));
+ if (locCaches.isEmpty()) {
+ throw new CoolException("褰撳墠鏆傛棤绌哄簱浣嶏紒锛�");
+ }
+
+ generateAgvTask("agv", locCaches.get(0), params.getOrgSite(), params.getBarcode(), userId);
return R.ok();
}
/**
+ * 缂撳瓨鍑哄簱缁勬墭涓婃灦
+ * @author Ryan
+ * @date 2025/12/8 13:47
+ * @param params
+ * @return com.core.common.R
+ */
+ @Override
+ public R combOutPub(AgvCallParams params) {
+
+ return R.ok();
+ }
+
+ /**
+ * 缂撳瓨缁勬墭鏁版嵁
+ * @author Ryan
+ * @date 2025/12/8 15:37
+ * @param params
+ * @return com.core.common.R
+ */
+ @Override
+ public R combCacehList(AgvCallParams params) {
+ if (Objects.isNull(params.getBarcode())) {
+ throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(params.getBsCode())) {
+ throw new CoolException("BS鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ Task task = taskService.selectOne(new EntityWrapper<Task>()
+ .eq("io_type", TaskIOType.PICK_OUT.type)
+ .eq("wrk_sts", 14)
+ .eq("barcode", params.getBarcode()));
+ if (Objects.isNull(task)) {
+ throw new CoolException("鏁版嵁閿欒锛氫换鍔′俊鎭瓨鍦紒锛�");
+ }
+
+ List<TaskDetl> taskDetl = taskDetlService.selectList(new EntityWrapper<TaskDetl>()
+ .eq("three_code", params.getBsCode())
+ .eq("zpallet", params.getBarcode()));
+
+ if (Objects.isNull(taskDetl) || taskDetl.isEmpty()) {
+ throw new CoolException("褰撳墠BS缂栫爜涓嶅瓨鍦紒锛�");
+ }
+
+ return R.ok().add(taskDetl);
+ }
+
+ /**
* 鐢熸垚绔嬪簱鍑哄簱浠诲姟
+ *
+ * @param locCaches
* @author Ryan
* @date 2025/12/3 8:06
- * @param locCaches
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -1405,9 +1503,10 @@
/**
* 鐢熸垚鍫嗗灈鏈哄嚭搴撲换鍔�
+ *
+ * @param locMasts
* @author Ryan
* @date 2025/12/6 14:44
- * @param locMasts
*/
@Transactional(rollbackFor = Exception.class)
public void generateOutTask(List<LocMast> locMasts, Integer ioType, BasDevp devp, Long userId) {
@@ -1493,10 +1592,10 @@
task.setWrkNo(workNo)
.setIoTime(new Date())
.setWrkSts(11L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- .setIoType(101) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setIoType(loc.getLocSts().equals("D") ? 110 : 103) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
.setTaskType("agv")
.setIoPri(10D)
- .setFullPlt("Y") // 婊℃澘锛歒
+ .setFullPlt(loc.getLocSts().equals("D") ? "N" : "Y") // 婊℃澘锛歒
.setPicking("N") // 鎷ｆ枡
.setExitMk("N")// 閫�鍑�
.setStaNo(station.getDevNo())
@@ -1511,32 +1610,33 @@
if (!taskService.insert(task)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_id", loc.getId()));
- if (Objects.isNull(detls) || detls.isEmpty()) {
- throw new CoolException("鏁版嵁閿欒锛氬簱浣嶆槑缁嗕负绌猴紒锛�");
- }
- List<TaskDetl> taskDetls = new ArrayList<>();
- detls.forEach(pakin -> {
- TaskDetl wrkDetl = new TaskDetl();
- BeanUtils.copyProperties(pakin, wrkDetl);
- wrkDetl.setWrkNo(workNo)
- .setIoTime(new Date())
- .setOrderNo(pakin.getOrderNo())
- .setAnfme(pakin.getAnfme())
- .setZpallet(pakin.getZpallet())
- .setBatch(pakin.getBatch())
- .setMatnr(pakin.getMatnr())
- .setMaktx(pakin.getMaktx())
- .setAppeUser(userId)
- .setUnit(pakin.getUnit())
- .setModel(pakin.getModel())
- .setAppeTime(new Date())
- .setModiUser(userId);
- taskDetls.add(wrkDetl);
- });
- //淇濆瓨宸ヤ綔妗ｆ槑缁�
- if (!taskDetlService.insertBatch(taskDetls)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+
+ List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", loc.getLocNo()));
+ if (!detls.isEmpty()) {
+ List<TaskDetl> taskDetls = new ArrayList<>();
+ detls.forEach(pakin -> {
+ TaskDetl wrkDetl = new TaskDetl();
+ BeanUtils.copyProperties(pakin, wrkDetl);
+ wrkDetl.setWrkNo(workNo)
+ .setIoTime(new Date())
+ .setOrderNo(pakin.getOrderNo())
+ .setAnfme(pakin.getAnfme())
+ .setZpallet(pakin.getZpallet())
+ .setBatch(pakin.getBatch())
+ .setMatnr(pakin.getMatnr())
+ .setMaktx(pakin.getMaktx())
+ .setAppeUser(userId)
+ .setUnit(pakin.getUnit())
+ .setModel(pakin.getModel())
+ .setAppeTime(new Date())
+ .setModiUser(userId);
+ taskDetls.add(wrkDetl);
+ });
+ //淇濆瓨宸ヤ綔妗ｆ槑缁�
+ if (!taskDetlService.insertBatch(taskDetls)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
}
loc.setLocSts(LocStsType.LOC_STS_TYPE_R.type);
@@ -1548,8 +1648,8 @@
}
// 淇敼鐩爣绔欑偣淇℃伅
- if (station.getLocSts().equals("O")) {
- station.setLocSts("S"); // S.鍏ュ簱棰勭害
+ if (station.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ station.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.鍏ュ簱棰勭害
station.setModiTime(new Date());
station.setModiUser(userId);
if (!basStationService.updateById(station)) {
@@ -1622,6 +1722,15 @@
if (!taskDetlService.insertBatch(taskDetls)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
+
+ pakins.forEach(pakin -> {
+ pakin.setIoStatus("Y");
+ });
+
+ if (!waitPakinService.updateBatchById(pakins)) {
+ throw new CoolException("鏇存柊缁勬墭淇℃伅澶辫触");
+ }
+
// 淇敼鐩爣搴撲綅鐘舵��
if (loc.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
loc.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.鍏ュ簱棰勭害
@@ -1633,10 +1742,24 @@
} else {
throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + loc.getLocSts$());
}
+
+ // 淇敼鐩爣绔欑偣淇℃伅
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", orgSite));
+ if (station.getLocSts().equals("O")) {
+ station.setLocSts("R"); // S.鍏ュ簱棰勭害
+ station.setBarcode(barcode);
+ station.setModiTime(new Date());
+ station.setModiUser(userId);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + station.getLocSts());
+ }
}
- public HIKResultDTO sendAgvTask(HIKApiDTO haiKangApiDTO,String path){
+ public HIKResultDTO sendAgvTask(HIKApiDTO haiKangApiDTO, String path) {
HIKResultDTO result = new HIKResultDTO();
ForwardAGVTaskDTO forwardAGVTaskParam = new ForwardAGVTaskDTO();
--
Gitblit v1.9.1