From d61d4384e19580a32becb54e8e7f2287bed5469a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 26 五月 2025 09:08:18 +0800
Subject: [PATCH] 1.出库口补空板 2.组托时调用agv 3.新增agv调用程序
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 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 687ec72..314f1f1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -125,17 +125,6 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
-
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
- throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
- }
Date now = new Date();
@@ -164,7 +153,7 @@
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setBatch(detlDto.getBatch());
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setZpallet(""); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
@@ -172,6 +161,9 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setMemo(param.getBarcode());//AGV婧愮珯
+ waitPakin.setBeBatch(0);//AGV 浠诲姟绛夊緟涓嬪彂
+ waitPakin.setManu(now.getTime()+"");//鍞竴鐮�
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -678,14 +670,14 @@
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
log.error("鐢宠娴嬭瘯澶辫触");
}
- //3.寮�濮嬫祴璇曚笂鎶�
- CombParam combParam = new CombParam();
- combParam.setPackNo(testMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(0);
- combParam.setStepSts(3);
- combParam.setRequestTime(DateUtils.convert(now));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// //3.寮�濮嬫祴璇曚笂鎶�
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(testMast.getBarcode());
+// combParam.setLocNo(locMast.getLocNo());
+// combParam.setPackSts(0);
+// combParam.setStepSts(3);
+// combParam.setRequestTime(DateUtils.convert(now));
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
@Override
@@ -722,7 +714,7 @@
}else if (testMast.getChannel()<=48){
renUrl=renUrl6;
}
- return new PostMesDataUtils().postMesData("娴嬭瘯绯荤粺",renUrl,startUpTestPACK,review);
+ return null;
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -802,7 +794,7 @@
default:
log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
}
- return new PostMesDataUtils().postMesData("娴嬭瘯绯荤粺",renUrl,suspendTestPACK,review);
+ return null;
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -817,7 +809,8 @@
@Override
@Transactional
public List<LocMast> packTestBasicInformation() {
- List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O"));
+ List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O")
+ .and().ne("loc_sts","X"));
for (LocMast locMast:locMasts) {
LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
if(Cools.isEmpty(locDetl)){
@@ -835,7 +828,7 @@
@Transactional
public List<PackUsageRate> packUsageRate() {
ArrayList<PackUsageRate> packUsageRates = new ArrayList<>();
- for (int i = 0 ;i<5;i++){
+ for (int i = 1 ;i<5;i++){
PackUsageRate packUsageRate = new PackUsageRate();
packUsageRate.setTotal(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i)));
packUsageRate.setCurrentQuantity(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i).and().ne("loc_sts","O")));
--
Gitblit v1.9.1