| src/main/java/com/zy/asrs/entity/LocCache.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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") 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: // 判断条码在wms不存在,是空托盘 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(); 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,6 +672,7 @@ @Transactional(rollbackFor = Exception.class) public ReturnT<String> agvDoIn(Task wrkMast) { if (wrkMast.getIoType().equals(1)) { LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo())); if (Objects.isNull(locCache)) { throw new CoolException("数据错误,库位不存在!!"); @@ -688,6 +717,10 @@ if (!taskService.updateById(wrkMast)) { throw new CoolException("任务状态修改失败!!"); } }else { throw new CoolException("数据错误:ioType不存在!!"); } return SUCCESS; }