批量出库，按照出库单详情出

肖超群
1 parent b2e0ce4a
Showing 4 changed files with 109 additions and 2 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java
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/service/IInventoryHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
@@ -374,9 +374,22 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader, 
     @ResponseBody
     public Result shipmentInventoryHeader(@RequestBody List<InventoryHeader> inventoryHeaderList, HttpServletRequest req) {
         if (StringUtils.isEmpty(inventoryHeaderList)) {
-            return Result.error("库存明细为空");
+            return Result.error("库存头为空");
         }
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         return inventoryHeaderService.shipmentInventoryHeader(inventoryHeaderList, warehouseCode);
     }
+
+    @AutoLog("库存头-批量出库存详情")
+    @ApiOperation(value = "批量出库存详情", notes = "批量出库存详情")
+    @ApiLogger(apiName = "批量出库存详情")
+    @PostMapping("/shipmentInventoryDetail")
+    @ResponseBody
+    public Result shipmentInventoryDetail(@RequestBody List<InventoryDetail> inventoryDetailList, HttpServletRequest req) {
+        if (StringUtils.isEmpty(inventoryDetailList)) {
+            return Result.error("库存明细为空");
+        }
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+        return inventoryHeaderService.shipmentInventoryDetail(inventoryDetailList, warehouseCode);
+    }
 }
