feat:入库时不同的原仓库，物料不能入到同一个托盘内

易文鹏
1 parent aa5f9cb3
Showing 3 changed files with 31 additions and 0 deletions
src/main/java/com/huaheng/framework/config/ShiroConfig.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
@@ -274,6 +274,15 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/manager/**", "anon");
         filterChainDefinitionMap.put("/API/WMS/v2/**", "anon");
         filterChainDefinitionMap.put("/mobile/receipt/batch/**", "anon");
+
+        //todo pda出入库查询，测试后注释
+        filterChainDefinitionMap.put("/receipt/receiptHeader/listPda", "anon");
+        filterChainDefinitionMap.put("/receipt/receiptDetail/list", "anon");
+        filterChainDefinitionMap.put("/task/taskHeader/getTaskByTaskId", "anon");
+        filterChainDefinitionMap.put("/task/taskHeader/getTaskByShipmentCode", "anon");
+        filterChainDefinitionMap.put("/mobile/inventory/completeTaskListByWMS", "anon");
+
+
         // 系统权限列表
 //        filterChainDefinitionMap.putAll(SpringUtils.getBean(IMenuService.class).selectPermsAll());
@@ -107,6 +107,9 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             return AjaxResult.error("不允许超收");
         }
+        //入库时不同的原仓库，物料不能入到同一个托盘内
+        checkWarehouse(receiptCode, containerCode);
+
         //检查容器编码合法性
         Integer taskType = checkContainer(containerCode, detail.getMaterialCode());
         if (taskType == 1) {
@@ -232,6 +235,20 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         return ajaxResult;
     }
+    //入库时不同的原仓库，物料不能入到同一个托盘内
+    private void checkWarehouse(String receiptCode, String containerCode) {
+        String warehouse = receiptHeaderService.getReceiptHeaderByCode(receiptCode).getWarehouse();
+        if (StringUtils.isNotBlank(warehouse)) {
+            List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(new LambdaQueryWrapper<InventoryDetail>().eq(InventoryDetail::getContainerCode, containerCode));
+            if (!inventoryDetailList.isEmpty()) {
+                String inventoryDetailWarehouse = inventoryDetailList.get(0).getWarehouse();
+                if (!inventoryDetailWarehouse.equals(warehouse)) {
+                    throw new ServiceException("入库时不同的原仓库：" + receiptCode + "，物料不能入到同一个托盘内：" + inventoryDetailWarehouse);
+                }
+            }
+        }
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public AjaxResult flatSaveContainer(String receiptCode, Integer receiptDetailId, String locationType, BigDecimal qty) {
@@ -67,6 +67,11 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
     @Resource
     private InventoryTransactionService inventoryTransactionService;
+
+    public ReceiptHeader getReceiptHeaderByCode(String receiptCode) {
+        return getOne(new LambdaQueryWrapper<ReceiptHeader>().eq(ReceiptHeader::getCode, receiptCode));
+    }
+
     /**
      * 保存入库单
      *