Browse Source

优化栈板处理逻辑,调整定时任务频率,新增取走栈板支持

master
常熟吴彦祖 3 months ago
parent
commit
f9d1c0fda4
  1. 2
      src/main/java/com/gaotao/modules/api/entity/PalletWareHouseData.java
  2. 18
      src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java
  3. 2
      src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java

2
src/main/java/com/gaotao/modules/api/entity/PalletWareHouseData.java

@ -9,7 +9,7 @@ public class PalletWareHouseData {
private String palletId;//栈板ID private String palletId;//栈板ID
private String taskNo; private String taskNo;
private Integer itemNo; private Integer itemNo;
private String transTypeDesc;//立库出入库类型:出库 入库 取货通知
private String transTypeDesc;//立库出入库类型:出库 入库 取货通知 取走栈板
// private String toWareHouseId;//入库需要告知 仓库编码 // private String toWareHouseId;//入库需要告知 仓库编码
private String toBarcode ;//入库需要告知 库位编码 private String toBarcode ;//入库需要告知 库位编码
} }

18
src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java

@ -345,6 +345,22 @@ public class WmsMessageServiceImpl implements WmsMessageService {
} }
toWarehouseId = BufferZoneConfig.BUFFER_WAREHOUSE_ID.getValue(); toWarehouseId = BufferZoneConfig.BUFFER_WAREHOUSE_ID.getValue();
toLocationId = BufferZoneConfig.BUFFER_LOCATION_ID.getValue(); toLocationId = BufferZoneConfig.BUFFER_LOCATION_ID.getValue();
}else if ("取走栈板".equals(inData.getTransTypeDesc())) {
// 出库时从缓冲区配置获取
switch (inData.getToBarcode()) {
case "1099":
inData.setToBarcode("D1");
break;
case "1093":
inData.setToBarcode("D2");
break;
}
if(!inData.getToBarcode().startsWith("D")){
throw new RuntimeException("目前只有滚筒对接区(D1/D2)可以执行这个操作!");
}
toWarehouseId = BufferZoneConfig.BUFFER_WAREHOUSE_ID.getValue();
toLocationId = inData.getToBarcode();
wcsIntegrationMapper.updateAgvStationStatus(inData.getToBarcode(), 0, "空闲");
} else { } else {
throw new RuntimeException("不支持的事务类型:" + inData.getTransTypeDesc()); throw new RuntimeException("不支持的事务类型:" + inData.getTransTypeDesc());
} }
@ -382,7 +398,7 @@ public class WmsMessageServiceImpl implements WmsMessageService {
// 保存到WCS回调任务表 // 保存到WCS回调任务表
wcsIntegrationMapper.insertWcsCallbackTask(callbackTask); wcsIntegrationMapper.insertWcsCallbackTask(callbackTask);
}else {
}else if ("入库".equals(inData.getTransTypeDesc())||"出库".equals(inData.getTransTypeDesc())) {
// 4. 保存WCS回调数据到新表等待定时任务处理 // 4. 保存WCS回调数据到新表等待定时任务处理
WcsCallbackTask callbackTask = new WcsCallbackTask(); WcsCallbackTask callbackTask = new WcsCallbackTask();
callbackTask.setSite(inData.getSite()); callbackTask.setSite(inData.getSite());

2
src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java

@ -45,7 +45,7 @@ public class WcsTaskScheduler {
* cron表达式0 * * * * ? 表示每分钟的第0秒执行 * cron表达式0 * * * * ? 表示每分钟的第0秒执行
* 配置说明通过 scheduler.wcs.enabled 控制是否启用 * 配置说明通过 scheduler.wcs.enabled 控制是否启用
*/ */
@Scheduled(cron = "0 * * * * ?")
@Scheduled(cron = "0/10 * * * * ?")
public void scheduleWcsTaskProcessing() { public void scheduleWcsTaskProcessing() {
// 检查定时任务开关 // 检查定时任务开关
if (!enabled) { if (!enabled) {

Loading…
Cancel
Save