style: 样式调整

This commit is contained in:
陆一凡 2025-03-20 13:42:45 +08:00
parent 6205b4f5cf
commit 4323d59f42
2 changed files with 4 additions and 6 deletions

View File

@ -204,10 +204,11 @@ public class JobComponent extends BaseController {
return; return;
} }
if(beforLocations.isEmpty()) { if(beforLocations.isEmpty()) {
logger.info("beforLocations.isEmpty()"); logger.info("beforeLocations.isEmpty()");
return; return;
} }
Location beforLocation = beforLocations.get(0); // 前一个库位 // 前一个库位
Location beforLocation = beforLocations.get(0);
List<Task> notCompleteTasks = taskMapper.haveNotCompleteTask(beforLocation.getLocationId()); List<Task> notCompleteTasks = taskMapper.haveNotCompleteTask(beforLocation.getLocationId());
if(notCompleteTasks == null) { if(notCompleteTasks == null) {
logger.info("notCompleteTasks为null"); logger.info("notCompleteTasks为null");
@ -251,7 +252,7 @@ public class JobComponent extends BaseController {
logger.info("移库没有可用库位"); logger.info("移库没有可用库位");
return; // 移库没有可用库位 return; // 移库没有可用库位
} }
Location emptyLocationItem = locationUtils.checkCanUseChangeLocation(emptyLocations,thisLocation); // 取得新库位 Location emptyLocationItem = locationUtils.checkCanUseChangeLocation(emptyLocations,beforLocation); // 取得新库位
if(emptyLocationItem == null) { if(emptyLocationItem == null) {
logger.info("没有可移动库位,移动库位存在任务"); logger.info("没有可移动库位,移动库位存在任务");
return; // 没有可用库位或者m库位存在干涉 return; // 没有可用库位或者m库位存在干涉
@ -332,7 +333,6 @@ public class JobComponent extends BaseController {
request.setTocellno("111"); request.setTocellno("111");
String requestString = JSON.toJSONString(request); String requestString = JSON.toJSONString(request);
String responseString = HttpUtils.sendHttpPostWithoutToken(UrlEnums.URL_WMS_TO_WCS_CONTAINER_TASK.getValue(), requestString); String responseString = HttpUtils.sendHttpPostWithoutToken(UrlEnums.URL_WMS_TO_WCS_CONTAINER_TASK.getValue(), requestString);
//JSONObject jsonResponse = JSON.parseObject(responseString);
ContainerApiLocalResponse result = JSON.parseObject(responseString, ContainerApiLocalResponse.class); ContainerApiLocalResponse result = JSON.parseObject(responseString, ContainerApiLocalResponse.class);
if(result != null && result.getCode().equals("200")) { if(result != null && result.getCode().equals("200")) {
logger.info("下发四向车出库任务成功任务ID{}", task.getTaskId()); logger.info("下发四向车出库任务成功任务ID{}", task.getTaskId());

View File

@ -136,7 +136,6 @@ public class TaskOperation {
addStock.setStockId(WmsUtils.generateUUIDString()); addStock.setStockId(WmsUtils.generateUUIDString());
addStock.setWarehouseName("四向车立体库"); addStock.setWarehouseName("四向车立体库");
addStock.setLocationId(task.getDestination()); addStock.setLocationId(task.getDestination());
//addStock.setLocationId(appOrderIn.getVehicleNo());
addStock.setVehicleId(appOrderIn.getVehicleNo()); addStock.setVehicleId(appOrderIn.getVehicleNo());
addStock.setGoodsId(appOrderIn.getGoodsId()); addStock.setGoodsId(appOrderIn.getGoodsId());
addStock.setGoodsName(""); addStock.setGoodsName("");
@ -145,7 +144,6 @@ public class TaskOperation {
addStock.setRealNum(appOrderIn.getGoodsNum().intValue()); addStock.setRealNum(appOrderIn.getGoodsNum().intValue());
addStock.setProviderId(""); addStock.setProviderId("");
addStock.setProviderName(""); addStock.setProviderName("");
//addStock.setProductionDate(null);
addStock.setExpirationDate(null); addStock.setExpirationDate(null);
addStock.setStockStatus(0); addStock.setStockStatus(0);
addStock.setGoodsStatus(null); addStock.setGoodsStatus(null);