理货备货开发

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaController.java

@@ -33,6 +33,7 @@ import com.ruoyi.ams.lineCall.domain.vo.LineCallVO;
 import com.ruoyi.ams.lineCall.service.ILineCallService;
 import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
+import com.ruoyi.ams.order.dto.PdaGroupDiskDTO;
 import com.ruoyi.ams.order.form.*;
 import com.ruoyi.ams.order.service.IActAllocationDetailsService;
 import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
@@ -545,6 +546,16 @@ public class PdaController {
     }
 
 
+    /**
+     * 组盘
+     * PDA备货组盘（传出库单号）
+     *
+     * @return
+     */
+    @PostMapping("/docOrder/pdaGroupDisk")
+    public AjaxResult pdaGroupDisk(@RequestBody PdaGroupDiskDTO pdaGroupDiskDTO) {
+        return wmsDocOrderHeaderService.pdaGroupDiskBH(pdaGroupDiskDTO);
+    }
 
     /**
      * 分拣出库

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -214,4 +214,9 @@ public class Constants
      * 是
      */
     public static final String YES = "Y";
+
+    /**
+     * 数据库查询只查询一条
+     */
+    public static final String LAST_SQL = "limit 1";
 }

warewms-ams/src/main/java/com/ruoyi/ams/box/mapper/WmsBoxInfoMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.ams.box.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author ruoyi
  * @date 2022-11-01
  */
-public interface WmsBoxInfoMapper
+public interface WmsBoxInfoMapper extends BaseMapper<WmsBoxInfo>
 {
     /**
      * 查询容器管理

warewms-ams/src/main/java/com/ruoyi/ams/box/service/IWmsBoxInfoService.java

@@ -129,4 +129,12 @@ public interface IWmsBoxInfoService {
      * @return
      */
     AjaxResult importLocation(List<WmsBoxInfo> list, boolean updateSupport, String opname);
+
+    /**
+     * 修改托盘区域信息
+     * @param boxNo
+     * @param locationId
+     * @return
+     */
+    Boolean updateWmsBoxLocationIdByBoxNo(String boxNo, Long locationId);
 }

warewms-ams/src/main/java/com/ruoyi/ams/box/service/impl/WmsBoxInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.ams.box.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
 import com.ruoyi.ams.box.form.AddBoxForm;
 import com.ruoyi.ams.box.mapper.WmsBoxInfoMapper;
@@ -235,4 +236,17 @@ public class WmsBoxInfoServiceImpl implements IWmsBoxInfoService {
         }
         return AjaxResult.success(successMsg);
     }
+
+    /**
+     * 修改托盘区域信息
+     * @param boxNo
+     * @param locationId
+     * @return
+     */
+    @Override
+    public Boolean updateWmsBoxLocationIdByBoxNo(String boxNo, Long locationId){
+        return wmsBoxInfoMapper.update(new WmsBoxInfo(), Wrappers.<WmsBoxInfo>lambdaUpdate()
+                .eq(WmsBoxInfo::getBoxNo, boxNo)
+                .set(WmsBoxInfo::getLocationId, locationId)) > 0;
+    }
 }

warewms-ams/src/main/java/com/ruoyi/ams/inv/domain/InvLotLocId.java

@@ -1,6 +1,10 @@
 package com.ruoyi.ams.inv.domain;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -18,6 +22,8 @@ public class InvLotLocId extends BaseEntity
 
     /** 批次号 */
     private String lotnum;
+
+    @TableField(exist = false)
     private String lotnumTo;
 
     /** 库位 */

warewms-ams/src/main/java/com/ruoyi/ams/inv/dto/InvLotAttPalletTotalDTO.java

@@ -19,4 +19,9 @@ public class InvLotAttPalletTotalDTO implements Serializable {
 
     @ApiModelProperty("托盘sku总数量")
     private BigDecimal totalQty;
+
+    @ApiModelProperty("库位id")
+    private String locationId;
+
+
 }

warewms-ams/src/main/java/com/ruoyi/ams/inv/dto/InvLotLocIdSurplusQtyDTO.java

@@ -0,0 +1,24 @@
+package com.ruoyi.ams.inv.dto;
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class InvLotLocIdSurplusQtyDTO implements Serializable {
+
+    /** 批次号 */
+    private String lotnum;
+
+    /** 库位 */
+    private String locationId;
+
+    /** 产品 */
+    private String sku;
+
+    /** 剩余库存数量(件) */
+    private BigDecimal surplusQty;
+
+}

