Browse Source

新增齐套运输相关实体类、Mapper接口及服务实现,优化齐套运输任务处理逻辑

master
常熟吴彦祖 8 months ago
parent
commit
f5e1d6b6dc
  1. 2
      src/main/java/com/gaotao/modules/automatedWarehouse/mapper/WcsIntegrationMapper.java
  2. 6
      src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoTaskServiceImpl.java
  3. 6
      src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
  4. 6
      src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml

2
src/main/java/com/gaotao/modules/automatedWarehouse/mapper/WcsIntegrationMapper.java

@ -376,7 +376,7 @@ public interface WcsIntegrationMapper {
* 获取AGV站点状态 - AI制作 * 获取AGV站点状态 - AI制作
*/ */
Integer getAgvStationStatus(@Param("stationCode") String stationCode); Integer getAgvStationStatus(@Param("stationCode") String stationCode);
String getAgvStationType(@Param("stationCode") String stationCode);
/** /**
* 获取栈板详细信息包含palletType和autoSort以及托盘类型详情 - AI制作 * 获取栈板详细信息包含palletType和autoSort以及托盘类型详情 - AI制作
*/ */

6
src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoTaskServiceImpl.java

@ -328,6 +328,11 @@ public class AutoTaskServiceImpl implements AutoTaskService {
// 校验当前站点是否空闲 - rqrq // 校验当前站点是否空闲 - rqrq
Integer stationStatus = wcsIntegrationMapper.getAgvStationStatus(inData.getFromLocation()); Integer stationStatus = wcsIntegrationMapper.getAgvStationStatus(inData.getFromLocation());
String stationType = wcsIntegrationMapper.getAgvStationType(inData.getFromLocation());
if(!"正式站点".equals(stationType)){
throw new RuntimeException("只有正式站点可以启用AGV托运!");
}
if(stationStatus == null){ if(stationStatus == null){
throw new RuntimeException("起始站点不存在:" + inData.getFromLocation()); throw new RuntimeException("起始站点不存在:" + inData.getFromLocation());
} }
@ -335,6 +340,7 @@ public class AutoTaskServiceImpl implements AutoTaskService {
throw new RuntimeException("起始站点不是有货状态,当前状态码:" + stationStatus); throw new RuntimeException("起始站点不是有货状态,当前状态码:" + stationStatus);
} }
System.out.println("栈板和站点状态校验通过 - rqrq"); System.out.println("栈板和站点状态校验通过 - rqrq");
} }

6
src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java

@ -427,6 +427,12 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
//初始化的时候用 一开始栈板是没有位置的 按照第一个入栈的标签来给虚拟位置 后期不需要处理 //初始化的时候用 一开始栈板是没有位置的 按照第一个入栈的标签来给虚拟位置 后期不需要处理
if("TEMP".equals(labelWarehouseId)){ if("TEMP".equals(labelWarehouseId)){
wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "TEMP"); wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "TEMP");
}else if("W01".equals(labelWarehouseId)){
wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "W01");
}else if("Q01".equals(labelWarehouseId)){
wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "Q01");
}else if("W02".equals(labelWarehouseId)){
wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "W02");
}else if("AS".equals(labelLocationId)){ }else if("AS".equals(labelLocationId)){
wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "Virtual_AS"); wcsIntegrationMapper.updatePalletLocationCode(site, palletId, "Virtual_AS");
}else { }else {

6
src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml

@ -815,6 +815,12 @@
WHERE station_code = #{stationCode} WHERE station_code = #{stationCode}
</select> </select>
<select id="getAgvStationType" resultType="String">
SELECT station_type
FROM agv_station
WHERE station_code = #{stationCode}
</select>
<!-- 获取栈板详细信息(包含palletType和autoSort以及托盘类型详情) - AI制作 --> <!-- 获取栈板详细信息(包含palletType和autoSort以及托盘类型详情) - AI制作 -->
<select id="getPalletInfoWithTypeDetails" resultType="PalletData"> <select id="getPalletInfoWithTypeDetails" resultType="PalletData">
SELECT SELECT

Loading…
Cancel
Save