@@ -154,6 +154,8 @@ public class InventoryDetail implements Serializable {
     /** 更新日期 */
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
+    @TableField(exist = false)
+    private String toPortCode;
  
     public void setQty(BigDecimal qty) {
         if (qty.compareTo(BigDecimal.ZERO) < 0) {
@@ -5,6 +5,7 @@ import java.util.Collection;
 import java.util.List;
  
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryHeader;
  
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -40,4 +41,6 @@ public interface IInventoryHeaderService extends IService&lt;InventoryHeader&gt; {
     boolean updateLocationCodeById(String locationCode, Integer id);
  
     Result shipmentInventoryHeader(List<InventoryHeader> inventoryHeaderList, String warehouseCode);
+
+    Result shipmentInventoryDetail(List<InventoryDetail> inventoryDetailList, String warehouseCode);
 }
@@ -187,6 +187,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         if (!result.isSuccess()) {
             throw new JeecgBootException("批量快速出库，创建出库单失败：".concat(result.getMessage()));
         }
+
         List<ShipmentDetail> shipmentDetailList = new ArrayList<>();
         for (InventoryDetail inventoryDetail : inventoryDetails) {
             ShipmentDetail shipmentDetail = new ShipmentDetail();
@@ -202,6 +203,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
             shipmentDetail = shipmentDetailService.getById(shipmentDetail.getId());
             shipmentDetailList.add(shipmentDetail);
         }
+
         for (int i = 0; i < inventoryDetails.size(); i++) {
             InventoryDetail inventoryDetail = inventoryDetails.get(i);
             ShipmentDetail shipmentDetail = shipmentDetailList.get(i);
@@ -214,11 +216,98 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
                 throw new JeecgBootException("批量快速出库，配盘失败：".concat(result.getMessage()));
             }
         }
+
+        List<ShipmentContainerDetail> shipmentContainerDetailList =
+            shipmentContainerDetailService.getShipmentContainerDetailListByShipmentCode(shipmentHeader.getCode());
+        if (StringUtils.isEmpty(shipmentContainerDetailList)) {
+            throw new JeecgBootException("批量快速出库,根据出库单没有找到配盘详情");
+        }
+
+        List<Integer> shipmentContainerHeaderIdList =
+            shipmentContainerDetailList.stream().map(ShipmentContainerDetail::getShipmentContainerId).collect(Collectors.toList());
+        long shipmentOrder = System.currentTimeMillis();
+        int sequenceNumber = shipmentContainerHeaderIdList.size();
+        int sequence = 0;
+        for (int shipmentContainerId : shipmentContainerHeaderIdList) {
+            sequence++;
+            ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(shipmentContainerId);
+            if (shipmentContainerHeader == null) {
+                throw new JeecgBootException("批量快速出库,没有找到出库表头:" + shipmentContainerId);
+            }
+            shipmentContainerHeader.setToPort(toPortCode);
+            boolean success = shipmentContainerHeaderService.updateById(shipmentContainerHeader);
+            if (!success) {
+                throw new JeecgBootException("批量快速出库，更新出库组盘头失败");
+            }
+            result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, warehouseCode, shipmentOrder, sequence, sequenceNumber);
+            if (!result.isSuccess()) {
+                throw new JeecgBootException(result.getMessage());
+            }
+        }
+
+        return Result.OK("批量快速出库成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = JeecgBootException.class)
+    public Result shipmentInventoryDetail(List<InventoryDetail> inventoryDetailList, String warehouseCode) {
+        if (StringUtils.isEmpty(inventoryDetailList)) {
+            return Result.error("批量快速出库,所选库存详情为空");
+        }
+        String toPortCode = inventoryDetailList.get(0).getToPortCode();
+        if (StringUtils.isEmpty(toPortCode)) {
+            return Result.error("批量快速出库,出库站台编码为空");
+        }
+        inventoryDetailList =
+            inventoryDetailList.stream().filter((item) -> item.getContainerStatus().equals(QuantityConstant.STATUS_CONTAINER_EMPTY)).collect(Collectors.toList());
+        if (StringUtils.isEmpty(inventoryDetailList)) {
+            return Result.error("批量快速出库, 排除锁定库存后没有可出库存详情");
+        }
+
+        ShipmentHeader shipmentHeader = new ShipmentHeader();
+        shipmentHeader.setWarehouseCode(warehouseCode);
+        shipmentHeader.setType(QuantityConstant.SHIPMENT_BILL_TYPE_QTC);
+        shipmentHeader.setRemark("快速出库");
+        Result result = shipmentHeaderService.saveShipmentHeader(shipmentHeader);
+        if (!result.isSuccess()) {
+            throw new JeecgBootException("批量快速出库，创建出库单失败：".concat(result.getMessage()));
+        }
+
+        List<ShipmentDetail> shipmentDetailList = new ArrayList<>();
+        for (InventoryDetail inventoryDetail : inventoryDetailList) {
+            ShipmentDetail shipmentDetail = new ShipmentDetail();
+            shipmentDetail.setShipmentId(shipmentHeader.getId());
+            shipmentDetail.setMaterialCode(inventoryDetail.getMaterialCode());
+            shipmentDetail.setInventoryStatus(inventoryDetail.getInventoryStatus());
+            shipmentDetail.setQty(inventoryDetail.getQty());
+            shipmentDetail.setBatch(inventoryDetail.getBatch());
+            result = shipmentDetailService.saveShipmentDetail(shipmentDetail);
+            if (!result.isSuccess()) {
+                throw new JeecgBootException("批量快速出库，创建出库详情失败：".concat(result.getMessage()));
+            }
+            shipmentDetail = shipmentDetailService.getById(shipmentDetail.getId());
+            shipmentDetailList.add(shipmentDetail);
+        }
+
+        for (int i = 0; i < inventoryDetailList.size(); i++) {
+            InventoryDetail inventoryDetail = inventoryDetailList.get(i);
+            ShipmentDetail shipmentDetail = shipmentDetailList.get(i);
+            CombinationModel combinationModel = new CombinationModel();
+            combinationModel.setInventoryDetail(inventoryDetail);
+            combinationModel.setShipmentDetail(shipmentDetail);
+            combinationModel.setShipQty(inventoryDetail.getQty());
+            result = shipmentCombinationService.combination(combinationModel);
+            if (!result.isSuccess()) {
+                throw new JeecgBootException("批量快速出库，配盘失败：".concat(result.getMessage()));
+            }
+        }
+
         List<ShipmentContainerDetail> shipmentContainerDetailList =
             shipmentContainerDetailService.getShipmentContainerDetailListByShipmentCode(shipmentHeader.getCode());
         if (StringUtils.isEmpty(shipmentContainerDetailList)) {
             throw new JeecgBootException("批量快速出库,根据出库单没有找到配盘详情");
         }
+
         List<Integer> shipmentContainerHeaderIdList =
             shipmentContainerDetailList.stream().map(ShipmentContainerDetail::getShipmentContainerId).collect(Collectors.toList());
         long shipmentOrder = System.currentTimeMillis();
@@ -235,7 +324,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
             if (!success) {
                 throw new JeecgBootException("批量快速出库，更新出库组盘头失败");
             }
-            result = huahengMultiHandlerService.createShipmentTask(shipmentContainerHeader, warehouseCode, shipmentOrder, sequence, sequenceNumber);
+            result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, warehouseCode, shipmentOrder, sequence, sequenceNumber);
             if (!result.isSuccess()) {
                 throw new JeecgBootException(result.getMessage());
             }