warewms-ams/src/main/java/com/ruoyi/ams/inv/mapper/InvLotAttMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.ams.inv.domain.InvLotAtt;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 批次属性Mapper接口
@@ -11,6 +12,7 @@ import com.ruoyi.ams.inv.domain.InvLotAtt;
  * @author andy
  * @date 2022-03-09
  */
+@Mapper
 public interface InvLotAttMapper extends BaseMapper<InvLotAtt>
 {
     /**

warewms-ams/src/main/java/com/ruoyi/ams/inv/mapper/InvLotLocIdMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.ams.inv.mapper;
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.ams.asn.vo.StockingListVO;
 import com.ruoyi.ams.config.domain.dto.LotattDTO;
 import com.ruoyi.ams.inv.domain.InvLotAtt;
@@ -20,7 +21,7 @@ import org.apache.ibatis.annotations.Param;
  * @author andy
  * @date 2022-03-03
  */
-public interface InvLotLocIdMapper {
+public interface InvLotLocIdMapper extends BaseMapper<InvLotLocId> {
     /**
      * 查询库位库存信息
      *

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/IInvLotAttService.java

@@ -77,9 +77,25 @@ public interface IInvLotAttService
     List<InvLotAtt> queryAttributesByAsnno(String asnNo);
 
     /**
-     * 根据多sku获取不同sku各托盘上总数（根据托盘所关联批次数量计算产品数量，只限产品！！！ 物料需联表库位库存表获取总数！！！）
+     * 根据多sku获取不同sku各托盘上总数（根据库位库存信息获取所关联批次托盘）
      * @param skuList
      * @return
      */
     Map<String, List<InvLotAttPalletTotalDTO>> buildInvLotAttPalletTotalMap(List<String> skuList);
+
+    /**
+     * 新增批次属性
+     *
+     * @param invLotAtt 批次属性
+     * @return 结果
+     */
+    int insertInvLotAtt(InvLotAtt invLotAtt);
+
+    /**
+     * 根据sn获取批次信息
+     * @param palletNoFrom
+     * @param sn
+     * @return
+     */
+    InvLotAtt queryInvLotAttBySn(String palletNoFrom, String sn);
 }

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/IInvLotLocIdService.java

@@ -13,6 +13,7 @@ import com.ruoyi.ams.inv.domain.form.InvLotLocIdAdjForm;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdForm;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdMoveForm;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
+import com.ruoyi.ams.inv.dto.InvLotLocIdSurplusQtyDTO;
 import com.ruoyi.ams.order.form.LineReleaseFrom;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.domain.form.BasLocationForm;
@@ -403,4 +404,50 @@ public interface IInvLotLocIdService {
      * @return
      */
     AjaxResult updateLotatt15ByLotnum(String lotnum,String orderNo);
+
+    /**
+     * 根据多sku获取库位库存信息，并获取每个库位剩余库存
+     * @param skuList
+     * @return
+     */
+    List<InvLotLocIdSurplusQtyDTO> buildInvLotLocIdSurplusQtyDTOList(List<String> skuList);
+
+    /**
+     * 根据批次lotnum查询对应库存库位信息
+     * @param lotnum
+     * @return
+     */
+    InvLotLocId queryInvLotLocIdByLotnum(String lotnum);
+
+    /**
+     * 修改库位库存信息
+     * @param lotNum
+     * @param qtyAllocated
+     * @param sku
+     * @return
+     */
+    Boolean updateInvLotLocId(String lotNum, BigDecimal qtyAllocated, String sku);
+
+    /**
+     * 修改库位库存信息
+     * @param lotNum
+     * @param lotNumTo
+     * @param qty
+     * @param sku
+     * @param locationId
+     * @return
+     */
+    Boolean updateInvLotLocId(String lotNum, String lotNumTo, BigDecimal qty, String sku, String locationId);
+
+    /**
+     * 修改库位库存信息
+     * @param lotNum
+     * @param lotNumTo
+     * @param qty
+     * @param qtyAllocated
+     * @param sku
+     * @param locationId
+     * @return
+     */
+    Boolean updateInvLotLocId(String lotNum, String lotNumTo, BigDecimal qty, BigDecimal qtyAllocated, String sku, String locationId);
 }

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotAttServiceImpl.java

@@ -7,6 +7,9 @@ import java.util.stream.Collectors;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.ams.inv.dto.InvLotAttPalletTotalDTO;
+import com.ruoyi.ams.inv.dto.InvLotLocIdSurplusQtyDTO;
+import com.ruoyi.ams.inv.service.IInvLotLocIdService;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +29,9 @@ public class InvLotAttServiceImpl implements IInvLotAttService {
     @Autowired
     private InvLotAttMapper invLotAttMapper;
 
+    @Autowired
+    private IInvLotLocIdService invLotLocIdService;
+
     /**
      * 查询批次属性
      *
@@ -112,41 +118,66 @@ public class InvLotAttServiceImpl implements IInvLotAttService {
     }
 
     /**
-     * 根据多sku获取不同sku各托盘上总数（根据托盘所关联批次数量计算产品数量，只限产品！！！ 物料需联表库位库存表获取总数！！！）
+     * 根据多sku获取不同sku各托盘上总数（根据库位库存信息获取所关联批次托盘）
      * @param skuList
      * @return
      */
     @Override
     public Map<String, List<InvLotAttPalletTotalDTO>> buildInvLotAttPalletTotalMap(List<String> skuList){
-        List<InvLotAtt> invLotAttList = queryInvLotAttBySkuList(skuList);
+        List<InvLotLocIdSurplusQtyDTO> invLotLocIdSurplusQtyDTOList = invLotLocIdService.buildInvLotLocIdSurplusQtyDTOList(skuList);
+        if (CollectionUtil.isEmpty(invLotLocIdSurplusQtyDTOList)) {
+            return new HashMap<>();
+        }
+        //构建lotnum -> 库存剩余sku数量 map
+        Map<String, InvLotLocIdSurplusQtyDTO> lotNumQtyMap = invLotLocIdSurplusQtyDTOList.stream().collect(Collectors.toMap(InvLotLocIdSurplusQtyDTO::getLotnum, item -> item));
+        List<InvLotAtt> invLotAttList = queryInvLotAttByLotNumList(invLotLocIdSurplusQtyDTOList.stream().map(InvLotLocIdSurplusQtyDTO::getLotnum).collect(Collectors.toList()));
         if (CollectionUtil.isEmpty(invLotAttList)) {
             return new HashMap<>();
         }
         Map<String, List<InvLotAttPalletTotalDTO>> result = new HashMap<>();
+
         //根据sku对批次分类
         Map<String, List<InvLotAtt>> skuInvLotAttMap = invLotAttList.stream().collect(Collectors.groupingBy(InvLotAtt::getSku));
         skuInvLotAttMap.forEach((key, value) -> {
             //相同sku根据托盘分类，计算托盘上产品数量
             Map<String, List<InvLotAtt>> palletMap = value.stream().filter(item -> StringUtils.isNotBlank(item.getLotatt07())).collect(Collectors.groupingBy(InvLotAtt::getLotatt07));
-            //根据托盘产品数量对托盘进行排序（倒序）
+            //根据托盘产品数量对托盘进行排序（正序）
             List<InvLotAttPalletTotalDTO> invLotAttPalletTotalDTOList = palletMap.entrySet().stream().map(item -> {
                 InvLotAttPalletTotalDTO invLotAttPalletTotalDTO = new InvLotAttPalletTotalDTO();
                 invLotAttPalletTotalDTO.setSku(key);
                 invLotAttPalletTotalDTO.setPalletNo(item.getKey());
-                invLotAttPalletTotalDTO.setTotalQty(new BigDecimal(item.getValue().size()));
+                invLotAttPalletTotalDTO.setTotalQty(item.getValue().stream().map(invLotAtt -> lotNumQtyMap.get(invLotAtt.getLotnum()).getSurplusQty()).reduce(BigDecimal.ZERO, BigDecimal::add));
+                invLotAttPalletTotalDTO.setLocationId(lotNumQtyMap.get(item.getValue().stream().map(InvLotAtt::getLotnum).findFirst()).getLocationId());
                 return invLotAttPalletTotalDTO;
-            }).sorted(Comparator.comparing(InvLotAttPalletTotalDTO::getTotalQty).reversed()).collect(Collectors.toList());
+            }).sorted(Comparator.comparing(InvLotAttPalletTotalDTO::getTotalQty)).collect(Collectors.toList());
             result.put(key, invLotAttPalletTotalDTOList);
         });
+        //根据sku分类各托盘剩余数量信息
         return result;
     }
 
     /**
-     * 根据多sku获取批次list信息
-     * @param skuList
+     * 新增批次属性
+     *
+     * @param invLotAtt 批次属性
+     * @return 结果
+     */
+    @Override
+    public int insertInvLotAtt(InvLotAtt invLotAtt){return invLotAttMapper.insertInvLotAtt(invLotAtt);}
+
+    /**
+     * 根据条码获取批次信息
+     * @param sn
      * @return
      */
-    public List<InvLotAtt> queryInvLotAttBySkuList(List<String> skuList){
-        return invLotAttMapper.selectList(Wrappers.<InvLotAtt>lambdaQuery().in(InvLotAtt::getSku));
+    @Override
+    public InvLotAtt queryInvLotAttBySn(String palletNoFrom, String sn){
+        return invLotAttMapper.selectOne(Wrappers.<InvLotAtt>lambdaQuery().eq(InvLotAtt::getLotatt02, sn).eq(InvLotAtt::getLotatt07, palletNoFrom).last(Constants.LAST_SQL));
     }
+
+    private List<InvLotAtt> queryInvLotAttByLotNumList(List<String> lotNumList){
+        return invLotAttMapper.selectList(Wrappers.<InvLotAtt>lambdaQuery().in(InvLotAtt::getLotnum, lotNumList));
+    }
+
+
 }

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -1,5 +1,8 @@
 package com.ruoyi.ams.inv.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
 import com.ruoyi.ams.box.service.IWmsBoxInfoService;
 import com.ruoyi.ams.business.IBusinessService;
@@ -13,6 +16,7 @@ import com.ruoyi.ams.inv.domain.form.InvLotLocIdAdjForm;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdForm;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdMoveForm;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
+import com.ruoyi.ams.inv.dto.InvLotLocIdSurplusQtyDTO;
 import com.ruoyi.ams.inv.mapper.InvLotAttMapper;
 import com.ruoyi.ams.inv.mapper.InvLotLocIdMapper;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
@@ -26,12 +30,15 @@ import com.ruoyi.base.domain.BaseLocationZone;
 import com.ruoyi.base.domain.form.BasLocationForm;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.base.utils.IdSequenceUtils;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.ConvertUtils;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,6 +48,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 库位库存信息Service业务层处理
@@ -1094,4 +1102,87 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
         return AjaxResult.success();
     }
 
