From f0bf8f7252ab482b4ce82082dbc67fc0b77477f0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 20 十二月 2025 16:36:24 +0800
Subject: [PATCH] pda空托出库
---
src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java | 21 +++---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 88 +++++++++++++++--------------
src/main/resources/application-dev.yml | 4 +
src/main/java/com/zy/asrs/controller/MobileController.java | 8 ++
src/main/java/com/zy/asrs/service/MobileService.java | 2
5 files changed, 67 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2335fea..3e69d15 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -529,10 +529,14 @@
@PostMapping("/callEmptyBinOutBound")
@ManagerAuth(memo = "pda鍛煎彨绌烘枡妗嗗嚭搴�")
public synchronized R callEmptyBinOutBound(@RequestBody JSONObject param) {
- if(!param.containsKey("staNo") || !param.containsKey("locType")){ // 1.绐勶紝2.瀹�
+ if(!param.containsKey("staNo") || !param.containsKey("locType") || !param.containsKey("count")){ // 1.绐勶紝2.瀹�
return R.parse(BaseRes.PARAM);
}
- return mobileService.callEmptyBinOutBound(null,param.getString("staNo"),param.getString("locType"),getUserId());
+ int count = param.getInteger("count");
+ if (count <= 0 || count > 10) {
+ return R.parse("鏁伴噺鏈夎锛宑ount:" + count);
+ }
+ return mobileService.callEmptyBinOutBound(null,param.getString("staNo"),param.getString("locType"),count,getUserId());
}
@PostMapping("/callEmptyBinInBound")
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index de92c86..a561770 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -107,7 +107,7 @@
* @param locType 鎵樼洏绫诲瀷 1.绐勶紝2.瀹�
* @param userId 鐢ㄦ埛id
*/
- R callEmptyBinOutBound(MesOutApply mesOutApply,String staNo, String locType, Long userId);
+ R callEmptyBinOutBound(MesOutApply mesOutApply,String staNo, String locType, int count, Long userId);
/**
* pda鍛煎彨鏂欐鍥炲簱
diff --git a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
index 38a457c..c18ad1e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java
@@ -372,7 +372,7 @@
// 绌烘墭鍑哄簱
if (StringUtils.isEmpty(mesOutApply.getOrderNo()) && "01".equals(mesOutApply.getTransType())) {
// 鐢熸垚绌烘墭鍑哄簱浠诲姟
- mobileService.callEmptyBinOutBound(mesOutApply,WMS_TRANS_START_STATION_1,"1",defaultUserId);
+ mobileService.callEmptyBinOutBound(mesOutApply,WMS_TRANS_START_STATION_1,"1",1,defaultUserId);
// try {
// if (!StringUtils.isEmpty(mesOutApply.getTaskno()) && !StringUtils.isEmpty(mesOutApply.getStationId())) {
@@ -586,8 +586,8 @@
transTask.setOrderNo(mesInApply.getOrderNo());
transTask.setTransType(mesInApply.getTransType());
transTask.setCurProcess(mesInApply.getProductLineId());
- transTask.setCurStationId("A3");
- transTask.setNextStationId("A4");
+ transTask.setCurStationId(mesInApply.getStationID());
+ transTask.setNextStationId(WMS_TRANS_START_STATION_2);
transTask.setItemno(WMS_ZPALLET_ID); // 鍥哄畾涓虹┖鎵樼殑缂栫爜
transTask.setQty(1); // 绌烘墭鍙洖1涓�
transTask.setProductLineId(mesInApply.getProductLineId());
@@ -595,7 +595,7 @@
transTask.setAgvFactory(1);
JSONObject sendAgvTask = submitTask(transTask);
if (!"1".equals(sendAgvTask.getString("Success"))) {
- log.error("鍑哄簱涓嬪彂agv杩愯緭浠诲姟澶辫触,{}", JSONObject.toJSONString(transTask));
+ log.error("鍏ュ簱涓嬪彂agv杩愯緭浠诲姟澶辫触,{}", JSONObject.toJSONString(transTask));
return 2;
}
} else {
@@ -678,7 +678,6 @@
OrderInAndOutUtil.updateOrder(Boolean.TRUE, orderPakin.getId(), 2L, defaultUserId);
// 鍛煎彨AGV浠庝骇绾胯繍鍥炵珛搴�
- try {
if (!StringUtils.isEmpty(mesInApply.getTaskno())) {
TransTask transTask = new TransTask();
transTask.setTaskno(mesInApply.getTaskno());
@@ -697,12 +696,12 @@
transTask.setAgvFactory(1);
JSONObject sendAgvTask = submitTask(transTask);
if (!"1".equals(sendAgvTask.getString("Success"))) {
- log.error("鍑哄簱涓嬪彂agv杩愯緭浠诲姟澶辫触:{}", JSONObject.toJSONString(transTask));
+ log.error("鍏ュ簱涓嬪彂agv杩愯緭浠诲姟澶辫触:{}", JSONObject.toJSONString(transTask));
+ throw new CoolException("鍏ュ簱涓嬪彂agv杩愯緭浠诲姟澶辫触");
}
+ } else {
+ throw new CoolException("MES鍏ュ簱涓嬪彂agv杩愯緭浠诲姟澶辫触");
}
- } catch (Exception e) {
- log.error("涓嬪彂AGV杩愯緭浠诲姟澶辫触", e);
- }
}
return 1;
@@ -1124,9 +1123,9 @@
// 杞彂缁欐捣搴锋垨鍗庢檽RCS
RcsReturn rcsReturn = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
if (rcsReturn.getCode().equals("SUCCESS")) {
- JSONObject data = rcsReturn.getData();
- String robotTaskCode = data.getString("robotTaskCode");
if (Cools.isEmpty(transTask.getTaskno())) {
+ JSONObject data = rcsReturn.getData();
+ String robotTaskCode = data.getString("robotTaskCode");
transTask.setTaskno(robotTaskCode);
result.put("taskno", transTask.getTaskno());
}
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 29ffc69..174cbdd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1287,60 +1287,64 @@
@Override
@Transactional
- public R callEmptyBinOutBound(MesOutApply mesOutApply, String staNo, String locType, Long userId) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", 'D').eq("loc_type2", locType));
- if(locMast == null) {
- return R.parse("璇ョ被鍨嬶細" + locType +"绌烘墭鐩樹笉瀛樺湪");
+ public R callEmptyBinOutBound(MesOutApply mesOutApply, String staNo, String locType,int count, Long userId) {
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().setSqlSelect("TOP " + count + " *")
+ .eq("loc_sts", "D").eq("frozen", 0).eq("loc_type2", locType).orderBy("lev1").orderBy("bay1").orderBy("row1"));
+ if (locMastList.size() < count) {
+ return R.parse("绌烘墭鏁伴噺涓嶈冻(鎴栧喕缁�)锛屽墿浣欐暟閲忥細" + locMastList.size());
}
+
// 鑾峰彇璺緞
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", 110)
.eq("stn_no", 204)
- .eq("crn_no", locMast.getCrnNo());
+ .eq("crn_no", 1);
StaDesc staDesc = staDescService.selectOne(wrapper);
if (staDesc == null) {
return R.parse("鍑哄簱璺緞涓嶅瓨鍦�,绔欑偣锛�" + staNo);
}
- Date now = new Date();
- // 鐢熸垚宸ヤ綔妗�
- int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
- wrkMast.setIoPri(10D);
- wrkMast.setSourceStaNo(staDesc.getCrnStn$()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo$()); // 鐩爣绔�
- wrkMast.setCrnNo(staDesc.getCrnNo());
- wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
- wrkMast.setFullPlt("N"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("Y"); // 绌烘澘
- wrkMast.setLinkMis("N");
- wrkMast.setAppeUser(userId);
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(userId);
- wrkMast.setModiTime(now);
- if (mesOutApply != null) {
- wrkMast.setTaskNo(mesOutApply.getTaskno());
- wrkMast.setAgvSta(mesOutApply.getStationId());
- wrkMast.setMemo(JSONObject.toJSONString(mesOutApply));
- } else {
- wrkMast.setAgvSta(staNo);
- }
+ for (LocMast locMast: locMastList) {
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
+ wrkMast.setIoPri(10D);
+ wrkMast.setSourceStaNo(staDesc.getCrnStn$()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo$()); // 鐩爣绔�
+ wrkMast.setCrnNo(staDesc.getCrnNo());
+ wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("N"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setAppeUser(userId);
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (mesOutApply != null) {
+ wrkMast.setTaskNo(mesOutApply.getTaskno());
+ wrkMast.setAgvSta(mesOutApply.getStationId());
+ wrkMast.setMemo(JSONObject.toJSONString(mesOutApply));
+ } else {
+ wrkMast.setAgvSta(staNo);
+ }
- wrkMastService.insert(wrkMast);
+ wrkMastService.insert(wrkMast);
- // 鏇存柊搴撲綅鐘舵��
- if (locMast.getLocSts().equals("D")) {
- locMast.setLocSts("R");
- locMast.setModiUser(userId);
- locMast.setModiTime(now);
- locMastService.updateById(locMast);
+ // 鏇存柊搴撲綅鐘舵��
+ if (locMast.getLocSts().equals("D")) {
+ locMast.setLocSts("R");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ locMastService.updateById(locMast);
+ }
+ log.info("鐢熸垚绌烘墭鍑哄簱浠诲姟鎴愬姛,浠诲姟鍙�:{}",wrkMast.getWrkNo());
}
- log.info("鐢熸垚绌烘墭鍑哄簱浠诲姟鎴愬姛,浠诲姟鍙�:{}",wrkMast.getWrkNo());
return R.ok("鍑哄簱鎴愬姛");
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index de14ec8..eb60083 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -144,3 +144,7 @@
hx:
url: http://127.0.0.1:8089/hx/
+#wcs鍦板潃
+wcs:
+ url: http://127.0.0.1:9090/jgwcs
+
--
Gitblit v1.9.1