互相循环代码bug修复

liweidong
绫Umbrella 1 month ago
parent 77fe02d798
commit e3b373fa8a
  1. 9
      blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java
  2. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IOrderBoxService.java
  3. 16
      blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java
  4. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java

@ -131,5 +131,14 @@ public class OrderBoxController extends BladeController {
public R inventoryReturnToWarehouseList(){
return iOrderBoxService.returnToWarehouseList();
}
/**
* 回调作业中心list
*/
@GetMapping("/receive")
@ApiOperationSupport(order = 7)
@Operation(summary = "接收", description = "接收释放站点")
public R receive(@RequestParam String stationCode){
return iOrderBoxService.receive(stationCode);
}
}

@ -51,4 +51,5 @@ public interface IOrderBoxService {
R getBSWORKCENTER();
R receive(String stationCode);
}

@ -437,6 +437,22 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
return null;
}
@Override
public R receive(String stationCode) {
if (stationCode.isEmpty()) {
return R.fail("站点编码不能为空");
}
List<Station> stationList = iStationService.list(new LambdaQueryWrapper<Station>().eq(Station::getStationCode, stationCode));
if (stationList.isEmpty()) {
return R.fail("站点编码不存在");
}
stationList.get(0).setStationStatus(STATUS_FREE);
if (iStationService.updateById(stationList.get(0))) {
return R.success();
}
return R.fail("站点切换空闲异常");
}
/**
* 批量保存订单与任务的绑定关系
* 核心创建订单绑定记录并批量插入插入失败则回滚任务删除已创建的任务

@ -156,11 +156,13 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("reqCode", "TEXT" + IdUtil.fastSimpleUUID());
requestBody.put("podCode", virtualShelvesCode);
requestBody.put("berthCode", stationCode);
requestBody.put("positionCode", stationCode);
requestBody.put("podDir", "0");
requestBody.put("indBind", "1");
try {
log.info("绑定虚拟参数:{}", requestBody);
log.info("绑定虚拟url地址:{}", url);
String responseStr = HttpUtil.post(url, JSON.toJSONString(requestBody));
log.info("绑定虚拟货架响应:{}", responseStr);

Loading…
Cancel
Save