+    /**
+     * 根据多sku获取库位库存信息，并获取每个库位剩余库存
+     * @param skuList
+     * @return
+     */
+    @Override
+    public List<InvLotLocIdSurplusQtyDTO> buildInvLotLocIdSurplusQtyDTOList(List<String> skuList){
+        List<InvLotLocId> invLotLocIdList = queryInvLotLocIdBySkuList(skuList);
+        if (CollectionUtil.isEmpty(invLotLocIdList)) return Lists.newArrayList();
+        return invLotLocIdList.stream().filter(item -> ObjectUtil.isNotNull(item.getQty())).map(item -> {
+            InvLotLocIdSurplusQtyDTO invLotLocIdSurplusQtyDTO = ConvertUtils.sourceToTarget(item, InvLotLocIdSurplusQtyDTO.class);
+            invLotLocIdSurplusQtyDTO.setSurplusQty(ObjectUtil.isNotNull(item.getQtyallocated()) ? item.getQty().subtract(item.getQtyallocated()) : item.getQty());
+            return invLotLocIdSurplusQtyDTO;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 根据多sku获取库位库存list信息
+     * @param skuList
+     * @return
+     */
+    public List<InvLotLocId> queryInvLotLocIdBySkuList(List<String> skuList){
+        return invLotLocIdMapper.selectList(Wrappers.<InvLotLocId>lambdaQuery().in(InvLotLocId::getSku, skuList));
+    }
+
+    /**
+     * 根据批次lotnum查询对应库存库位信息
+     * @param lotnum
+     * @return
+     */
+    @Override
+    public InvLotLocId queryInvLotLocIdByLotnum(String lotnum){
+        return invLotLocIdMapper.selectOne(Wrappers.<InvLotLocId>lambdaQuery().eq(InvLotLocId::getLotnum, lotnum).last(Constants.LAST_SQL));
+    }
+
+    /**
+     * 修改库位库存信息
+     * @param lotNum
+     * @param qtyAllocated
+     * @param sku
+     * @return
+     */
+    @Override
+    public Boolean updateInvLotLocId(String lotNum, BigDecimal qtyAllocated, String sku) {
+        return updateInvLotLocId(lotNum, null, null, qtyAllocated, sku, null);
+    }
+
+    /**
+     * 修改库位库存信息
+     * @param lotNum
+     * @param lotNumTo
+     * @param qty
+     * @param sku
+     * @param locationId
+     * @return
+     */
+    @Override
+    public Boolean updateInvLotLocId(String lotNum, String lotNumTo, BigDecimal qty, String sku, String locationId) {
+        return updateInvLotLocId(lotNum, lotNumTo, qty, null, sku, locationId);
+    }
+
+    /**
+     *  修改库位库存信息
+     * @param lotNum
+     * @param lotNumTo
+     * @param qty
+     * @param qtyAllocated
+     * @param sku
+     * @param locationId
+     * @return
+     */
+    @Override
+    public Boolean updateInvLotLocId(String lotNum, String lotNumTo, BigDecimal qty, BigDecimal qtyAllocated, String sku, String locationId) {
+        return invLotLocIdMapper.update(new InvLotLocId(), Wrappers.<InvLotLocId>lambdaUpdate()
+                .eq(InvLotLocId::getLotnum, lotNum)
+                .set(StringUtils.isNotBlank(lotNumTo), InvLotLocId::getLotnum, lotNumTo)
+                .set(StringUtils.isNotBlank(lotNumTo), InvLotLocId::getQty, qty)
+                .set(InvLotLocId::getSku, sku)
+                .set(StringUtils.isNotBlank(locationId), InvLotLocId::getLocationId, locationId)
+                .set(InvLotLocId::getQtyallocated, StringUtils.isNotBlank(lotNumTo) ? BigDecimal.ZERO : qtyAllocated)
+        ) > 0;
+    }
+
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/dto/PdaGroupDiskDTO.java

@@ -0,0 +1,42 @@
+package com.ruoyi.ams.order.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class PdaGroupDiskDTO implements Serializable {
+    private static final long serialVersionUID = -6537424798126213032L;
+
+    /**
+     * 起始托盘
+     */
+    @NotBlank(message = "起始托盘不能为空")
+    private String palletNoFrom;
+    /**
+     * 目标托盘
+     */
+    @NotBlank(message = "目标托盘不能为空")
+    private String palletNoTo;
+    /**
+     * 箱子
+     */
+    private String boxNo;
+    /**
+     * 条码号
+     */
+    @NotBlank(message = "条码号不能为空")
+    private String sn;
+    /**
+     * 出库单号（理货备货才会传入）
+     */
+    private String orderNo;
+
+    /**
+     * 组盘数量
+     */
+    @NotBlank(message = "组盘数量不能为空")
+    private String qty;
+
+}

warewms-ams/src/main/java/com/ruoyi/ams/order/service/IWmsDocOrderDetailsService.java

@@ -83,10 +83,17 @@ public interface IWmsDocOrderDetailsService {
      */
     int deleteWmsDocOrderDetailsByOrderNoLineNos(List<HashMap<String,Object>> list);
 
+    /**
+     * 根据出库单号获取明细
+     * @param orderNo
+     * @return
+     */
+    List<WmsDocOrderDetails> queryWmsDocOrderDetailsByOrderNo(String orderNo);
+
     /**
      * 根据入库单号list获取明细
      * @param orderNoList 入库单号list
      * @return
      */
-    List<WmsDocOrderDetails> queryWmsDocOrderDetailsByOrderNoList(List<String> orderNoList);
+    List<WmsDocOrderDetails> queryWmsDocOrderDetailsByOrderNo(List<String> orderNoList);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/IWmsDocOrderHeaderService.java

@@ -1,13 +1,11 @@
 package com.ruoyi.ams.order.service;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 import com.ruoyi.ams.erp.domain.ErpOrderList;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.order.domain.PalletMatchLog;
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
+import com.ruoyi.ams.order.dto.PdaGroupDiskDTO;
 import com.ruoyi.ams.order.form.*;
 import com.ruoyi.ams.order.vo.CheckOutVO;
 import com.ruoyi.ams.order.vo.PickingListVO;
@@ -16,6 +14,9 @@ import com.ruoyi.base.domain.vo.CodeSkuRelationshipSoVO;
 import com.ruoyi.base.form.SnCheckSoForm;
 import com.ruoyi.common.core.domain.AjaxResult;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * 出库单头Service接口
  *
@@ -249,6 +250,13 @@ public interface IWmsDocOrderHeaderService {
      */
     AjaxResult groupDiskBHCheck(GroupDiskFrom groupDiskFrom);
 
+    /**
+     * PDA理货备货
+     * @param pdaGroupDiskDTO
+     * @return
+     */
+    AjaxResult pdaGroupDiskBH(PdaGroupDiskDTO pdaGroupDiskDTO);
+
     /**
      * 组盘（备货）
      * @param groupDiskFrom
@@ -421,5 +429,10 @@ public interface IWmsDocOrderHeaderService {
      */
     Boolean inventoryMatch(List<String> orderList);
 
+    /**
+     * 获取库存分配反馈
+     * @param orderNos
+     * @return
+     */
     List<PalletMatchLog> queryPalletMatchInfoList(String orderNos);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderDetailsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.ams.order.service.impl;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -131,12 +132,22 @@ public class WmsDocOrderDetailsServiceImpl implements IWmsDocOrderDetailsService
     }
 
     /**
-     * 根据入库单号list获取明细
+     * 根据出库单号获取明细
+     * @param orderNo 入库单号list
+     * @return
+     */
+    @Override
+    public List<WmsDocOrderDetails> queryWmsDocOrderDetailsByOrderNo(String orderNo){
+        return queryWmsDocOrderDetailsByOrderNo(Arrays.asList(orderNo));
+    }
+
+    /**
+     * 根据出库单号list获取明细
      * @param orderNoList 入库单号list
      * @return
      */
     @Override
-    public List<WmsDocOrderDetails> queryWmsDocOrderDetailsByOrderNoList(List<String> orderNoList){
+    public List<WmsDocOrderDetails> queryWmsDocOrderDetailsByOrderNo(List<String> orderNoList){
         return wmsDocOrderDetailsMapper.selectList(Wrappers.<WmsDocOrderDetails>lambdaQuery().in(WmsDocOrderDetails::getOrderNo, orderNoList));
     }
 

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -3,8 +3,8 @@ package com.ruoyi.ams.order.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.comparator.CompareUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.ruoyi.ams.asn.service.IWmsDocAsnHeaderService;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
 import com.ruoyi.ams.box.mapper.WmsBoxInfoMapper;
@@ -33,6 +33,7 @@ import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.ams.order.domain.PalletMatchLog;
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
+import com.ruoyi.ams.order.dto.PdaGroupDiskDTO;
 import com.ruoyi.ams.order.form.*;
 import com.ruoyi.ams.order.mapper.WmsDocOrderDetailsMapper;
 import com.ruoyi.ams.order.mapper.WmsDocOrderHeaderMapper;
@@ -2736,12 +2737,124 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         return AjaxResult.success();
     }
 
+    /**
+     * PDA理货备货
+     * @param pdaGroupDiskDTO
+     * @return
+     */
+    @Override
+    @Transactional
+    public synchronized AjaxResult pdaGroupDiskBH(PdaGroupDiskDTO pdaGroupDiskDTO) {
+        String palletNoFrom = pdaGroupDiskDTO.getPalletNoFrom(); // 起始托盘
+        String palletNoTo = pdaGroupDiskDTO.getPalletNoTo(); // 目标托盘
+        String sn = pdaGroupDiskDTO.getSn(); // 条码号
+        String orderNo = StringUtils.isNotBlank(pdaGroupDiskDTO.getOrderNo()) ? pdaGroupDiskDTO.getOrderNo() : ""; // 出库单号（备货才会传入）
+        String boxNo = StringUtils.isNotBlank(pdaGroupDiskDTO.getBoxNo()) ? pdaGroupDiskDTO.getBoxNo() : palletNoTo; //箱号
+        BigDecimal qty = new BigDecimal(pdaGroupDiskDTO.getQty()); // 数量
+
+        verifyWmsDocOrder(orderNo);
+
+        // 根据条码获取物料号
+        CodeSkuRelationshipVO codeSkuRelationshipVO = codeSkuRelationshipService.checkIsProduct(sn);
+        // 物料编码
+        String sku = codeSkuRelationshipVO.getSku();
+        //创建新批次
+        String lotNum = IdWorker.getIdStr();
+        invLotAttService.insertInvLotAtt(buildInvLotAtt(lotNum, palletNoTo, orderNo, sn, sku));
+        InvLotAtt invLotAtt = invLotAttService.queryInvLotAttBySn(palletNoFrom, sn);
+        InvLotLocId invLotLocId = invLotLocIdService.queryInvLotLocIdByLotnum(invLotAtt.getLotnum());
+        String locationId = invLotLocId.getLocationId();
+        BigDecimal qtyAllocated = ObjectUtil.isNotNull(invLotLocId.getQtyallocated()) ? invLotLocId.getQtyallocated() : BigDecimal.ZERO;
+        BigDecimal invLotLocQty = invLotLocId.getQty().subtract(qtyAllocated);
+        if (CompareUtil.compare(qty, invLotLocQty) >= 0){
+            invLotLocIdService.updateInvLotLocId(invLotLocId.getLotnum(), lotNum, invLotLocQty, sku, locationId);
+        }else {
+            // 拆分库存
+            // 修改原库存
+            invLotLocIdService.updateInvLotLocId(invLotLocId.getLotnum(), qtyAllocated.add(qty), invLotLocId.getSku());
+            // 插入新库存
+            invLotLocIdService.insertInvLotLocId(buildInvLotLocId(lotNum, qty, locationId, orderNo, sku));
+        }
+
+        List<WmsDocOrderDetails> wmsDocOrderDetailsList = wmsDocOrderDetailsService.queryWmsDocOrderDetailsByOrderNo(orderNo);
+        //筛选出相同sku并且数量未分配或未分配完的明细信息
+        List<WmsDocOrderDetails> wmsDocOrderDetailsFilterList = wmsDocOrderDetailsList.stream().filter(item -> CompareUtil.compare(item.getSku(), sku) == 0 &&
+                CompareUtil.compare(item.getQtyOrdered().subtract(item.getQtyAllocated()), BigDecimal.ZERO) > 0).collect(Collectors.toList());
+        for (WmsDocOrderDetails wmsDocOrderDetails : wmsDocOrderDetailsFilterList) {
+            //明细已分配数量
+            BigDecimal wmsDocOrderDetailsQtyAllocated = ObjectUtil.isNotNull(wmsDocOrderDetails.getQtyAllocated()) ? wmsDocOrderDetails.getQtyAllocated() : BigDecimal.ZERO;
+            //剩余需分配数量
+            BigDecimal wmsDocOrderDetailsQty = wmsDocOrderDetails.getQtyOrdered().subtract(wmsDocOrderDetailsQtyAllocated);
+            BigDecimal remainQty = qty.subtract(wmsDocOrderDetailsQty);
+            Boolean flag = CompareUtil.compare(remainQty, BigDecimal.ZERO) < 0;
+            wmsDocOrderDetails.setQtyAllocated(flag ? qty : wmsDocOrderDetailsQty);
+            wmsDocOrderDetails.setQtyAllocatedEach(wmsDocOrderDetails.getQtyAllocated());
+            wmsDocOrderDetails.setLineStatus(flag ? Constant.ORDER_STS.STS10.getValue() : Constant.ORDER_STS.STS20.getValue());
+            wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(wmsDocOrderDetails);
+            //生成分配明细
+            actAllocationDetailsService.addActAllocationDetails(lotNum, locationId, qty, wmsDocOrderDetails
+                    , wmsDocOrderDetails.getLineStatus());
+            // 记录扫码数据
+            erpBarcodesService.recordErpBarcodeListSo(wmsDocOrderDetails, sn
+                    , "SORTATION01", palletNoTo, BigDecimal.ONE, boxNo);
+            qty = remainQty;
+            if (flag || CompareUtil.compare(qty, BigDecimal.ZERO) == 0) break;
+        }
+        // 更新托盘
+        wmsBoxInfoService.updateWmsBoxLocationIdByBoxNo(boxNo, Long.parseLong(locationId));
+        return AjaxResult.success("当前托盘备货成功！");
+    }
+
+    private InvLotLocId buildInvLotLocId(String lotNum, BigDecimal qty, String locationId, String traceId, String sku){
+        InvLotLocId invLotLocId = new InvLotLocId();
+        invLotLocId.setLotnum(lotNum);
+        invLotLocId.setTraceid(traceId);
+        invLotLocId.setLocationId(locationId);
+        invLotLocId.setCustomerId(Constant.CUSTOMER_ID);
+        invLotLocId.setSku(sku);
+        invLotLocId.setQty(qty);
+        invLotLocId.setQtyEach(qty);
+        invLotLocId.setQtyallocated(BigDecimal.ZERO);
+        invLotLocId.setQtyallocatedEach(BigDecimal.ZERO);
+        return invLotLocId;
+    }
+
+    private InvLotAtt buildInvLotAtt(String lotNum, String palletNoTo, String orderNo, String sn, String sku){
+        InvLotAtt invLotAtt = new InvLotAtt();
+        invLotAtt.setLotnum(lotNum);
+        invLotAtt.setLotatt07(palletNoTo);
+        invLotAtt.setLotatt14(orderNo); // 备货对应的出库单号
+        invLotAtt.setLotatt02(sn);
+        invLotAtt.setSku(sku);
+        invLotAtt.setCustomerId(Constant.CUSTOMER_ID);
+        invLotAtt.setCreateTime(DateUtils.getNowDate());
+        return invLotAtt;
+    }
+    /**
+     * 验证出库单
+     * @param orderNo
+     */
+    private void verifyWmsDocOrder(String orderNo) {
+        WmsDocOrderHeader header = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(orderNo);
+        if (ObjectUtil.isNull(header)) throw new BaseException("查无此出库单数据" + orderNo);
+        if (!header.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())) {
+            throw new BaseException("出库单类型不可备货组盘！");
+        }
+        if (!header.getOrderStatus().equals(Constant.ORDER_STS.STS10.getValue())
+                && !header.getOrderStatus().equals(Constant.ORDER_STS.STS20.getValue())
+                && !header.getOrderStatus().equals(Constant.ORDER_STS.STS22.getValue())) {
+            throw new BaseException("出库单状态不可备货组盘！");
+        }
+    }
+
+
     /**
      * 库存分配
      * @param orderList
      * @return
      */
     @Override
+    @Transactional
     public Boolean inventoryMatch(List<String> orderList) {
         //根据erp单号获取出库单头列表
         List<WmsDocOrderHeader> wmsDocOrderHeaderList = wmsDocOrderHeaderMapper.selectList(Wrappers.<WmsDocOrderHeader>lambdaQuery().in(WmsDocOrderHeader::getSoReference1, orderList).orderByDesc(WmsDocOrderHeader::getCreateTime));
@@ -2751,9 +2864,9 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         List<WmsDocOrderHeader> wmsDocOrderHeaderFilterList = wmsDocOrderHeaderList.stream().filter(item -> item.getOrderStatus().equals(Constant.ORDER_STS.STS00.getValue())
                 || item.getOrderStatus().equals(Constant.ORDER_STS.STS10.getValue()) || item.getOrderStatus().equals(Constant.ORDER_STS.STS22.getValue())).collect(Collectors.toList());
         if (CollectionUtil.isEmpty(wmsDocOrderHeaderFilterList)){
-            throw new BaseException("出库单状态不可分配！");
+            throw new BaseException("出库单状态不可进行库存匹配！");
         }
-        List<WmsDocOrderDetails> wmsDocOrderDetailsList = wmsDocOrderDetailsService.queryWmsDocOrderDetailsByOrderNoList(wmsDocOrderHeaderFilterList.stream().filter(item -> StringUtils.isNotBlank(item.getOrderNo())).map(WmsDocOrderHeader::getOrderNo).collect(Collectors.toList()));
+        List<WmsDocOrderDetails> wmsDocOrderDetailsList = wmsDocOrderDetailsService.queryWmsDocOrderDetailsByOrderNo(wmsDocOrderHeaderFilterList.stream().filter(item -> StringUtils.isNotBlank(item.getOrderNo())).map(WmsDocOrderHeader::getOrderNo).collect(Collectors.toList()));
         if (CollectionUtil.isEmpty(wmsDocOrderDetailsList)){
             throw new BaseException("出库单明细为空！");
         }

warewms-base/src/main/java/com/ruoyi/base/mapper/CodeSkuRelationshipMapper.java

@@ -1,9 +1,9 @@
 package com.ruoyi.base.mapper;
 
-import java.util.List;
 import com.ruoyi.base.domain.CodeSkuRelationship;
 import com.ruoyi.base.domain.vo.CodeSkuRelationshipVO;
-import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 条码品号关系表Mapper接口
@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Param;
  * @author andy
  * @date 2022-11-07
  */
-public interface CodeSkuRelationshipMapper 
+public interface CodeSkuRelationshipMapper
 {
     /**
      * 查询条码品号关系表