From 30bb734c3c5de070ab9513128980bfdbe1880857 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 03 十二月 2025 12:54:15 +0800
Subject: [PATCH] 入库流程功能开发
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 141 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 133 insertions(+), 8 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 2c9a489..2f151ef 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -8,13 +8,18 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.enums.CommonEnum;
+import com.zy.asrs.entity.result.ForwardAGVTaskDTO;
+import com.zy.asrs.entity.result.HIKApiDTO;
+import com.zy.asrs.entity.result.HIKResultDTO;
+import com.zy.asrs.enums.LocAreaType;
import com.zy.asrs.enums.LocStsType;
+import com.zy.asrs.enums.OrderSettle;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.common.constant.HIKApiConstant;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
@@ -114,6 +119,8 @@
private BasStationService basStationService;
@Autowired
private BasContainerService basContainerService;
+ @Autowired
+ private BasAreasService basAreasService;
@Override
@Transactional
@@ -956,7 +963,6 @@
log.error("", e);
}
}
-
}
// 鐢熸垚鍏ュ簱鍗曟嵁
@@ -1184,13 +1190,12 @@
.eq("frozen", 0)
.ne("full_plt", "Y")
.eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type).orderAsc(Arrays.asList("row1"))));
-
}
/**
* @author Ryan
* @date 2025/9/22
- * @description: 鍛煎彨AGV鎼繍
+ * @description: 鍛煎彨绌鸿溅
* @version 1.0
*/
@Override
@@ -1252,6 +1257,7 @@
*/
@Override
public R OutCallAgv(AgvCallParams params, Long userId) {
+ /**鑾峰彇鍏ュ簱鏈�鏃╃殑涓�鏉℃暟鎹�**/
LocCache locCaches = locCacheService.selectOne(new EntityWrapper<LocCache>()
.eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
.eq("frozen", 0)
@@ -1267,9 +1273,72 @@
throw new CoolException("绔欑偣姝ｅ湪鎵ц浠诲姟锛侊紒");
}
- generateOutTask(station, locCaches, userId);
+ /**鐢熸垚缂撳瓨鍖哄嚭搴撲换鍔�*/
+ generateCacheOutTask(station, locCaches, userId);
+
+ /**鐢熸垚绔嬪簱鍑哄簱浠诲姟*/
+ generateCRNOutTask(locCaches);
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()){
+ 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());
+ }
+
+ return R.ok();
+ }
+
+ /**
+ * 鐢熸垚绔嬪簱鍑哄簱浠诲姟
+ * @author Ryan
+ * @date 2025/12/3 8:06
+ * @param locCaches
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void generateCRNOutTask(LocCache locCaches) {
+ if (Objects.isNull(locCaches)) {
+ throw new CoolException("搴撲綅涓嶈兘涓虹┖锛侊紒");
+ }
+ 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.getAreaNo())
+ .eq("loc_id", locCaches.getId()));
+
+ if (Objects.isNull(locDetls)) {
+ throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ //鎸夌墿鏂欑紪鐮佸垎绫�
+ Map<String, List<LocDetl>> listMap = locDetls.stream().collect(Collectors.groupingBy(LocDetl::getMatnr));
+ listMap.forEach((key, detls) -> {
+
+ });
+
+ locDetls.forEach(locDetl -> {
+
+ });
}
/**
@@ -1279,7 +1348,7 @@
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
- public void generateOutTask(BasStation station, LocCache loc, Long userId) {
+ public void generateCacheOutTask(BasStation station, LocCache loc, Long userId) {
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
// 淇濆瓨宸ヤ綔妗�
@@ -1328,6 +1397,8 @@
.setModiUser(userId);
taskDetls.add(wrkDetl);
});
+
+
//淇濆瓨宸ヤ綔妗ｆ槑缁�
if (!taskDetlService.insertBatch(taskDetls)) {
@@ -1418,8 +1489,8 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// 淇敼鐩爣搴撲綅鐘舵��
- if (loc.getLocSts().equals("O")) {
- loc.setLocSts("S"); // S.鍏ュ簱棰勭害
+ if (loc.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ loc.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.鍏ュ簱棰勭害
loc.setModiTime(new Date());
loc.setModiUser(userId);
if (!locCacheService.updateById(loc)) {
@@ -1429,4 +1500,58 @@
throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + loc.getLocSts$());
}
}
+
+
+ public HIKResultDTO sendAgvTask(HIKApiDTO haiKangApiDTO,String path){
+ HIKResultDTO result = new HIKResultDTO();
+
+ ForwardAGVTaskDTO forwardAGVTaskParam = new ForwardAGVTaskDTO();
+ forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
+ forwardAGVTaskParam.setClientCode("IWMS");
+ forwardAGVTaskParam.setTaskTyp(haiKangApiDTO.getTaskType());
+ forwardAGVTaskParam.setCtnrTyp(haiKangApiDTO.getCtnrType());
+ forwardAGVTaskParam.setPriority(haiKangApiDTO.getPriority());
+ List<ForwardAGVTaskDTO.PositionCodePaths> positionCodePathsList = new ArrayList<>();
+ positionCodePathsList.add(new ForwardAGVTaskDTO.PositionCodePaths(haiKangApiDTO.getOrg(), haiKangApiDTO.getOrgType()));
+ positionCodePathsList.add(new ForwardAGVTaskDTO.PositionCodePaths(haiKangApiDTO.getTar(), haiKangApiDTO.getTarType()));
+ forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);
+
+ String body = JSON.toJSONString(forwardAGVTaskParam);
+ String response = "";
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(HIKApiConstant.AGV_IP)
+ .setPath(path)
+ .setJson(body)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(0)) {
+ result.setSuccess(true);
+ } else {
+ result.setMessage(jsonObject.getString("message"));
+ log.error("鍙戦�乤gv浠诲姟澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", HIKApiConstant.AGV_IP + path, body, response);
+ }
+// {"code":"1","data":"","interrupt":false,"message":"閲嶅鎻愪氦","msgErrCode":"0x3a80D012","reqCode":"fa92b49481a44627ae4d80c1400f28f6"}
+ } catch (Exception e) {
+ result.setMessage(e.getMessage());
+ log.error("鍙戦�乤gv浠诲姟寮傚父", e);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鍙戦�乤gv浠诲姟",
+ HIKApiConstant.AGV_IP + path,
+ null,
+ "127.0.0.1",
+ body,
+ response,
+ result.isSuccess()
+ );
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+ return result;
+ }
}
--
Gitblit v1.9.1