库存筛选排序，先按照入库日期排，然后排内外侧

肖超群
1 parent b0071572
Showing 6 changed files with 22 additions and 0 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryHeader.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/IShipmentCombinationService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -137,6 +137,9 @@ public class InventoryDetail implements Serializable {
     /** 巷道 */
     @ApiModelProperty(value = "巷道")
     private Integer roadWay;
+    /** 内外侧 */
+    @ApiModelProperty(value = "内外侧")
+    private Integer rowFlag;
     /** 备用字段1 */
     @Excel(name = "备用字段1", width = 15)
     @ApiModelProperty(value = "备用字段1")
@@ -81,6 +81,9 @@ public class InventoryHeader implements Serializable {
     /** 巷道 */
     @ApiModelProperty(value = "巷道")
     private Integer roadWay;
+    /** 内外侧 */
+    @ApiModelProperty(value = "内外侧")
+    private Integer rowFlag;
     /** 备用字段1 */
     @Excel(name = "备用字段1", width = 15)
     @ApiModelProperty(value = "备用字段1")
@@ -508,6 +508,7 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
             return Result.error("增加库存，没有找到库位" + locationCode);
         }
         Integer roadWay = location.getRoadWay();
+        Integer rowFlag = location.getRowFlag();
         String zoneType = zone.getType();
         InventoryDetail inventoryDetail = new InventoryDetail();
         inventoryDetail.setInventoryHeaderId(inventoryHeader.getId());
@@ -524,6 +525,7 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
         inventoryDetail.setMaterialUnit(material.getUnit());
         inventoryDetail.setQty(qty);
         inventoryDetail.setRoadWay(roadWay);
+        inventoryDetail.setRowFlag(rowFlag);
         inventoryDetail.setInventoryStatus(QuantityConstant.QUALITY_GOOD);
         inventoryDetail.setReceiptDate(new Date());
         if (!inventoryDetailService.save(inventoryDetail)) {
@@ -490,6 +490,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
     }
  
     @Override
+    @Transactional
     public boolean updateInventory(String containerCode, String locationCode, String warehouseCode) {
         InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByContainerCode(containerCode, warehouseCode);
         if (inventoryHeader == null) {
@@ -526,6 +527,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
             inventoryDetail1.setZoneCode(zoneCode);
             inventoryDetail1.setZoneType(zoneType);
             inventoryDetail1.setRoadWay(toLocation.getRoadWay());
+            inventoryDetail1.setRowFlag(toLocation.getRowFlag());
             updateInventoryDetailList.add(inventoryDetail1);
         }
         success = inventoryDetailService.updateBatchById(updateInventoryDetailList);
@@ -19,6 +19,8 @@ public interface IShipmentCombinationService {
  
     List<InventoryDetail> getInventorys(ShipmentDetail shipmentDetail);
  
+    List<InventoryDetail> groupInventorysByRowFlag(List<InventoryDetail> inventoryDetailList);
+
     List<InventoryDetail> getInventorys(ShipmentDetail shipmentDetail, String containerCode);
  
     List<InventoryDetail> getAllInventorys(ShipmentDetail shipmentDetail);
@@ -3,6 +3,7 @@ package org.jeecg.modules.wms.shipment.shipmentCombination.service.impl;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
  
@@ -174,10 +175,19 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
             }
             inventoryDetailList = inventoryDetailList.stream().filter(t -> result.getResult().contains(t.getRoadWay())).collect(Collectors.toList());
         }
+
+        inventoryDetailList = groupInventorysByRowFlag(inventoryDetailList);
         return inventoryDetailList;
     }
  
     @Override
+    public List<InventoryDetail> groupInventorysByRowFlag(List<InventoryDetail> inventoryDetailList) {
+        List<InventoryDetail> inventoryDetails = inventoryDetailList.stream()
+            .sorted(Comparator.comparing(InventoryDetail::getReceiptDate).thenComparing(InventoryDetail::getRowFlag)).collect(Collectors.toList());
+        return inventoryDetails;
+    }
+
+    @Override
     public List<InventoryDetail> getInventorys(ShipmentDetail shipmentDetail, String containerCode) {
         String warehouseCode = shipmentDetail.getWarehouseCode();
         String companyCode = shipmentDetail.getCompanyCode();