wms / wms_shandonghaiwang · Commits

Commit 7a96e64a945a7f8d80a42332e615723719831325

Authored by 易文鹏
1 parent 922e0be2

feat:1、有任务的平库托盘，可以生成多条任务。2、二厂的9、10巷道是单伸位巷道，不需要不用预留库位。

Inline Side-by-side
Showing 2 changed files with 11 additions and 13 deletions
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
  View file @7a96e64
... ... @@ -268,8 +268,8 @@ public class LocationAllocationServiceImpl implements LocationAllocationService
268 268 .last(" limit 20");
269 269  
270 270 List<Location> totalLocationList = locationService.list(wrapper);
271   - //双伸位预留库位数不够了就排除掉该巷道
272   - if (totalLocationList.size() <= reserveNumber) {
  271 + //双伸位预留库位数不够了就排除掉该巷道，9和10巷道是单伸位，不用预留库位
  272 + if (totalLocationList.size() <= reserveNumber && !roadWay.equals("9") && !roadWay.equals("10")) {
273 273 return "可能是库位不够用了，请检查预留库位数";
274 274 }
275 275  
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
  View file @7a96e64
... ... @@ -897,24 +897,22 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
897 897 List<InventoryDetail> inventoryList = shippingCombinationService.getInventorys(item, true, true);
898 898 //去除已锁的库存
899 899 ArrayList<InventoryDetail> removeInventoryList = new ArrayList<>();
900   - List<TaskHeader> taskHeaderList = taskHeaderService.getUnCompleteTaskList();
  900 + //List<TaskHeader> taskHeaderList = taskHeaderService.getUnCompleteTaskList();
901 901 List<ReceiptContainerHeader> receiptContainerHeaderList = receiptContainerHeaderService.getUnCompleteCombineList();
902 902 boolean lock = false;
903 903 for (InventoryDetail inventoryDetail : inventoryList) {
904   - LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
905   - containerLambdaQueryWrapper.eq(Container::getCode, inventoryDetail.getContainerCode());
906   - Container container = containerService.getOne(containerLambdaQueryWrapper);
  904 + Container container = containerService.getContainerByCode(inventoryDetail.getContainerCode());
907 905 if (QuantityConstant.STATUS_CONTAINER_LOCK.equals(container.getStatus())) {
908 906 removeInventoryList.add(inventoryDetail);
909 907 lock = true;
910 908 }
911   - if (taskHeaderList != null) {
912   - for (TaskHeader taskHeader : taskHeaderList) {
913   - if (taskHeader.getContainerCode().equals(container.getCode())) {
914   - removeInventoryList.add(inventoryDetail);
915   - }
916   - }
917   - }
  909 + //if (taskHeaderList != null) {
  910 + // for (TaskHeader taskHeader : taskHeaderList) {
  911 + // if (taskHeader.getContainerCode().equals(container.getCode())) {
  912 + // removeInventoryList.add(inventoryDetail);
  913 + // }
  914 + // }
  915 + //}
918 916 if (receiptContainerHeaderList != null) {
919 917 for (ReceiptContainerHeader receiptContainerHeader : receiptContainerHeaderList) {
920 918 if (receiptContainerHeader.getContainerCode().equals(container.getCode())) {
... ...