Commit 9898cacaf60f42463d9dbf35d773e5b2a2cd45bd
1 parent
d8c4e3c5
fix:长沙agv地面锁定点位；
Showing
4 changed files
with
53 additions
and
13 deletions
src/main/java/com/huaheng/api/acs/service/AcsCSService.java
| ... | ... | @@ -135,8 +135,10 @@ public class AcsCSService { |
| 135 | 135 | break; |
| 136 | 136 | } |
| 137 | 137 | } |
| 138 | -// AjaxResult ajaxResult1=stationService.stationLock(agvTask.getFromPort(),agvTask.getWarehouseCode(), STATION_STATUS_EMPTY); | |
| 139 | -// AjaxResult ajaxResult=stationService.stationLock(agvTask.getToPort(),agvTask.getWarehouseCode(), STATION_STATUS_LOCKED); | |
| 138 | +// if(agvTask.getWarehouseCode().equals(WAREHOUSE_CS)){ | |
| 139 | +// AjaxResult ajaxResult1=stationService.stationLock(agvTask.getFromPort(),agvTask.getWarehouseCode(), STATION_STATUS_EMPTY); | |
| 140 | +// AjaxResult ajaxResult=stationService.stationLock(agvTask.getToPort(),agvTask.getWarehouseCode(), STATION_STATUS_LOCKED); | |
| 141 | +// } | |
| 140 | 142 | } |
| 141 | 143 | if(StringUtils.isNotEmpty(agvTask.getZoneCode())&&agvTask.getZoneCode().equals("LK")){ |
| 142 | 144 | if(status==100){ |
| ... | ... |
src/main/java/com/huaheng/api/acs/service/AgvTaskCSServiceImpl.java
| ... | ... | @@ -742,8 +742,24 @@ public class AgvTaskCSServiceImpl extends ServiceImpl<AgvTaskCsMapper, AgvTaskCS |
| 742 | 742 | if(task.getZoneCode().equals("JLK")){ |
| 743 | 743 | task.setPort(QuantityConstant.JIJIA_PORT); |
| 744 | 744 | } |
| 745 | +// if(task.getWarehouseCode().equals(QuantityConstant.WAREHOUSE_CS)&&StringUtils.isNotEmpty(task.getToPort())){ | |
| 746 | +// //整盘入库，整盘出库判断toPort是否锁定 | |
| 747 | +// Station station=stationService.getStaionByCode(task.getToPort(),task.getWarehouseCode()); | |
| 748 | +// if(station!=null&&station.getStatus().equals(QuantityConstant.STATION_STATUS_LOCKED)){ | |
| 749 | +// return AjaxResult.error("点位："+taskHeader.getToPort()+"已被锁定，请先解锁"); | |
| 750 | +// } | |
| 751 | +// } | |
| 745 | 752 | AgvTaskCS agvTask2=saveAgvTaskBySimpleAgv(task,null); |
| 746 | 753 | break; |
| 754 | + case QuantityConstant.TASK_TYPE_WHOLESHIPMENT: | |
| 755 | + case QuantityConstant.TASK_TYPE_EMPTYSHIPMENT: | |
| 756 | +// if(task.getWarehouseCode().equals(QuantityConstant.WAREHOUSE_CS)&&StringUtils.isNotEmpty(task.getToPort())){ | |
| 757 | +// Station station=stationService.getStaionByCode(taskHeader.getToPort(),task.getWarehouseCode()); | |
| 758 | +// if(station!=null&&station.getStatus().equals(QuantityConstant.STATION_STATUS_LOCKED)){ | |
| 759 | +// return AjaxResult.error("点位："+taskHeader.getToPort()+"已被锁定，请先解锁"); | |
| 760 | +// } | |
| 761 | +// } | |
| 762 | + break; | |
| 747 | 763 | default: |
| 748 | 764 | return AjaxResult.success("不需要创建AGV任务"); |
| 749 | 765 | } |
| ... | ... | @@ -887,6 +903,7 @@ public class AgvTaskCSServiceImpl extends ServiceImpl<AgvTaskCsMapper, AgvTaskCS |
| 887 | 903 | } |
| 888 | 904 | task.setPort(taskHeader.getPort()); |
| 889 | 905 | task.setToPort(taskHeader.getToPort()); |
| 906 | + | |
| 890 | 907 | if(StringUtils.isNotEmpty(taskHeader.getToLocation())){ |
| 891 | 908 | task.setToLocation(taskHeader.getToLocation()); |
| 892 | 909 | } |
| ... | ... | @@ -909,13 +926,29 @@ public class AgvTaskCSServiceImpl extends ServiceImpl<AgvTaskCsMapper, AgvTaskCS |
| 909 | 926 | case QuantityConstant.TASK_TYPE_WHOLERECEIPT: |
| 910 | 927 | case QuantityConstant.TASK_TYPE_EMPTYRECEIPT: |
| 911 | 928 | if(StringUtils.isNotEmpty(task.getToPort())){ |
| 929 | + //整盘入库，整盘出库判断toPort是否锁定 | |
| 930 | +// Station station=stationService.getStaionByCode(taskHeader.getToPort(),task.getWarehouseCode()); | |
| 931 | +// if(station!=null&&station.getStatus().equals(QuantityConstant.STATION_STATUS_LOCKED)){ | |
| 932 | +// return AjaxResult.error("点位："+taskHeader.getToPort()+"已被锁定，请先解锁"); | |
| 933 | +// } | |
| 912 | 934 | AgvTaskCS agvTask2=saveAgvTaskBySimpleAgv(task,null); |
| 913 | 935 | if(agvTask2!=null){ |
| 914 | 936 | agvTask.setPreTaskNo(agvTask2.getId()); |
| 915 | 937 | this.updateById(agvTask); |
| 916 | 938 | } |
| 939 | + | |
| 917 | 940 | } |
| 918 | 941 | break; |
| 942 | + case QuantityConstant.TASK_TYPE_WHOLESHIPMENT: | |
| 943 | + case QuantityConstant.TASK_TYPE_EMPTYSHIPMENT: | |
| 944 | +// if(StringUtils.isNotEmpty(task.getToPort())){ | |
| 945 | +// //整盘入库，整盘出库判断toPort是否锁定 | |
| 946 | +// Station station=stationService.getStaionByCode(taskHeader.getToPort(),task.getWarehouseCode()); | |
| 947 | +// if(station!=null&&station.getStatus().equals(QuantityConstant.STATION_STATUS_LOCKED)){ | |
| 948 | +// return AjaxResult.error("点位："+taskHeader.getToPort()+"已被锁定，请先解锁"); | |
| 949 | +// } | |
| 950 | +// } | |
| 951 | + break; | |
| 919 | 952 | default: |
| 920 | 953 | break; |
| 921 | 954 | } |
| ... | ... |
src/main/java/com/huaheng/pc/config/station/controller/StationLkController.java
| ... | ... | @@ -210,16 +210,21 @@ public class StationLkController extends BaseController { |
| 210 | 210 | String warehouseCode=ShiroUtils.getWarehouseCode(); |
| 211 | 211 | |
| 212 | 212 | LambdaQueryWrapper<Station> queryWrapper = Wrappers.lambdaQuery(); |
| 213 | - if (type == QuantityConstant.STATION_PICK_AND_OUT) { | |
| 214 | - queryWrapper.in(Station::getType, | |
| 215 | - QuantityConstant.STATION_OUT, QuantityConstant.STATION_PICK); | |
| 216 | - } | |
| 217 | - if (type == QuantityConstant.STATION_OUT) { | |
| 218 | - queryWrapper.eq(Station::getType, | |
| 219 | - QuantityConstant.STATION_OUT); | |
| 220 | 213 | |
| 221 | - } else { | |
| 222 | - queryWrapper.eq(Station::getType, type); | |
| 214 | + if(StringUtils.isNotEmpty(container.getZoneCode())&&container.getZoneCode().equals("V")){ | |
| 215 | + queryWrapper.eq(Station::getType, QuantityConstant.STATION_PICK); | |
| 216 | + }else{ | |
| 217 | + if (type == QuantityConstant.STATION_PICK_AND_OUT) { | |
| 218 | + queryWrapper.in(Station::getType, | |
| 219 | + QuantityConstant.STATION_OUT, QuantityConstant.STATION_PICK); | |
| 220 | + } | |
| 221 | + if (type == QuantityConstant.STATION_OUT) { | |
| 222 | + queryWrapper.eq(Station::getType, | |
| 223 | + QuantityConstant.STATION_OUT); | |
| 224 | + | |
| 225 | + } else { | |
| 226 | + queryWrapper.eq(Station::getType, type); | |
| 227 | + } | |
| 223 | 228 | } |
| 224 | 229 | queryWrapper.eq(StringUtils.isNotEmpty(location1.getArea()), Station::getArea, location1.getArea()); |
| 225 | 230 | queryWrapper.eq(Station::getRoadway, roadway); |
| ... | ... |
src/main/java/com/huaheng/pc/config/station/service/StationService.java
| ... | ... | @@ -61,7 +61,7 @@ public class StationService extends ServiceImpl<StationMapper, Station> { |
| 61 | 61 | |
| 62 | 62 | |
| 63 | 63 | LambdaQueryWrapper<Station> queryWrapper = Wrappers.lambdaQuery(); |
| 64 | - queryWrapper.eq(StringUtils.isNotEmpty(area),Station::getArea, area); | |
| 64 | +// queryWrapper.eq(StringUtils.isNotEmpty(area),Station::getArea, area); | |
| 65 | 65 | queryWrapper.eq(StringUtils.isNotEmpty(stationtype),Station::getStationType, stationtype); |
| 66 | 66 | queryWrapper.eq(StringUtils.isNotEmpty(warehouseCode),Station::getWarehouseCode, warehouseCode); |
| 67 | 67 | List<Station> stationList = this.list(queryWrapper); |
| ... | ... | @@ -136,7 +136,7 @@ public class StationService extends ServiceImpl<StationMapper, Station> { |
| 136 | 136 | if(station==null){ |
| 137 | 137 | return AjaxResult.error("站台找不到"); |
| 138 | 138 | } |
| 139 | - if(station.getAgvType()!=null&&station.getAgvType().equals(2)){ | |
| 139 | + if(station.getAgvType()!=null&&station.getAgvType().equals(1)){ | |
| 140 | 140 | Station station1=new Station(); |
| 141 | 141 | station1.setId(station.getId()); |
| 142 | 142 | station1.setStatus(status); |
| ... | ... |