wms / hhwms · Commits

2. 修改任务下发，不能一次发两个

# Conflicts:
#	src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
#	src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationService.java
#	src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
#	src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
#	src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
#	src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
#	src/main/java/com/huaheng/pc/config/location/service/LocationService.java
#	src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
#	src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
#	src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java

修复托盘锁定问题

 Conflicts:
	src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java
	src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
	src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
	src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
	src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java
	src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
	src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
	src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml
	src/main/resources/templates/config/material/material.html