永湖bug修复

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -375,6 +375,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
                         attQuery.setLotatt08(stockForm.getAsnNo().toString());
 //                        attQuery.setLotatt14(stockForm.getOrderNo());
                         List<InvLotLocIdLotattVO> samePalletInvList = invLotLocIdMapper.queryInvLotattByInvLotatt(attQuery);
+
                         if (samePalletInvList != null && samePalletInvList.size() > 0) {
                             for (InvLotLocIdLotattVO locIdLotattVO : samePalletInvList) {
                                 if (locIdLotattVO.getLotatt07().equals(stockForm.getPalletNo())) {

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

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

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

@@ -1,5 +1,6 @@
 package com.ruoyi.ams.inv.service;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -83,6 +84,13 @@ public interface IInvLotAttService
      */
     Map<String, List<InvLotAttPalletTotalDTO>> buildInvLotAttPalletTotalMap(List<String> skuList);
 
+    /**
+     * 获取托盘产品数量
+     * @param palletNo
+     * @return
+     */
+    BigDecimal queryPalletTotal(String palletNo);
+
     /**
      * 新增批次属性
      *
@@ -91,11 +99,13 @@ public interface IInvLotAttService
      */
     int insertInvLotAtt(InvLotAtt invLotAtt);
 
+    List<InvLotAtt> queryInvLotAtt(String palletNo);
+
     /**
      * 根据sn获取批次信息
      * @param palletNoFrom
      * @param sn
      * @return
      */
-    InvLotAtt queryInvLotAttBySn(String palletNoFrom, String sn);
+    List<InvLotAtt> queryInvLotAtt(String palletNo, String sn);
 }

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

@@ -414,10 +414,10 @@ public interface IInvLotLocIdService {
 
     /**
      * 根据批次lotnum查询对应库存库位信息
-     * @param lotnum
+     * @param lotnumList
      * @return
      */
-    InvLotLocId queryInvLotLocIdByLotnum(String lotnum);
+    List<InvLotLocId> queryInvLotLocIdByLotnum(List<String> lotnumList);
 
     /**
      * 修改库位库存信息

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

@@ -6,10 +6,10 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.ams.inv.domain.InvLotLocId;
 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;
@@ -137,7 +137,7 @@ public class InvLotAttServiceImpl implements IInvLotAttService {
         Map<String, List<InvLotAttPalletTotalDTO>> result = new HashMap<>();
 
         //根据sku对批次分类
-        Map<String, List<InvLotAtt>> skuInvLotAttMap = invLotAttList.stream().collect(Collectors.groupingBy(InvLotAtt::getSku));
+        Map<String, List<InvLotAtt>> skuInvLotAttMap = invLotAttList.stream().filter(item -> StringUtils.isBlank(item.getLotatt14()) && StringUtils.isBlank(item.getLotatt15())).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));
@@ -146,7 +146,7 @@ public class InvLotAttServiceImpl implements IInvLotAttService {
                 InvLotAttPalletTotalDTO invLotAttPalletTotalDTO = new InvLotAttPalletTotalDTO();
                 invLotAttPalletTotalDTO.setSku(key);
                 invLotAttPalletTotalDTO.setPalletNo(item.getKey());
-                invLotAttPalletTotalDTO.setTotalQty(item.getValue().stream().map(invLotAtt -> lotNumQtyMap.get(invLotAtt.getLotnum()).getSurplusQty()).reduce(BigDecimal.ZERO, BigDecimal::add));
+                invLotAttPalletTotalDTO.setTotalQty(item.getValue().stream().map(invLotAtt -> lotNumQtyMap.get(invLotAtt.getLotnum()).getSurplusQty()).reduce(BigDecimal.ZERO, BigDecimal::add).toString());
                 invLotAttPalletTotalDTO.setLocationId(lotNumQtyMap.get(item.getValue().stream().map(InvLotAtt::getLotnum).findFirst().orElseGet(() -> null)).getLocationId());
                 return invLotAttPalletTotalDTO;
             }).sorted(Comparator.comparing(InvLotAttPalletTotalDTO::getTotalQty)).collect(Collectors.toList());
@@ -156,6 +156,18 @@ public class InvLotAttServiceImpl implements IInvLotAttService {
         return result;
     }
 
+    /**
+     * 获取托盘产品数量
+     * @param palletNo
+     * @return
+     */
+    @Override
+    public BigDecimal queryPalletTotal(String palletNo){
+        List<InvLotAtt> invLotAttList = queryInvLotAtt(palletNo);
+        List<InvLotLocId> invLotLocIdList = invLotLocIdService.queryInvLotLocIdByLotnum(invLotAttList.stream().map(InvLotAtt::getLotnum).collect(Collectors.toList()));
+        return invLotLocIdList.stream().map(InvLotLocId::getQty).reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
+
     /**
      * 新增批次属性
      *
@@ -166,13 +178,24 @@ public class InvLotAttServiceImpl implements IInvLotAttService {
     public int insertInvLotAtt(InvLotAtt invLotAtt){return invLotAttMapper.insertInvLotAtt(invLotAtt);}
 
     /**
-     * 根据条码获取批次信息
+     * 根据托盘获取批次信息
+     * @param palletNo
+     * @return
+     */
+    @Override
+    public List<InvLotAtt> queryInvLotAtt(String palletNo){
+        return queryInvLotAtt(palletNo, null);
+    }
+
+
+    /**
+     * 根据条码获取批次信息(退货情况下可能会有多批次信息)
      * @param sn
      * @return
      */
     @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));
+    public List<InvLotAtt> queryInvLotAtt(String palletNo, String sn){
+        return invLotAttMapper.selectList(Wrappers.<InvLotAtt>lambdaQuery().eq(StringUtils.isNotBlank(sn), InvLotAtt::getLotatt02, sn).eq(InvLotAtt::getLotatt07, palletNo));
     }
 
     private List<InvLotAtt> queryInvLotAttByLotNumList(List<String> lotNumList){

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

@@ -973,11 +973,11 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
                 lotatt15Null = false;
             }
         }
-        if (lotatt15Null) {
-            // 说明是移库，直接删除库存
-            return AjaxResult.error("移库暂时不支持释放！");
-//            return invLotLocIdService.clear(baseLocationInfo.getId().toString(), Constant.WAREHOUSE_ID, "PDA");
-        }
+//        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");
@@ -1131,12 +1131,12 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
 
     /**
      * 根据批次lotnum查询对应库存库位信息
-     * @param lotnum
+     * @param lotnumList
      * @return
      */
     @Override
-    public InvLotLocId queryInvLotLocIdByLotnum(String lotnum){
-        return invLotLocIdMapper.selectOne(Wrappers.<InvLotLocId>lambdaQuery().eq(InvLotLocId::getLotnum, lotnum).last(Constants.LAST_SQL));
+    public List<InvLotLocId> queryInvLotLocIdByLotnum(List<String> lotnumList){
+        return invLotLocIdMapper.selectList(Wrappers.<InvLotLocId>lambdaQuery().in(InvLotLocId::getLotnum, lotnumList));
     }
 
     /**

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

@@ -1319,6 +1319,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         WmsBoxInfo wmsBoxInfo = wmsBoxInfoService.selectWmsBoxInfoByBoxNo(groupDiskFrom.getBoxNo());
         Optional.ofNullable(wmsBoxInfo).orElseThrow(() -> new BaseException("托盘不存在！"));
         if (Constants.YES.equals(wmsBoxInfo.getIsFull())) return AjaxResult.error("该托盘已满托！");
+        verifyInvLotAndGetLocationId(groupDiskFrom.getPalletNoTo(), null, groupDiskFrom.getOrderNo());
         return AjaxResult.success();
     }
 
@@ -2764,13 +2765,22 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         if (CollectionUtil.isEmpty(wmsDocOrderDetailsMatchSkuList)){
             throw new BaseException("出库明细未绑定此类产品！");
         }
+        //筛选出相同sku并且数量未分配或未分配完的明细信息
+        List<WmsDocOrderDetails> wmsDocOrderDetailsFilterList = wmsDocOrderDetailsMatchSkuList.stream().filter(item -> CompareUtil.compare(item.getQtyOrdered().subtract(item.getQtyAllocated()), BigDecimal.ZERO) > 0).collect(Collectors.toList());
+        if (CollectionUtil.isEmpty(wmsDocOrderDetailsFilterList)){
+            throw new BaseException("出库单该产品已备货完成！");
+        }
 
+        //验证托盘相关信息并获取指向托盘库位信息
+        String locationId = verifyInvLotAndGetLocationId(palletNoTo, sn, orderNo);
+
+        List<InvLotAtt> invLotAttList = invLotAttService.queryInvLotAtt(palletNoFrom, sn);
+        List<InvLotLocId> invLotLocIdList = invLotLocIdService.queryInvLotLocIdByLotnum(invLotAttList.stream().map(InvLotAtt::getLotnum).collect(Collectors.toList()));
         //创建新批次
         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();
+        InvLotLocId invLotLocId = invLotLocIdList.stream().findFirst().orElseThrow(() -> new BaseException("库位库存信息丢失！"));
+        String asnNo = invLotAttList.stream().filter(item -> item.getLotnum().equals(invLotLocId.getLotnum())).map(InvLotAtt::getLotatt08).findFirst().orElseThrow(() -> new BaseException("此批次入库信息丢失！"));
+        invLotAttService.insertInvLotAtt(buildInvLotAtt(lotNum, palletNoTo, orderNo, sn, sku, asnNo));
         BigDecimal qtyAllocated = ObjectUtil.isNotNull(invLotLocId.getQtyallocated()) ? invLotLocId.getQtyallocated() : BigDecimal.ZERO;
         BigDecimal invLotLocQty = invLotLocId.getQty().subtract(qtyAllocated);
         if (CompareUtil.compare(qty, invLotLocQty) >= 0) {
@@ -2783,16 +2793,15 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             invLotLocIdService.insertInvLotLocId(buildInvLotLocId(lotNum, qty, locationId, orderNo, sku));
         }
 
-
-        //筛选出相同sku并且数量未分配或未分配完的明细信息
-        List<WmsDocOrderDetails> wmsDocOrderDetailsFilterList = wmsDocOrderDetailsMatchSkuList.stream().filter(item -> 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 ? wmsDocOrderDetailsQtyAllocated.add(qty) : wmsDocOrderDetails.getQtyOrdered());
             wmsDocOrderDetails.setQtyAllocatedEach(wmsDocOrderDetails.getQtyAllocated());
             wmsDocOrderDetails.setLineStatus(flag ? Constant.ORDER_STS.STS10.getValue() : Constant.ORDER_STS.STS20.getValue());
@@ -2812,7 +2821,22 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         List<WmsDocOrderDetails> docOrderDetailsList = wmsDocOrderDetailsByOrderNo.stream().filter(item -> CompareUtil.compare(item.getLineStatus(), Constant.ORDER_STS.STS20.getValue()) != 0).collect(Collectors.toList());
         wmsDocOrderHeaderMapper.update(new WmsDocOrderHeader(), Wrappers.<WmsDocOrderHeader>lambdaUpdate()
                 .set(WmsDocOrderHeader::getOrderStatus, CollectionUtil.isNotEmpty(docOrderDetailsList) ? Constant.ORDER_STS.STS22.getValue() : Constant.ORDER_STS.STS23.getValue()).eq(WmsDocOrderHeader::getOrderNo, orderNo));
-        return AjaxResult.success("当前托盘备货成功！");
+        return AjaxResult.success("当前托盘备货成功！托盘数量： " + invLotAttService.queryPalletTotal(palletNoTo));
+    }
+
+    private String verifyInvLotAndGetLocationId(String palletNoTo, String sn, String orderNo) {
+        List<InvLotAtt> palletNoToInvLotAttList = invLotAttService.queryInvLotAtt(palletNoTo);
+        if (CollectionUtil.isEmpty(palletNoToInvLotAttList)) return null;
+        if (StringUtils.isNotBlank(sn) && CollectionUtil.isNotEmpty(palletNoToInvLotAttList.stream().filter(item -> StringUtils.isBlank(item.getLotatt08()) && item.getLotatt02().equals(sn)).collect(Collectors.toList()))) {
+            throw new BaseException("该条码已生成批次");
+        }
+        //验证是否已经有不同出库单备货了
+        List<InvLotLocId> invLotLocIdList = invLotLocIdService.queryInvLotLocIdByLotnum(palletNoToInvLotAttList.stream().map(InvLotAtt::getLotnum).collect(Collectors.toList()));
+        if (CollectionUtil.isEmpty(invLotLocIdList)) return null;
+        List<InvLotAtt> invLotAttList = palletNoToInvLotAttList.stream().filter(item -> invLotLocIdList.stream().map(InvLotLocId::getLotnum).collect(Collectors.toList()).contains(item.getLotnum())).collect(Collectors.toList());
+        List<InvLotAtt> invLotAttFilterList = invLotAttList.stream().filter(item -> StringUtils.isNotBlank(item.getLotatt14()) && !item.getLotatt14().equals(orderNo)).collect(Collectors.toList());
+        if (CollectionUtil.isNotEmpty(invLotAttFilterList)) throw new BaseException("该托盘已备货其他出库单: " + invLotAttFilterList.stream().map(InvLotAtt::getLotatt14).collect(Collectors.joining(",")));
+        return invLotLocIdList.stream().map(InvLotLocId::getLocationId).findFirst().orElseThrow(() -> new BaseException("指向托盘库位信息丢失！"));
     }
 
     private InvLotLocId buildInvLotLocId(String lotNum, BigDecimal qty, String locationId, String traceId, String sku) {
@@ -2821,7 +2845,6 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         invLotLocId.setTraceid(traceId);
         invLotLocId.setLocationId(locationId);
         invLotLocId.setCustomerId(Constant.CUSTOMER_ID);
-
         invLotLocId.setSku(sku);
         invLotLocId.setQty(qty);
         invLotLocId.setQtyEach(qty);
@@ -2830,14 +2853,15 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         return invLotLocId;
     }
 
-    private InvLotAtt buildInvLotAtt(String lotNum, String palletNoTo, String orderNo, String sn, String sku) {
+    private InvLotAtt buildInvLotAtt(String lotNum, String palletNoTo, String orderNo, String sn, String sku, String asnNo) {
         InvLotAtt invLotAtt = new InvLotAtt();
         invLotAtt.setLotnum(lotNum);
+        invLotAtt.setCustomerId(Constant.CUSTOMER_ID);
+        invLotAtt.setSku(sku);
+        invLotAtt.setLotatt02(sn);
         invLotAtt.setLotatt07(palletNoTo);
+        invLotAtt.setLotatt08(asnNo);
         invLotAtt.setLotatt14(orderNo); // 备货对应的出库单号
-        invLotAtt.setLotatt02(sn);
-        invLotAtt.setSku(sku);
-        invLotAtt.setCustomerId(Constant.CUSTOMER_ID);
         invLotAtt.setCreateTime(DateUtils.getNowDate());
         return invLotAtt;
     }
@@ -2863,7 +2887,8 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     /**
      * 库存分配
      *
-     * @param orderNos
+     * @param
+     * orderNos
      * @return
      */
     @Override
@@ -2907,16 +2932,17 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             if (CompareUtil.compare(total, BigDecimal.ZERO) <= 0) continue;
             List<InvLotAttPalletTotalDTO> invLotAttPalletTotalDTOList = invLotAttPalletTotalMap.get(wmsDocOrderDetailsGroupBySkuMapEntry.getKey());
             if (CollectionUtil.isEmpty(invLotAttPalletTotalDTOList)) continue;
-            List<InvLotAttPalletTotalDTO> invLotAttPalletTotalList = new ArrayList<>();
             if (CollectionUtil.isNotEmpty(palletMatchLogList)){
-                invLotAttPalletTotalList = invLotAttPalletTotalDTOList.stream().filter(item -> !palletMatchLogList.stream().map(palletMatchLog -> palletMatchLog.getPalletNo()).collect(Collectors.toList()).contains(item.getPalletNo())).collect(Collectors.toList());
-            }
-            if (CollectionUtil.isEmpty(invLotAttPalletTotalList)) {
-                result.addAll(invLotAttPalletTotalDTOList);
-                continue;
+                List<InvLotAttPalletTotalDTO> invLotAttPalletTotalList = invLotAttPalletTotalDTOList.stream().filter(item -> !palletMatchLogList.stream().map(palletMatchLog -> palletMatchLog.getPalletNo()).collect(Collectors.toList()).contains(item.getPalletNo())).collect(Collectors.toList());
+                if (CollectionUtil.isEmpty(invLotAttPalletTotalList)) {
+                    result.addAll(invLotAttPalletTotalDTOList);
+                    continue;
+                }
+                invLotAttPalletTotalDTOList = invLotAttPalletTotalList;
             }
-            for (InvLotAttPalletTotalDTO invLotAttPalletTotalDTO : invLotAttPalletTotalList) {
-                BigDecimal palletTotal = invLotAttPalletTotalDTO.getTotalQty();
+
+            for (InvLotAttPalletTotalDTO invLotAttPalletTotalDTO : invLotAttPalletTotalDTOList) {
+                BigDecimal palletTotal = new BigDecimal(invLotAttPalletTotalDTO.getTotalQty());
                 if (CompareUtil.compare(total, palletTotal) <= 0) {
                     result.add(invLotAttPalletTotalDTO);
                     break;
@@ -2940,7 +2966,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             BaseLocationInfo locationInfo = baseLocationInfoList.stream().filter(baseLocationInfo -> baseLocationInfo.getId().equals(Long.parseLong(item.getLocationId()))).findFirst().orElseThrow(() -> new BaseException("库位信息有误"));
             palletMatchLogDTO.setLocationNo(locationInfo.getLocationNo());
             return palletMatchLogDTO;
-        }).collect(Collectors.toList());
+        }).collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(PalletMatchLogDTO::getPalletNo))), ArrayList::new));
     }
 
     private List<PalletMatchLog> buildPalletMatchLogList(List<InvLotAttPalletTotalDTO> invLotAttPalletTotalDTOList, List<String> orderList) {
@@ -2948,7 +2974,6 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         Date createTime = DateUtils.getNowDate();
         return invLotAttPalletTotalDTOList.stream().map(item -> {
             PalletMatchLog palletMatchLog = ConvertUtils.sourceToTarget(item, PalletMatchLog.class);
-            palletMatchLog.setTotalQty(item.getTotalQty().toString());
             palletMatchLog.setCreateTime(createTime);
             palletMatchLog.setOrderNos(orderNos);
             palletMatchLog.setUserdefine1(Constants.NO);