新变更处理

ruoyi-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: dev
   # 文件上传
   servlet:
     multipart:

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

@@ -1,10 +1,6 @@
 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;
 import com.ruoyi.ams.inv.domain.InvLotLocId;
@@ -12,17 +8,21 @@ import com.ruoyi.ams.inv.domain.form.InvLocIdSearchFrom;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdForm;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.order.domain.ActAllocationDTO;
-import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.base.domain.vo.BaseLocationLotattVO;
 import com.ruoyi.common.core.domain.AjaxResult;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * 库位库存信息Mapper接口
  *
  * @author andy
  * @date 2022-03-03
  */
+@Mapper
 public interface InvLotLocIdMapper extends BaseMapper<InvLotLocId> {
     /**
      * 查询库位库存信息

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

@@ -129,6 +129,8 @@ public interface IInvLotAttService extends CrudService<InvLotAtt, InvLotAttDTO>
      */
     List<InvLotAtt> queryInvLotAtt(String palletNo, String sn, String orderNo);
 
+    List<InvLotAtt> queryInvLotAtt(List<String> palletNoList);
+
     List<InvLotAtt> queryInvLotAttByBarCodeList(String sn);
 
     /**

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

@@ -353,7 +353,7 @@ public interface IInvLotLocIdService extends CrudService<InvLotLocId, InvLotLocI
      * PDA库位移动到分拣区
      * 1，释放的是出库位，移动出库位库存至分拣缓存位
      */
-    AjaxResult releaseLocation(String locationFrom,Long locationTo, Long warehouseId, String updateBy);
+    AjaxResult releaseLocation(String locationFrom,Long locationTo, Long warehouseId, String updateBy, boolean flag);
 
     /**
      * PDA出库位置释放
@@ -441,6 +441,8 @@ public interface IInvLotLocIdService extends CrudService<InvLotLocId, InvLotLocI
      */
     Boolean updateInvLotLocId(String lotNum, BigDecimal qtyAllocated, String sku);
 
+    Boolean updateInvLotLocIdLotNum(String lotNum, String lotNumTo);
+
     Boolean updateInvLotLocIdLotNum(String lotNum, String lotNumTo, String locationId);
 
     /**

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

@@ -28,6 +28,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -141,7 +142,7 @@ public class InvLotAttServiceImpl extends CrudServiceImpl<InvLotAttMapper, InvLo
             return new HashMap<>();
         }
         //构建lotnum -> 库存剩余sku数量 map
-        Map<String, InvLotLocIdSurplusQtyDTO> lotNumQtyMap = invLotLocIdSurplusQtyDTOList.stream().collect(Collectors.toMap(InvLotLocIdSurplusQtyDTO::getLotnum, item -> item));
+        Map<String, InvLotLocIdSurplusQtyDTO> lotNumQtyMap = invLotLocIdSurplusQtyDTOList.stream().collect(Collectors.toMap(InvLotLocIdSurplusQtyDTO::getLotnum, Function.identity()));
         List<InvLotAtt> invLotAttList = queryInvLotAttByLotNumList(invLotLocIdSurplusQtyDTOList.stream().map(InvLotLocIdSurplusQtyDTO::getLotnum).collect(Collectors.toList()));
         if (CollectionUtil.isEmpty(invLotAttList)) {
             return new HashMap<>();
@@ -249,6 +250,17 @@ public class InvLotAttServiceImpl extends CrudServiceImpl<InvLotAttMapper, InvLo
                 .eq(StringUtils.isNotBlank(orderNo), InvLotAtt::getLotatt14, orderNo));
     }
 
+    /**
+     * 根据栈板获取批次信息
+     * @param palletNoList
+     * @return
+     */
+    @Override
+    public List<InvLotAtt> queryInvLotAtt(List<String> palletNoList){
+        return invLotAttMapper.selectList(Wrappers.<InvLotAtt>lambdaQuery()
+                .in(InvLotAtt::getLotatt07, palletNoList));
+    }
+
     /**
      * 根据条码获取批次信息
      * @param sn

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

@@ -24,6 +24,7 @@ import com.ruoyi.ams.inv.dto.InvLotLocIdDTO;
 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.IInvLotAttService;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 import com.ruoyi.ams.order.domain.ActAllocationDTO;
 import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
@@ -81,6 +82,8 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
     @Autowired
     private InvLotAttMapper invLotAttMapper;
     @Autowired
+    private IInvLotAttService invLotAttService;
+    @Autowired
     private IBaseLocationInfoService baseLocationInfoService;
     @Autowired
     private IWmsBoxInfoService iWmsBoxInfoService;
@@ -980,7 +983,7 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
     }
 
     @Override
-    public AjaxResult releaseLocation(String locationFrom, Long locationTo, Long warehouseId, String updateBy) {
+    public AjaxResult releaseLocation(String locationFrom, Long locationTo, Long warehouseId, String updateBy, boolean flag) {
 
         BaseLocationInfo baseLocationInfo = baseLocationInfoService.selectBaseLocationInfoByIdOrNo(locationFrom, Constant.WAREHOUSE_ID);
         if (null == baseLocationInfo) return AjaxResult.error("查无库位信息");
@@ -988,14 +991,25 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
         invLotLocIdQuery.setLocationId(String.valueOf(baseLocationInfo.getId()));
         List<InvLotLocId> invLotLocIdList = selectInvLotLocIdList(invLotLocIdQuery);
 
-        if (BaseLocationZone.ZONE_OUTBOUND == baseLocationInfo.getZoneId().intValue()) {
-            for (InvLotLocId invLotLocId : invLotLocIdList) {
-                invLotLocIdMapper.updateLocation(Long.parseLong(invLotLocId.getLocationId())
-                        , locationTo);
+        if (BaseLocationZone.ZONE_OUTBOUND != baseLocationInfo.getZoneId().intValue()) return AjaxResult.error("出库缓存区的库位才可释放！");
+        for (InvLotLocId invLotLocId : invLotLocIdList) {
+            if (ObjectUtil.equals(Constant.LOC_SORTATION_CACHE, locationTo) && flag){
+                //创建新批次
+                String newLotNum = IdWorker.getIdStr();
+                InvLotAtt invLotAtt = invLotAttService.selectInvLotAttByLotnum(invLotLocId.getLotnum());
+                invLotAtt.setLotnum(newLotNum);
+                invLotAtt.setLotatt07(Constant.VIRTUAL_PALLET);
+                invLotAtt.setCreateTime(DateUtils.getNowDate());
+                invLotAtt.setRemark("invLotAtt insert cause by pda release Location");
+                invLotAttService.insertInvLotAtt(invLotAtt);
+                //修改库存
+                invLotLocIdService.updateInvLotLocIdLotNum(invLotLocId.getLotnum(), newLotNum, String.valueOf(locationTo));
+                continue;
             }
-        } else {
-            return AjaxResult.error("出库缓存区的库位才可释放！");
+            invLotLocIdMapper.updateLocation(Long.parseLong(invLotLocId.getLocationId())
+                    , locationTo);
         }
+
         // 起始库位无货
         baseLocationInfoService.unOccupyLocation(baseLocationInfo.getId(), warehouseId, updateBy);
         // 目标库位有货
@@ -1026,44 +1040,25 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
         }
         // 判断是否是备货库存托盘出库
         boolean con = false;
-        InvLotLocIdLotattVO vo = null;
+        // 判断是否释放到虚拟大栈板
+        boolean flag = true;
         for (InvLotLocIdLotattVO lotLocIdLotattVO : invLotLocIdLotattVOS) {
             // 如果lotatt15为空，并且出库的库存lotatt14不为空，说明是备货完成的托盘
-            if (StringUtils.isEmpty(lotLocIdLotattVO.getLotatt15())
-                    && StringUtils.isNotEmpty(lotLocIdLotattVO.getLotatt14())) {
-                vo = lotLocIdLotattVO;
+            if (StringUtils.isNotEmpty(lotLocIdLotattVO.getLotatt14())) {
                 con = true;
             }
+            if (StringUtils.isNotBlank(lotLocIdLotattVO.getLotatt16()) || StringUtils.isNotBlank(lotLocIdLotattVO.getLotatt17())){
+                flag = false;
+            }
         }
         if (con) {
-//            WmsDocOrderHeader wmsDocOrderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(vo.getLotatt14());
-//            if (!wmsDocOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS23.getValue())
-//                    && !wmsDocOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS98.getValue())
-//                    && !wmsDocOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS99.getValue())) {
-//
-//                return AjaxResult.error("备货单还未备货完成，不可直接出库！" + vo.getLotatt14());
-//            }
-//            return AjaxResult.error("备货库存库位释放请用【PDA备货库位释放】功能");
             // 转移库存到线边区
             return invLotLocIdService.releaseLocation(basLocationForm.getLocationNo(), Constant.LOC_SORTATION02_CACHE
-                    , Constant.WAREHOUSE_ID, "PDA");
+                    , Constant.WAREHOUSE_ID, "PDA", flag);
         }
-        //todo
-       // 如果库存中所有lotatt15都为空 说明是移库
-        boolean lotatt15Null = true;
-        for (InvLotLocIdLotattVO lotLocIdLotattVO : invLotLocIdLotattVOS) {
-            if (StringUtils.isNotEmpty(lotLocIdLotattVO.getLotatt15())) {
-                lotatt15Null = false;
-            }
-        }
-//        if (lotatt15Null) {
-//            // 说明是移库，直接删除库存
-//            return AjaxResult.error("移库暂时不支持释放！");
-////            return invLotLocIdService.clear(baseLocationInfo.getId().toString(), Constant.WAREHOUSE_ID, "PDA");
-//        }
         // 转移库存到出库虚拟区
         return invLotLocIdService.releaseLocation(basLocationForm.getLocationNo(), Constant.LOC_SORTATION_CACHE
-                , Constant.WAREHOUSE_ID, "PDA");
+                , Constant.WAREHOUSE_ID, "PDA", flag);
     }
 
     @Transactional
@@ -1231,7 +1226,8 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
      */
     @Override
     public List<InvLotLocId> queryInvLotLocIdByLotnum(List<String> lotnumList){
-        return queryInvLotLocIdByLotnum(lotnumList, null);
+        return queryInvLotLocIdByLotnum(lotnumList, null).stream().filter(item ->
+                !ObjectUtil.equals(item.getLocationId(), Constant.LOC_SORTATION_CACHE.toString())).collect(Collectors.toList());
     }
 
     /**
@@ -1257,6 +1253,17 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
         return updateInvLotLocId(lotNum, null, null, qtyAllocated, sku, null);
     }
 
+    /**
+     * 修改库位库存主键
+     * @param lotNum
+     * @param lotNumTo
+     * @return
+     */
+    @Override
+    public Boolean updateInvLotLocIdLotNum(String lotNum, String lotNumTo) {
+        return updateInvLotLocIdLotNum(lotNum, lotNumTo, null, null);
+    }
+
     /**
      * 修改库位库存主键以及库位id
      * @param lotNum

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

@@ -3,6 +3,7 @@ package com.ruoyi.ams.order.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.comparator.CompareUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -3010,21 +3011,48 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             throw new BaseException("出库单明细绑定sku为空！");
         }
 
+        Map<String, BigDecimal> skuNeedTotalMap = wmsDocOrderDetailsGroupBySkuMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, item -> {
+            List<WmsDocOrderDetails> docOrderDetailsList = item.getValue();
+            return docOrderDetailsList.stream().map(docOrderDetail -> NumberUtil.sub(docOrderDetail.getQtyOrdered(), docOrderDetail.getQtyAllocated())).reduce(BigDecimal.ZERO, BigDecimal::add);
+        }));
+
         Map<String, List<InvLotAttPalletTotalDTO>> invLotAttPalletTotalMap = invLotAttService.buildInvLotAttPalletTotalMap(ListUtil.toList(wmsDocOrderDetailsGroupBySkuMap.keySet()));
         if (CollectionUtil.isEmpty(invLotAttPalletTotalMap)) {
             throw new BaseException("所选出库单绑定sku无库存！");
         }
+        List<InvLotAttPalletTotalDTO> invLotAttPalletTotalAllList = new ArrayList<>();
+        invLotAttPalletTotalMap.forEach((key, value) -> invLotAttPalletTotalAllList.addAll(value));
         //所需出库托盘
         List<InvLotAttPalletTotalDTO> result = new ArrayList<>();
-        for (Map.Entry<String, List<WmsDocOrderDetails>> wmsDocOrderDetailsGroupBySkuMapEntry : wmsDocOrderDetailsGroupBySkuMap.entrySet()) {
-            //扫描出库单各sku需求总数
-            BigDecimal total = wmsDocOrderDetailsGroupBySkuMapEntry.getValue().stream().filter(item -> ObjectUtil.isNotNull(item.getQtyOrdered())).map(item -> ObjectUtil.isNotNull(item.getQtyAllocated())
-                    ? item.getQtyOrdered().subtract(item.getQtyAllocated()) : item.getQtyOrdered()).reduce(BigDecimal.ZERO, BigDecimal::add);
-            if (CompareUtil.compare(total, BigDecimal.ZERO) <= 0) continue;
-            List<InvLotAttPalletTotalDTO> skuPalletTotalList = invLotAttPalletTotalMap.get(wmsDocOrderDetailsGroupBySkuMapEntry.getKey());
+        //记录sku map
+        Map<String, BigDecimal> skuRemainTotalMap = MapUtil.newConcurrentHashMap(skuNeedTotalMap);
+
+        Map<String, BigDecimal> skuNeedTotalSortMap = new HashMap<>();
+        skuNeedTotalMap.entrySet().stream().sorted((o2, o1) -> o1.getValue().compareTo(o2.getValue()))
+                .forEach(e -> skuNeedTotalSortMap.put(e.getKey(), e.getValue()));
+
+        for (String sku : skuNeedTotalSortMap.keySet()) {
+            List<InvLotAttPalletTotalDTO> skuPalletTotalList = invLotAttPalletTotalMap.get(sku);
             if (CollectionUtil.isEmpty(skuPalletTotalList)) continue;
-            List<InvLotAttPalletTotalDTO> invLotAttPalletTotalList = buildInvLotAttPalletTotalList(skuPalletTotalList, total, palletMatchLogList);
-            result.addAll(invLotAttPalletTotalList);
+
+            for (InvLotAttPalletTotalDTO invLotAttPalletTotalDTO : skuPalletTotalList) {
+                //出库单s 所需该sku总数
+                BigDecimal qty = skuRemainTotalMap.get(sku);
+                if (NumberUtil.equals(qty, BigDecimal.ZERO)) break;
+
+                BigDecimal palletTotal = new BigDecimal(invLotAttPalletTotalDTO.getTotalQty());
+                skuRemainTotalMap.put(sku, CompareUtil.compare(qty, palletTotal) <= 0 ? BigDecimal.ZERO : NumberUtil.sub(qty, palletTotal));
+                result.add(invLotAttPalletTotalDTO);
+                List<InvLotAttPalletTotalDTO> invLotAttPalletTotalDTOList = invLotAttPalletTotalAllList.stream().
+                        filter(item -> item.getPalletNo().equals(invLotAttPalletTotalDTO.getPalletNo())).collect(Collectors.toList());
+                invLotAttPalletTotalDTOList.stream().filter(item ->
+                        skuRemainTotalMap.containsKey(item.getSku())).forEach(item -> {
+                    BigDecimal skuQty = skuRemainTotalMap.get(item.getSku());
+                    skuRemainTotalMap.put(sku, NumberUtil.isLessOrEqual(skuQty, new BigDecimal(item.getTotalQty())) ?
+                            BigDecimal.ZERO : NumberUtil.sub(skuQty, new BigDecimal(item.getTotalQty())));
+                    result.add(item);
+                });
+            }
         }
         return result;
     }

warewms-ams/src/main/java/com/ruoyi/ams/quality/service/impl/QualityInspectionServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.ams.quality.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.ruoyi.ams.inv.domain.InvLotAtt;
 import com.ruoyi.ams.inv.domain.InvLotLocId;
 import com.ruoyi.ams.inv.service.IInvLotAttService;
@@ -15,6 +16,7 @@ import com.ruoyi.ams.quality.service.QualityInspectionService;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.ConvertUtils;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,8 +54,8 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
         Assert.isTrue(CollectionUtil.isNotEmpty(skuList), "物料不能为空！");
         List<InvLotLocId> invLotLocIdList = invLotLocIdService.queryInvLotLocIdBySkuList(skuList);
         Assert.isTrue(CollectionUtil.isNotEmpty(invLotLocIdList), "无该物料编号库存！");
-        List<InvLotAtt> invLotAttList = invLotAttService.queryInvLotAttByLotNumList(invLotLocIdList.stream()
-                .map(InvLotLocId::getLotnum).collect(Collectors.toList()));
+        List<String> lotNumList = invLotLocIdList.stream().map(InvLotLocId::getLotnum).collect(Collectors.toList());
+        List<InvLotAtt> invLotAttList = invLotAttService.queryInvLotAttByLotNumList(lotNumList);
         Map<String, String> lotNumPalletMap = invLotAttList.stream().collect(Collectors.toMap(InvLotAtt::getLotnum, InvLotAtt::getLotatt07));
         List<CheckOutInfoForm> checkOutInfoFormList = invLotLocIdList.stream()
                 .map(item -> {
@@ -64,6 +66,17 @@ public class QualityInspectionServiceImpl implements QualityInspectionService {
                 }).collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
                         new TreeSet<>(Comparator.comparing(CheckOutInfoForm::getPalletNo))), ArrayList::new));
         Assert.isTrue(CollectionUtil.isNotEmpty(checkOutInfoFormList), "托盘信息丢失！");
+        invLotAttList.forEach(item -> {
+            //创建新批次
+            String newLotNum = IdWorker.getIdStr();
+            item.setLotnum(newLotNum);
+            item.setLotatt17(Constant.ORDER_TYP.ZJ.getValue().concat(newLotNum));
+            item.setCreateTime(DateUtils.getNowDate());
+            item.setRemark("invLotAtt insert cause by quality pallet Out Of Warehouse");
+            invLotAttService.insertInvLotAtt(item);
+            //修改库存
+            invLotLocIdService.updateInvLotLocIdLotNum(item.getLotnum(), newLotNum);
+        });
         //下发ams任务 物料拉动
         checkOutInfoFormList.forEach(item -> wmsDocOrderHeaderService.doCheckout(item));
     }

warewms-ams/src/main/java/com/ruoyi/ams/stock/dto/PalletOutOfWarehouseDTO.java

@@ -0,0 +1,14 @@
+package com.ruoyi.ams.stock.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class PalletOutOfWarehouseDTO implements Serializable {
+
+    private List<String> palletNoList;
+
+    private String stockNo;
+}

warewms-ams/src/main/java/com/ruoyi/ams/stock/service/StockTakeRecordService.java

@@ -2,6 +2,7 @@ package com.ruoyi.ams.stock.service;
 
 import com.ruoyi.ams.stock.domain.StockTakeRecord;
 import com.ruoyi.ams.stock.dto.PalletInventoryDetailDTO;
+import com.ruoyi.ams.stock.dto.PalletOutOfWarehouseDTO;
 import com.ruoyi.ams.stock.dto.StockTakeRecordDTO;
 import com.ruoyi.framework.service.CrudService;
 
@@ -18,9 +19,9 @@ public interface StockTakeRecordService extends CrudService<StockTakeRecord, Sto
 
     /**
      * 盘点出库
-     * @param palletNoList
+     * @param palletOutOfWarehouseDTO
      */
-    void palletOutOfWarehouse(List<String> palletNoList);
+    void palletOutOfWarehouse(PalletOutOfWarehouseDTO palletOutOfWarehouseDTO);
 
     /**
      * PDA盘点托盘列表明细

warewms-ams/src/main/java/com/ruoyi/ams/stock/service/impl/StockTakeRecordServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.ams.order.form.CheckOutInfoForm;
 import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
 import com.ruoyi.ams.stock.domain.StockTakeRecord;
 import com.ruoyi.ams.stock.dto.PalletInventoryDetailDTO;
+import com.ruoyi.ams.stock.dto.PalletOutOfWarehouseDTO;
 import com.ruoyi.ams.stock.dto.StockTakeRecordDTO;
 import com.ruoyi.ams.stock.mapper.StockTakeRecordMapper;
 import com.ruoyi.ams.stock.service.StockTakeRecordService;
@@ -70,13 +71,13 @@ public class StockTakeRecordServiceImpl extends CrudServiceImpl<StockTakeRecordM
     /**
      * 盘点出库
      *
-     * @param palletNoList
+     * @param palletOutOfWarehouseDTO
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void palletOutOfWarehouse(List<String> palletNoList) {
-        Assert.isTrue(CollectionUtil.isNotEmpty(palletNoList), "托盘号不能为空！");
-        List<WmsBoxInfo> wmsBoxInfoList = wmsBoxInfoService.queryWmsBoxInfoByPalletNoList(palletNoList);
+    public void palletOutOfWarehouse(PalletOutOfWarehouseDTO palletOutOfWarehouseDTO) {
+        Assert.isTrue(CollectionUtil.isNotEmpty(palletOutOfWarehouseDTO.getPalletNoList()), "托盘号不能为空！");
+        List<WmsBoxInfo> wmsBoxInfoList = wmsBoxInfoService.queryWmsBoxInfoByPalletNoList(palletOutOfWarehouseDTO.getPalletNoList());
         List<CheckOutInfoForm> checkOutInfoFormList = wmsBoxInfoList.stream().filter(item ->
                         //过滤掉托盘号、库位信息丢失托盘信息
                         StringUtils.isNotBlank(item.getBoxNo()) && ObjectUtil.isNotNull(item.getLocationId()))
@@ -87,6 +88,23 @@ public class StockTakeRecordServiceImpl extends CrudServiceImpl<StockTakeRecordM
                     return checkOutInfoForm;
                 }).collect(Collectors.toList());
         Assert.isTrue(CollectionUtil.isNotEmpty(checkOutInfoFormList), "托盘信息丢失！");
+
+        List<InvLotAtt> invLotAttList = invLotAttService.queryInvLotAtt(palletOutOfWarehouseDTO.getPalletNoList());
+        List<InvLotLocId> invLotLocIdList = invLotLocIdService.queryInvLotLocIdByLotnum(invLotAttList.stream().map(InvLotAtt::getLotnum).collect(Collectors.toList()));
+        Assert.isTrue(CollectionUtil.isNotEmpty(invLotLocIdList), "托盘无库存！");
+        List<String> lotNumList = invLotLocIdList.stream().map(InvLotLocId::getLotnum).collect(Collectors.toList());
+        invLotAttList.stream().filter(item -> lotNumList.contains(item.getLotnum())).forEach(item -> {
+            //创建新批次
+            String newLotNum = IdWorker.getIdStr();
+            item.setLotnum(newLotNum);
+            item.setLotatt16(palletOutOfWarehouseDTO.getStockNo());
+            item.setCreateTime(DateUtils.getNowDate());
+            item.setRemark("invLotAtt insert cause by stock pallet Out Of Warehouse");
+            invLotAttService.insertInvLotAtt(item);
+            //修改库存
+            invLotLocIdService.updateInvLotLocIdLotNum(item.getLotnum(), newLotNum);
+        });
+
         //下发ams任务 物料拉动
         checkOutInfoFormList.forEach(item -> wmsDocOrderHeaderService.doCheckout(item));
     }