PDA分拣组盘优化

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

@@ -449,7 +449,12 @@ public class PdaController {
         // 可以不传出库单号
         String orderNo = wmsDocOrderHeaderService.changeErpNoToOrderNo(groupDiskFrom.getOrderNo());
         groupDiskFrom.setOrderNo(orderNo);
-        return wmsDocOrderHeaderService.groupDisk(groupDiskFrom);
+        if (StringUtils.isEmpty(orderNo)) {
+            return wmsDocOrderHeaderService.groupDisk(groupDiskFrom);
+        } else {
+            // 备货组盘
+            return wmsDocOrderHeaderService.groupDiskBH(groupDiskFrom);
+        }
     }
 
     /**

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

@@ -332,6 +332,13 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             totalQty = BigDecimal.ONE;
         }
 
+        //验证码盘库存,一个托盘只能备货一个出库单
+        AjaxResult ajaxResult = invLotLocIdService.checkPalletIsOnlyOrderNo(stockForm.getPalletNo()
+                , StringUtils.isEmpty(stockForm.getOrderNo()) ? "" : stockForm.getOrderNo());
+        if (!ajaxResult.isSuccess()) {
+            return ajaxResult;
+        }
+
         // 匹配出库单 计算备货数量是否已经超出出库单可分配数量
         if (stockForm.getStockTag().equals("Y")) {
             //查询出库单
@@ -341,11 +348,6 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
                     || wmsDocOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS23.getValue())) {
                 return AjaxResult.error("出库单已完成,不可备货！");
             }
-            //每个托盘只允许码一个出库单
-            AjaxResult ajaxResult = invLotLocIdService.checkPalletIsOnlyOrderNo(stockForm.getPalletNo(), wmsDocOrderHeader.getOrderNo());
-            if (!ajaxResult.isSuccess()) {
-                return ajaxResult;
-            }
 
             orderDetails = wmsDocOrderHeader.getWmsDocOrderDetailsList();
 

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

@@ -343,11 +343,11 @@ public interface IInvLotLocIdService {
     /**
      * 备货组盘的时候，一个托盘只能备货一个出库单
      *
-     * @param palletNo
+     * @param palletNoTo
      * @param orderNo
      * @return false代表托盘上已经备货了出库单
      */
-    AjaxResult checkPalletIsOnlyOrderNo(String palletNo,String orderNo);
+    AjaxResult checkPalletIsOnlyOrderNo(String palletNoTo,String orderNo);
 
     /**
      * 清空库存lotatt15（分配出库单号）根据托盘号

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

@@ -827,19 +827,23 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
     }
 
     @Override
-    public AjaxResult checkPalletIsOnlyOrderNo(String palletNo, String orderNo) {
+    public AjaxResult checkPalletIsOnlyOrderNo(String palletNoTo, String orderNo) {
         InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();
-        invLocIdSearchFrom.setLotatt07(palletNo);
+        invLocIdSearchFrom.setLotatt07(palletNoTo);
         List<InvLotLocIdLotattVO> invLotLocIdLotattVOS = invLotLocIdService.selectInvLocIdLotattList(invLocIdSearchFrom);
         if(invLotLocIdLotattVOS.size() == 0){
             return AjaxResult.success();
         }
         for (InvLotLocIdLotattVO invLotLocIdLotattVO : invLotLocIdLotattVOS) {
-            String lotatt14 = StringUtils.isEmpty(invLotLocIdLotattVO.getLotatt14())?"":invLotLocIdLotattVO.getLotatt14();
-            if (!lotatt14.equals(orderNo) || StringUtils.isEmpty(lotatt14)) {
-                return AjaxResult.error("托盘已经存在不是此出库单备货的库存！");
+                String lotatt14 = StringUtils.isEmpty(invLotLocIdLotattVO.getLotatt14())?"":invLotLocIdLotattVO.getLotatt14();
+                if (!lotatt14.equals(orderNo)) {
+                    if(StringUtils.isNotEmpty(orderNo)) {
+                        return AjaxResult.error("托盘已经存在不是此出库单备货的库存！");
+                    }else {
+                        return AjaxResult.error("托盘已经存在备货的库存！");
+                    }
+                }
             }
-        }
         return AjaxResult.success();
     }
 

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

@@ -209,13 +209,19 @@ public interface IWmsDocOrderHeaderService {
 
     /**
      * 组盘
-     * 备货和库内理货都没有出库，所以不需要修改拣货
      *
      * @param groupDiskFrom
      * @return
      */
     AjaxResult groupDisk(GroupDiskFrom groupDiskFrom);
 
