From 0eab67f624c2b3349002860b408942265a076b9e Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 30 十二月 2025 15:24:23 +0800
Subject: [PATCH] #agv任务
---
src/main/java/com/zy/asrs/entity/LocCache.java | 2
src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java | 4
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 117 +++++++++++++++++++++++++--------------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 13 +++
4 files changed, 90 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocCache.java b/src/main/java/com/zy/asrs/entity/LocCache.java
index ddcdd6c..333219d 100644
--- a/src/main/java/com/zy/asrs/entity/LocCache.java
+++ b/src/main/java/com/zy/asrs/entity/LocCache.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -145,6 +146,7 @@
private Date appeTime;
@ApiModelProperty(value = "")
+ @TableField(value ="barcode",strategy = FieldStrategy.IGNORED)
private String barcode;
@ApiModelProperty("搴撳尯ID")
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 21c7923..8cb66c6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -128,7 +128,10 @@
String sourceSite = param.getSourceSite();
String barcode = param.getBarcode();
int ioType;
-
+ LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", sourceSite));
+ if (null == locCache) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦細" + sourceSite);
+ }
switch (type) {
case 1:
// 鍒ゆ柇鏈夋病鏈夌粍鎵�
@@ -136,7 +139,10 @@
if (count == 0) {
throw new CoolException("鏉＄爜鏈粍鎵橈細" + barcode);
}
- ioType = 1;
+ ioType = 101;
+
+ locCache.setLocSts(LocStsType.LOC_STS_TYPE_R.type);
+ locCacheService.updateById(locCache);
break;
case 2:
// 鍒ゆ柇鏄嫞閫夊洖搴撴墭鐩�
@@ -148,6 +154,9 @@
throw new CoolException("鏉＄爜涓嶉渶瑕佸洖搴擄細" + barcode);
}
ioType = wrkMast.getIoType() - 50;
+
+ locCache.setLocSts(LocStsType.LOC_STS_TYPE_R.type);
+ locCacheService.updateById(locCache);
break;
case 3:
// 鍒ゆ柇鏉＄爜鍦╳ms涓嶅瓨鍦紝鏄┖鎵樼洏
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
index cefed58..aa638da 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
@@ -48,10 +48,10 @@
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 鍏ュ簱 + 搴撲綅杞Щ
- if (wrkMast.getIoType() < 100){
+ if (wrkMast.getIoType() < 50){
wrkMast.setWrkSts(4L);
// 鍑哄簱
- } else if (wrkMast.getWrkSts() > 10) {
+ } else {
wrkMast.setWrkSts(14L);
}
Date now = new Date();
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 2cb75ba..0ab2769 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -601,6 +601,7 @@
* @description: AGV鍑哄簱浠诲姟
* @version 1.0
*/
+ @Transactional(rollbackFor = Exception.class)
public ReturnT<String> agvDoOut(Task task) {
if (task.getIoType().equals(101)) {
Date now = new Date();
@@ -635,8 +636,35 @@
if (!taskService.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- } else {
+ } else if(task.getIoType().equals(53) || task.getIoType().equals(54) || task.getIoType().equals(57)){
+ LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", task.getSourceLocNo()));
+ if (Objects.isNull(locCache)) {
+ throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
+ }
+ if (!locCache.getLocSts().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷负锛�" + LocStsType.LOC_STS_TYPE_R.type + "." + LocStsType.LOC_STS_TYPE_R.desc + "锛屼笉鏄嚭搴撻绾︾姸鎬�");
+ }
+ locCache.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ locCache.setModiTime(new Date());
+ locCache.setBarcode(null);
+ locCache.setModiTime(new Date());
+ locCache.setIoTime(new Date());
+ if (!locCacheService.updateById(locCache)) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒");
+ }
+
+ boolean deleted = locCacheDetlService.delete(new EntityWrapper<LocCacheDetl>().eq("loc_id", locCache.getId()));
+
+ if (!deleted){
+ throw new CoolException("搴撲綅鏄庣粏鍒犻櫎澶辫触锛�");
+ }
+
+ task.setWrkSts(15L);
+ task.setModiTime(new Date());
+ if (!taskService.updateById(task)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
}
return SUCCESS;
}
@@ -644,50 +672,55 @@
@Transactional(rollbackFor = Exception.class)
public ReturnT<String> agvDoIn(Task wrkMast) {
- LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
- if (Objects.isNull(locCache)) {
- throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
- }
- if (!locCache.getLocSts().equals(LocStsType.LOC_STS_TYPE_S.type)) {
- throw new CoolException("褰撳墠搴撲綅鐘舵�佷负锛�" + LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc + "锛屼笉鏄嚭搴撻绾︾姸鎬�");
- }
- List<TaskDetl> taskDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("task_id", wrkMast.getId()));
- if (Objects.isNull(taskDetls)) {
- throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻暟鎹笉瀛樺湪锛侊紒");
- }
- taskDetls.forEach(pakin -> {
- LocCacheDetl detl = new LocCacheDetl();
- BeanUtils.copyProperties(pakin, detl);
- detl.setBarcode(pakin.getBarcode())
- .setLocId(locCache.getId())
- .setAnfme(pakin.getAnfme())
- .setBrand(pakin.getBrand())
- .setAppeTime(new Date())
- .setSpecs(pakin.getSpecs())
- .setColor(pakin.getColor())
- .setLocNo(locCache.getLocNo())
- .setAreaId(locCache.getAreaId())
- .setAreaName(locCache.getAreaName())
- .setUnit(pakin.getUnit())
- .setBatch(pakin.getBatch());
- if (!locCacheDetlService.insert(detl)) {
- throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
+ if (wrkMast.getIoType().equals(1)) {
+ LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
+ if (Objects.isNull(locCache)) {
+ throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
}
- });
+ if (!locCache.getLocSts().equals(LocStsType.LOC_STS_TYPE_S.type)) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷负锛�" + LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc + "锛屼笉鏄嚭搴撻绾︾姸鎬�");
+ }
+ List<TaskDetl> taskDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("task_id", wrkMast.getId()));
+ if (Objects.isNull(taskDetls)) {
+ throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻暟鎹笉瀛樺湪锛侊紒");
+ }
+ taskDetls.forEach(pakin -> {
+ LocCacheDetl detl = new LocCacheDetl();
+ BeanUtils.copyProperties(pakin, detl);
+ detl.setBarcode(pakin.getBarcode())
+ .setLocId(locCache.getId())
+ .setAnfme(pakin.getAnfme())
+ .setBrand(pakin.getBrand())
+ .setAppeTime(new Date())
+ .setSpecs(pakin.getSpecs())
+ .setColor(pakin.getColor())
+ .setLocNo(locCache.getLocNo())
+ .setAreaId(locCache.getAreaId())
+ .setAreaName(locCache.getAreaName())
+ .setUnit(pakin.getUnit())
+ .setBatch(pakin.getBatch());
+ if (!locCacheDetlService.insert(detl)) {
+ throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
- locCache.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
- locCache.setModiTime(new Date());
- locCache.setBarcode(wrkMast.getBarcode());
- locCache.setModiTime(new Date());
- locCache.setIoTime(new Date());
- if (!locCacheService.updateById(locCache)) {
- throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒");
+ locCache.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
+ locCache.setModiTime(new Date());
+ locCache.setBarcode(wrkMast.getBarcode());
+ locCache.setModiTime(new Date());
+ locCache.setIoTime(new Date());
+ if (!locCacheService.updateById(locCache)) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒");
+ }
+ wrkMast.setWrkSts(5L);
+ wrkMast.setModiTime(new Date());
+ if (!taskService.updateById(wrkMast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }else {
+ throw new CoolException("鏁版嵁閿欒锛歩oType涓嶅瓨鍦紒锛�");
}
- wrkMast.setWrkSts(5L);
- wrkMast.setModiTime(new Date());
- if (!taskService.updateById(wrkMast)) {
- throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
+
return SUCCESS;
}
--
Gitblit v1.9.1