From cd13694033118da5ba6c5b9fff5a7cfdab07bf77 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 09:06:07 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/java/com/zy/asrs/entity/AgvWaitPakin.java | 12 ++++++++++++
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 15 ++++++++++++---
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AgvWaitPakin.java b/src/main/java/com/zy/asrs/entity/AgvWaitPakin.java
index cc6ecb4..eefe604 100644
--- a/src/main/java/com/zy/asrs/entity/AgvWaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/AgvWaitPakin.java
@@ -219,6 +219,18 @@
}
}
+ public String getIoStatus$(){
+ if (null == this.ioStatus){ return null; }
+ switch (this.ioStatus){
+ case "N":
+ return "鏈叆搴�";
+ case "Y":
+ return "鍏ュ簱涓�";
+ default:
+ return this.ioStatus;
+ }
+ }
+
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 8f77aea..0d94bdf 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -352,12 +352,12 @@
//淇敼鍏ュ簱閫氱煡妗ｇ姸鎬�
agvWaitPakinService.updateIoStatus(containerCode,"Y");
//鏇存柊婧愮珯鐐圭姸鎬�
- updateAgvBasDevp(agvBasDevp,"R");
+ updateAgvBasDevp(agvBasDevp,"R",containerType);
}else {
// 鐢熸垚宸ヤ綔妗� 10.绌烘澘鍏ュ簱
createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType);
//鏇存柊婧愮珯鐐圭姸鎬�
- updateAgvBasDevp(agvBasDevp,"R",containerType);
+ updateAgvBasDevp(agvBasDevp,"R",containerType,containerCode);
}
//鏇存柊鐩爣搴撲綅鐘舵�佸拰淇℃伅
@@ -396,7 +396,7 @@
updateAgvLocMast(agvLocMast,"R");
//淇敼绔欑偣鐘舵��
- updateAgvBasDevp(agvBasDevp,"S");
+ updateAgvBasDevp(agvBasDevp,"S",(short)containerType,agvLocMast.getBarcode());
}
@@ -669,6 +669,15 @@
}
}
+ private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
+ if(!Cools.isEmpty(agvBasDevp)){
+ agvBasDevp.setLocSts(locSts);
+ agvBasDevp.setLocType2(continerType);
+ agvBasDevp.setBarcode(containerCode);
+ agvBasDevpService.updateById(agvBasDevp);
+ }
+ }
+
/*
鐢熸垚宸ヤ綔妗ｆ槑缁�
*/
--
Gitblit v1.9.1