+    /**
+     * 组盘（备货）
+     * @param groupDiskFrom
+     * @return
+     */
+    AjaxResult groupDiskBH(GroupDiskFrom groupDiskFrom);
+
     /**
      * 理货
      *

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

@@ -865,6 +865,226 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     @Transactional
     @Override
     public AjaxResult groupDisk(GroupDiskFrom groupDiskFrom) {
+        String palletNoFrom = groupDiskFrom.getPalletNoFrom(); // 起始托盘
+        String palletNoTo = groupDiskFrom.getPalletNoTo(); // 目标托盘
+        String sn = groupDiskFrom.getSn(); // 条码号
+        String sku = ""; // 物料编码
+        Double qty = Double.valueOf(groupDiskFrom.getQty()); // 数量
+        boolean isAllUpdate = false; // 库存转移类型，是全部修改，还是拆分
+        int type = 0; // 组盘类型
+        final Double toQty;
+        // 根据条码获取物料号
+        CodeSkuRelationshipVO codeSkuRelationshipVO = codeSkuRelationshipService.checkIsProduct(sn);
+        sku = codeSkuRelationshipVO.getSku();
+        if (codeSkuRelationshipVO.isProduct()) {
+            qty = 1.0; //产品默认为1
+        }
+        toQty = qty;
+        // 根据起始托盘，条码号查出库存
+        InvLocIdSearchFrom locIdSearchFrom = new InvLocIdSearchFrom();
+        locIdSearchFrom.setSku(sku);
+        LotattDTO lotattDTO = new LotattDTO();
+        lotattDTO.setLotatt07(palletNoFrom);
+        lotattDTO.setLotatt02(sn);
+        locIdSearchFrom.setLotattDTO(lotattDTO);
+        List<InvLotLocIdLotattVO> invLotLocIdLotattList = invLotLocIdService.selectInvLocIdLotattList(locIdSearchFrom);
+        // 组盘是把出库的库存重新组到一个新的托盘上，所以起始托盘和条码理应可以查询到系统里有对应的库存。
+        if (invLotLocIdLotattList.size() == 0) {
+            return AjaxResult.error(String.format("不存在对应库存！起始托盘：%s，条码：%s", palletNoFrom, sn));
+        }
+        // 产品的话基本只能查出有一条库存 但是物料可能会多条 但是我们只处理一条库存
+        List<InvLotLocIdLotattVO> invLotLocIdLotattVOList = new ArrayList<>();
+        InvLotLocIdLotattVO endLotattVO = null;
+        List<InvLotLocIdLotattVO> equalInv = invLotLocIdLotattList.stream().filter(v -> v.getQty().compareTo(toQty) == 0).collect(Collectors.toList());
+        if (equalInv.size() > 0) {
+            endLotattVO = equalInv.get(0);
+            isAllUpdate = true;
+        } else {
+            List<InvLotLocIdLotattVO> greaterInv = invLotLocIdLotattList.stream().filter(v -> v.getQty().compareTo(toQty) == 1).collect(Collectors.toList());
+            if (greaterInv.size() > 0) {
+                endLotattVO = greaterInv.get(0);
+            }
+        }
+        if (endLotattVO == null) {
+            return AjaxResult.error("组盘数量大于单条库存数量！");
+        }
+        invLotLocIdLotattVOList.add(endLotattVO);
+        // 验证扫描产品是否可以组盘
+        AjaxResult ajaxResult = verifyThatDisksCanBeGrouped(endLotattVO);
+        if (!ajaxResult.isSuccess()) {
+            return ajaxResult;
+        }
+        // 判断组盘类型
+        type = judgmentOfGroupPlateType(endLotattVO);
+        // 组盘数量 = 库存数-分配数
+        if (type == 3) {
+           int num = endLotattVO.getQty().intValue() - endLotattVO.getQtyallocated().intValue();
+            if (toQty.intValue() != num) {
+                return AjaxResult.error("备货库存中存在未分配数量，必须先操未分配数：" + num);
+            }
+            endLotattVO.setLotatt14("");
+        }
+        //验证目标托盘库存,一个托盘只能备货一个出库单
+        AjaxResult ajaxResultC = invLotLocIdService.checkPalletIsOnlyOrderNo(groupDiskFrom.getPalletNoTo()
+                , StringUtils.isEmpty(endLotattVO.getLotatt14()) ? "" : endLotattVO.getLotatt14());
+        if (!ajaxResultC.isSuccess()) {
+            return ajaxResult;
+        }
+
+        // 创建Lotnum和库存对应关系
+        Map<String, List<InvLotLocIdLotattVO>> lotnumAndInvLocIdMap = new HashMap<>();
+        invLotLocIdLotattVOList.stream().forEach(v -> {
+            if (lotnumAndInvLocIdMap.get(v) == null) {
+                lotnumAndInvLocIdMap.put(v.getLotnum(), Arrays.asList(v));
+            } else {
+                List<InvLotLocIdLotattVO> locIdLotattVOList = lotnumAndInvLocIdMap.get(v.getLotnum());
+                locIdLotattVOList.add(v);
+                lotnumAndInvLocIdMap.put(v.getLotnum(), locIdLotattVOList);
+            }
+        });
+        // 起始托盘和目标托盘一样，不做操作
+        if (palletNoFrom.equals(palletNoTo)) {
+            return AjaxResult.success("起始和目标托盘一致，不用组盘！");
+        }
+
+        // 根据老Lotnum创建新的Lotnum
+        for (Map.Entry<String, List<InvLotLocIdLotattVO>> lotnumToInvLocId : lotnumAndInvLocIdMap.entrySet()) {
+            String lotnum = lotnumToInvLocId.getKey();
+            List<InvLotLocIdLotattVO> invLocIdList = lotnumToInvLocId.getValue();
+            InvLotAtt invLotAtt = invLotAttMapper.selectInvLotAttByLotnum(lotnum);
+            String newLotnum = idSequenceUtils.generateId("LOTNUMBER");
+            invLotAtt.setLotnum(newLotnum);
+            invLotAtt.setLotatt07(palletNoTo);
+            if(type == 3) {
+                invLotAtt.setLotatt14("");
+            }
+            invLotAtt.setCreateTime(DateUtils.getNowDate());
+            if (invLotAttMapper.insertInvLotAtt(invLotAtt) > 0) {
+                for (InvLotLocIdLotattVO v : invLocIdList) {
+                    if (isAllUpdate) {
+                        InvLotLocIdForm invLotLocIdUpdate = new InvLotLocIdForm();
+                        invLotLocIdUpdate.setLotnum(lotnum);
+                        invLotLocIdUpdate.setLocationId(v.getLocationId().toString());
+                        invLotLocIdUpdate.setCustomerId(v.getCustomerId());
+                        invLotLocIdUpdate.setSku(v.getSku());
+                        invLotLocIdUpdate.setLotnumTo(newLotnum);
+                        invLotLocIdService.updateInvLotLocId(invLotLocIdUpdate);
+                    } else {
+                        InvLotLocId invLotLocId = invLotLocIdService.selectInvLotLocIdById(v.getLocationId().toString()
+                                , v.getCustomerId(), v.getSku(), v.getLotnum());
+                        // 拆分库存
+                        // 修改原库存
+                        InvLotLocIdForm invLotLocIdUpdate = new InvLotLocIdForm();
+                        invLotLocIdUpdate.setLotnum(v.getLotnum());
+                        invLotLocIdUpdate.setLocationId(v.getLocationId().toString());
+                        invLotLocIdUpdate.setCustomerId(v.getCustomerId());
+                        invLotLocIdUpdate.setSku(v.getSku());
+                        invLotLocIdUpdate.setQty(invLotLocId.getQty().subtract(new BigDecimal(toQty)));
+                        // 插入新库存
+                        InvLotLocId invLotLocIdInsert = invLotLocId;
+                        invLotLocIdInsert.setLotnum(newLotnum);
+                        invLotLocIdInsert.setQty(new BigDecimal(toQty));
+                        invLotLocIdInsert.setQtyEach(invLotLocIdInsert.getQty());
+                        switch (type) {
+                            case 1:
+                            case 4:
+                            case 5:
+                                invLotLocIdInsert.setQtyallocated(BigDecimal.ZERO);
+                                break;
+                            case 2:
+                                invLotLocIdUpdate.setQtyallocated(invLotLocIdUpdate.getQty());
+                                invLotLocIdInsert.setQtyallocated(invLotLocIdInsert.getQty());
+                                break;
+                            case 3:
+                                invLotLocIdUpdate.setQtyallocated(invLotLocIdUpdate.getQty());
+                                invLotLocIdInsert.setQtyallocated(BigDecimal.ZERO);
+                                break;
+                            default:
+                                invLotLocIdInsert.setQtyallocated(BigDecimal.ZERO);
+                                break;
+                        }
+                        invLotLocIdService.updateInvLotLocId(invLotLocIdUpdate);
+                        invLotLocIdService.insertInvLotLocId(invLotLocIdInsert);
+                    }
+
+                }
+
+            }
+        }
+//        WmsBoxInfo boxFrom = wmsBoxInfoService.selectWmsBoxInfoByBoxNo(groupDiskFrom.getPalletNoTo());
+//        boxFrom.setIsFull(groupDiskFrom.getIsFull());
+//        wmsBoxInfoService.updateWmsBoxInfo(boxFrom);
+        return AjaxResult.success("组盘成功！");
+    }
+
+    /**
+     * 组盘类型
+     * （根据lotatt15查询出库单）
+     * 1.备货单，分配数量为0的库存，type=1
+     * 2.理货单，库存为备货库存，type=2
+     * 3.理货单，库存为备货库存，但是库存数不等于分配数type=3（组盘数必须为库存-分配数）
+     * 4.正常出库单，库存分配数为0，type=4
+     * 5.理货单，普通库存，type=5
+     * @param locIdLotattVO
+     * @return
+     */
+    private int judgmentOfGroupPlateType(InvLotLocIdLotattVO locIdLotattVO) {
+        String lotatt15 = locIdLotattVO.getLotatt15();
+        WmsDocOrderHeader wmsDocOrderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(lotatt15);
+        if (wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())
+                && new BigDecimal(locIdLotattVO.getQtyallocated()).compareTo(BigDecimal.ZERO) == 0) {
+           return 1;
+        }
+        if (wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.LH.getValue())
+                && StringUtils.isNotEmpty(locIdLotattVO.getLotatt14())) {
+            return 2;
+        }
+        if (wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())
+                && StringUtils.isNotEmpty(locIdLotattVO.getLotatt14())
+                && new BigDecimal(locIdLotattVO.getQtyallocated()).compareTo(new BigDecimal(locIdLotattVO.getQty())) == 0) {
+            return 3;
+        }
+        if (wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.ZC.getValue())
+                && new BigDecimal(locIdLotattVO.getQtyallocated()).compareTo(BigDecimal.ZERO) == 0) {
+            return 4;
+        }
+        if (wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.LH.getValue())
+                && StringUtils.isEmpty(locIdLotattVO.getLotatt14())) {
+            return 5;
+        }
+        return 0;
+    }
+
+    /**
+     * 验证扫描物料是否可以组盘
+     * （根据lotatt15查询出库单）
+     * 1.备货单并且lotatt14不为空，结束（说明应该走备货组盘）
+     * 2.备货单并且库存分配数大于1，结束（说明应该走备货组盘）
+     * 3.正常出库单库存分配数大于1，结束（说明应该走拣货出库）
+     * @param locIdLotattVO
+     * @return
+     */
+    private AjaxResult verifyThatDisksCanBeGrouped(InvLotLocIdLotattVO locIdLotattVO) {
+        String lotatt15 = locIdLotattVO.getLotatt15();
+        WmsDocOrderHeader wmsDocOrderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(lotatt15);
+        if (wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())
+                && StringUtils.isNotEmpty(locIdLotattVO.getLotatt14())) {
+            return AjaxResult.error("扫描的条码应该属于备货组盘！");
+        }
+        if (wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())
+                && new BigDecimal(locIdLotattVO.getQtyallocated()).compareTo(BigDecimal.ZERO) == 1) {
+            return AjaxResult.error("扫描的条码应该属于备货组盘！先备货组盘！");
+        }
+        if (wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.ZC.getValue())
+                && new BigDecimal(locIdLotattVO.getQtyallocated()).compareTo(BigDecimal.ZERO) == 1) {
+            return AjaxResult.error("扫描的条码应该属于分拣出库！不可组盘！");
+        }
+        return AjaxResult.success();
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult groupDiskBH(GroupDiskFrom groupDiskFrom) {
         String palletNoFrom = groupDiskFrom.getPalletNoFrom(); // 起始托盘
         String palletNoTo = groupDiskFrom.getPalletNoTo(); // 目标托盘
         String sn = groupDiskFrom.getSn(); // 条码号
@@ -952,7 +1172,6 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             } else {
                 invLotAtt.setLotatt14(""); // 备货对应的出库单号
             }
-            invLotAtt.setLotatt15(lotnum); // 老批次
             invLotAtt.setCreateTime(DateUtils.getNowDate());
             if (invLotAttMapper.insertInvLotAtt(invLotAtt) > 0) {
                 for (InvLotLocIdLotattVO v : invLocIdList) {