From f0226479e92a906950aac0834048cc709e032e97 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 24 十二月 2025 09:17:44 +0800
Subject: [PATCH] 奥普瑞斯从侧面口进出，盘点拣料功能修复
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 111 +++++++++++++++++++++++++++++++------------------------
1 files changed, 63 insertions(+), 48 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 29ffc69..fd32c4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -50,6 +50,9 @@
@Value("${wms.zpalletId}")
public String WMS_ZPALLET_ID;
+ @Value("${wms.loadedPallet}")
+ public String WMS_LOADED_PALLET;
+
@Autowired
private MatService matService;
@Autowired
@@ -597,7 +600,7 @@
Date now = new Date();
// 鏃犲崟缁勬墭
- if (Cools.isEmpty(param.getOrderNo())) {
+ if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) {
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
@@ -617,9 +620,9 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
- throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
- }
+// if (mat.getUpQty().compareTo(detlDto.getAnfme()) < 0) {
+// throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + "鍗曟鏈�澶х粍鎵樹笂闄愪负锛�" + mat.getUpQty());
+// }
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(mat, waitPakin);
waitPakin.setBatch(detlDto.getBatch());
@@ -1287,67 +1290,71 @@
@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("鍑哄簱鎴愬姛");
}
@Override
- public R callEmptyBinInBound(String site, Long userId) {
+ public R callEmptyBinInBound(String site, String barcode, String emptyFlag, Long userId) {
TransTask transTask = new TransTask();
-// transTask.setTaskno(mesInApply.getTaskno());
+ transTask.setTaskno(String.valueOf(new Date().getTime()));
// transTask.setTaskname(mesInApply.getTaskname());
// transTask.setOrderNo(mesInApply.getOrderNo());
transTask.setTransType("02"); // 涓嬫瘺鍧�
@@ -1355,10 +1362,18 @@
transTask.setCurStationId(site);
transTask.setNextStationId(WMS_TRANS_START_STATION_2);
transTask.setItemno(WMS_ZPALLET_ID); // 鍥哄畾涓虹┖鎵樼殑缂栫爜
+ if ("1".equals(emptyFlag)) { // 鍒ゆ柇鏄惁缁勬墭
+ int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+ if(count <= 0) {
+ return R.parse("鏈粍鎵橈細" + barcode);
+ }
+ transTask.setItemno(WMS_LOADED_PALLET); // 鍥哄畾涓烘弧鎵樼殑缂栫爜
+ }
transTask.setQty(1); // 绌烘墭鍙洖1涓�
// transTask.setProductLineId(mesInApply.getProductLineId());
transTask.setOperateType(1);
transTask.setAgvFactory(1);
+ transTask.setTuoPanId(barcode);
JSONObject sendAgvTask = mesService.submitTask(transTask);
if ("1".equals(sendAgvTask.getString("Success"))) {
log.info("pda鍛煎彨鏂欐鍥炲簱鎴愬姛,{}", JSONObject.toJSONString(transTask));
--
Gitblit v1.9.1