From 16a3dbbf28606a90dd6dadeffe843f53f72d3955 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 29 三月 2024 16:28:57 +0800
Subject: [PATCH] 初始化库位和站点
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 6dfd117..b1b53d9 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -42,6 +42,8 @@
private AgvLocDetlService agvLocDetlService;
@Autowired
private AgvWrkMastService agvWrkMastService;
+ @Autowired
+ private AgvWorkService agvWorkService;
/*
@@ -53,6 +55,7 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
+ param.setContainerType(Short.valueOf(param.getBarcode().substring(0,2)));
//妫�鏌ユ槸鍚﹀凡瀛樺湪鐩稿悓鐨勬墭鐩樻潯鐮侊紝瀛樺湪鍒欐姏鍑哄紓甯�
if (agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().eq("supp_code", param.getBarcode())) > 0) {
@@ -80,7 +83,7 @@
if(StringUtils.isEmpty(param.getLocno())){
return "缁勬墭鎴愬姛";
}else {
- combBinding(param.getBarcode(),param.getLocno());
+ combBinding(param.getBarcode(),param.getLocno(),param.getContainerType());
return "缁勬墭鎴愬姛锛岀粦瀹氱珯鐐规垚鍔�";
}
@@ -136,7 +139,7 @@
checkOrderQty(order,combMat);
}
- DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme(), combMat.getCsocode(), combMat.getIsoseq(),combMat.getContainerCode());
+ DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme(), combMat.getCsocode(), combMat.getIsoseq(),combMat.getContainerCode(),param.getLocType());
//鍚屼竴鎵樼洏涓嬬浉鍚岀墿鏂欎俊鎭拰鎵瑰彿杞负涓�涓叆搴撻�氱煡妗�
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getCsocode(), detlDto.getIsoseq(),null);
@@ -191,6 +194,8 @@
//閿�鍞鍗曡鍙�
waitPakin.setDeadTime(detlDto.getIsoseq());
+ waitPakin.setLocType(detlDto.getLocType());
+
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
@@ -215,7 +220,7 @@
}
@Override
- public void combBinding(String barcode, String stationCode) {
+ public void combBinding(String barcode, String stationCode, Short containerType) {
if(Cools.isEmpty(agvWaitPakinService.selectByContainerCode(barcode))){
throw new CoolException("璇ユ枡绠辨湭缁勬墭锛屾棤娉曠粦瀹氱珯鐐�");
@@ -234,9 +239,14 @@
if(!"O".equals(agvBasDevp.getLocSts())){
throw new CoolException(stationCode + "璇ョ珯鐐硅揣浣嶇姸鎬侀潪绌�");
}
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", agvBasDevp.getDevNo()));
+ if(!Cools.isEmpty(agvWrkMast)){
+ throw new CoolException(stationCode + "璇ョ珯鐐瑰凡琚伐浣滃彿涓�" + agvWrkMast.getWrkNo() + "鍗犵敤锛屾棤娉曠粦瀹�");
+ }
agvBasDevp.setBarcode(barcode);
agvBasDevp.setLocSts("F");
+ agvBasDevp.setLocType2(containerType);
agvBasDevpService.update(agvBasDevp,(new EntityWrapper<AgvBasDevp>().eq("dev_no",stationCode)));
}
@@ -249,4 +259,20 @@
}).collect(Collectors.toList());
}
+ @Override
+ public void pakinEmpty(String devNo, boolean pakin) {
+ //褰撳墠绔欑偣淇℃伅
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+ //瀵绘壘鐩稿悓绫诲瀷鐨勫簱浣�
+
+ //鐢熸垚绌虹洏宸ヤ綔妗�
+
+ //鏇存敼搴撲綅鐘舵�佷互鍙婄珯鐐圭姸鎬�
+ }
+
+ @Override
+ public void pakoutEmpty(String devNo) {
+
+ }
+
}
--
Gitblit v1.9.1