wms / wms_guangzhouwanbao · Commits

Commit dbfcc91f35a6f8f723eb9cc85dbed56d2cf48790

Authored by xumiao
1 parent 4240cbc2

接收agv取货完成，解锁、清除源点位

Inline Side-by-side
Showing 4 changed files with 16 additions and 6 deletions
src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
  View file @dbfcc91
... ... @@ -569,6 +569,7 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> implements Ac
569 569 agvInventory.setWorkStationCode(workStation.getCode());
570 570 agvInventory.setAgvPortId(agvPort.getId());
571 571 agvInventory.setAgvPortCode(agvPort.getCode());
  572 + agvInventory.setStatus("empty");
572 573 iAgvInventoryService.updateById(agvInventory);
573 574 });
574 575 }else {
... ... @@ -689,9 +690,9 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> implements Ac
689 690 if (StringUtils.isNull(sourcePosition)) {
690 691 throw new ServiceException("源点位：" + sourcePosition.getName() + "未找到");
691 692 }
692   - if(sourcePosition.getStatus().equals(QuantityConstant.STATUS_POSITION_LOCK)){
693   - throw new ServiceException("源点位：" + sourcePosition.getName() + "禁用");
694   - }
  693 +// if(sourcePosition.getStatus().equals(QuantityConstant.STATUS_POSITION_LOCK)){
  694 +// throw new ServiceException("源点位：" + sourcePosition.getName() + "禁用");
  695 +// }
695 696  
696 697 if (StringUtils.isEmpty(agvTask.getToPort())) {
697 698 throw new ServiceException("目标点位为空");
... ... @@ -808,6 +809,11 @@ public class AcsServiceImpl extends ServiceImpl<AcsMapper,AgvTask> implements Ac
808 809 agvPortService.updateStatus(task.getFromPort(),QuantityConstant.STATUS_POSITION_EMPTY);
809 810 agvPortService.setContainerCode(task.getFromPort(),null);
810 811 updateById(agvTask);
  812 + AgvInventory agvInventory=new AgvInventory();
  813 + agvInventory.setStatus("lock");
  814 + LambdaQueryWrapper<AgvInventory> lambdaQueryWrapper=Wrappers.lambdaQuery();
  815 + lambdaQueryWrapper.eq(AgvInventory::getContainerCode,task.getContainerCode());
  816 + iAgvInventoryService.update(agvInventory,lambdaQueryWrapper);
811 817 }
812 818 if(o3.equals(QuantityConstant.STATUS_TASK_FINISH)){
813 819 if(StringUtils.isNotEmpty(task.getPreTaskNo())){
... ... @@ -822,8 +828,8 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
822 828 }
823 829 task.setStatus(100);
824 830 task.setCarNo(agvTask.getCarNo());
825   - agvPortService.updateStatus(task.getFromPort(),QuantityConstant.STATUS_POSITION_EMPTY);
826   - agvPortService.setContainerCode(task.getFromPort(),null);
  831 +// agvPortService.updateStatus(task.getFromPort(),QuantityConstant.STATUS_POSITION_EMPTY);
  832 +// agvPortService.setContainerCode(task.getFromPort(),null);
827 833 updateById(task);
828 834 //处理一下agv_inventory
829 835 AgvPort toPort = agvPortService.getAgvportByCode(task.getToPort());
... ... @@ -838,6 +844,7 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
838 844 agvInventory.setWorkStationCode(workStation.getCode());
839 845 agvInventory.setAgvPortId(toPort.getId());
840 846 agvInventory.setAgvPortCode(toPort.getCode());
  847 + agvInventory.setStatus("empty");
841 848 iAgvInventoryService.updateById(agvInventory);
842 849 });
843 850 }else {
... ...
src/main/java/com/huaheng/common/constant/QuantityConstant.java
  View file @dbfcc91
... ... @@ -380,7 +380,7 @@ public class QuantityConstant {
380 380 public static final String STATUS_TASK_WAITING_MANUALLY_FINISH="waiting_manually_finish";
381 381 public static final String STATUS_TASK_MANUALLY_FINISH="manually_finish";
382 382 public static final String STATUS_TASK_AGV_START="start";
383   - public static final String STATUS_TASK_AGV_TASKOVER="taskOver";
  383 + public static final String STATUS_TASK_AGV_TASKOVER="takeOver";
384 384 public static final String STATUS_TASK_AGV_FINISH="finish";
385 385 public static final String STATUS_TASK_AGV_ERROR="error";
386 386 public static final String STATUS_TASK_AGV_CANCEL="cancel";
... ...
src/main/java/com/huaheng/pc/agv/domain/AgvInventory.java
  View file @dbfcc91
... ... @@ -44,6 +44,8 @@ public class AgvInventory implements Serializable{
44 44 /** 数量 */
45 45 @TableField(value = "qty")
46 46 private Long qty;
  47 + @TableField(value = "status")
  48 + private String status;
47 49 /**
48 50 * 创建时间
49 51 */
... ...
src/main/java/com/huaheng/pc/agv/service/impl/AgvInventoryServiceImpl.java
  View file @dbfcc91
... ... @@ -45,6 +45,7 @@ public class AgvInventoryServiceImpl extends ServiceImpl&lt;AgvInventoryMapper, Agv
45 45 public List<AgvInventory> getListByPortCode(String portCode) {
46 46 LambdaQueryWrapper<AgvInventory> queryWrapper = new LambdaQueryWrapper<>();
47 47 queryWrapper.eq(AgvInventory::getAgvPortCode, portCode);
  48 + queryWrapper.eq(AgvInventory::getStatus, "empty");
48 49 return list(queryWrapper);
49 50 }
50 51  
... ...