fix: 库存查询接口调整

pengyongcheng
1 parent 3a44e4c7
Showing 3 changed files with 44 additions and 45 deletions
src/main/java/com/huaheng/api/mes/domain/MaterialDataQuery.java
src/main/java/com/huaheng/api/mes/domain/MesUnUsableQtyData.java
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
@@ -7,11 +7,20 @@ import java.util.List;
  
 @Data
 public class MaterialDataQuery {
+
+    /**
+     * 主工单号：MES那边将orderCode放在物料信息中
+     */
+    private String orderCode;
     /**
      * 物料编码
      */
     private String materialCode;
     /**
+     * 是否原材料，true:是，false:否
+     */
+    private Boolean isMaterial;
+    /**
      * 可用总数量
      */
     private BigDecimal usableQty;
@@ -9,6 +9,11 @@ import java.math.BigDecimal;
  */
 @Data
 public class MesUnUsableQtyData {
+
+    /**
+     * 主工单号
+     */
+    private String orderCode;
     /**
      * 日工单号
      */
@@ -63,6 +63,7 @@ import org.springframework.transaction.annotation.Transactional;
  
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
  
@@ -872,17 +873,16 @@ public class MesServiceImpl implements MesService {
     public AjaxResultMES searchInventory(MesSearch mesSearch) {
         List<MaterialDataQuery> mesSearchMaterialDataList = new ArrayList<>();
         List<MaterialDataQuery> materialDataList = mesSearch.getMaterialDataList();
-        String searchOrderCode = mesSearch.getOrderCode();
-        String searchShipmentReferCode = mesSearch.getShipmentReferCode();
         for (MaterialDataQuery materialData : materialDataList) {
             Material material = materialService.getMaterialByCode(materialData.getMaterialCode(), QuantityConstant.DEFAULT_WAREHOUSE);
             if (material == null) {
-                throw new MesServiceException("根据物料编码" + materialData.getMaterialCode() + "没有找到对应物料信息");
+                throw new MesServiceException(StringUtils.format("根据物料编码：{} 没有找到对应物料信息", materialData.getMaterialCode()));
             }
-
+            // 计算固化时间
             LambdaQueryWrapper<InventoryDetail> inventoryDetailQueryWrapper = Wrappers.lambdaQuery();
             inventoryDetailQueryWrapper
-                    .eq(InventoryDetail::getMaterialCode, materialData.getMaterialCode());
+                    .eq(InventoryDetail::getMaterialCode, materialData.getMaterialCode())
+                    .apply("taskQty != qty AND TIMESTAMPDIFF(HOUR, created, now()) >= solidifyTime");
             // 获取某物料的全部库存
             List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailQueryWrapper);
             if (StringUtils.isEmpty(inventoryDetailList)) {
@@ -892,57 +892,42 @@ public class MesServiceImpl implements MesService {
                 continue;
             }
             // 查询出所有库存
-            List<Integer> headerIds = inventoryDetailList.stream().map(InventoryDetail::getInventoryHeaderId).distinct().collect(Collectors.toList());
-            List<InventoryHeader> inventoryHeaderList = inventoryHeaderService.getByIds(headerIds);
+            String searchOrderCode = materialData.getOrderCode();
             // 若工单号不为空，则根据工单号过滤
             if (StringUtils.isNotEmpty(searchOrderCode)) {
-                inventoryHeaderList = inventoryHeaderList.stream()
-                        .filter(inventoryHeader -> searchOrderCode.equals(inventoryHeader.getOrderCode()))
-                        .collect(Collectors.toList());
-            }
-            // 若领料单不为空，则根据领料单过滤
-            if (StringUtils.isNotEmpty(searchShipmentReferCode)) {
-                inventoryHeaderList = inventoryHeaderList.stream()
-                        .filter(inventoryHeader -> searchShipmentReferCode.equals(inventoryHeader.getShipmentReferCode()))
+                inventoryDetailList = inventoryDetailList.stream()
+                        .filter(inventoryDetail -> searchOrderCode.equals(inventoryDetail.getOrderCode()))
                         .collect(Collectors.toList());
             }
             // 查询出的库存
-            BigDecimal allInventorQty = inventoryHeaderList.stream().map(InventoryHeader::getTotalQty).reduce(BigDecimal.ZERO, BigDecimal::add);
-            List<MesUnUsableQtyData> mesUnUsableQtyDataList = new ArrayList<>();
-            // 可用数量
-            BigDecimal usableQty = inventoryHeaderList.stream()
-                    .filter(header -> StringUtils.isEmpty(header.getShipmentReferCode()))
-                    .map(InventoryHeader::getTotalQty)
+            BigDecimal allInventoryQty = inventoryDetailList.stream()
+                    .map(InventoryDetail::getQty)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
-            // 被领料单锁定的数量
-            Map<String, List<InventoryHeader>> groupByReferCodeMap = inventoryHeaderList.stream()
-                    .filter(header -> StringUtils.isNotEmpty(header.getShipmentReferCode()))
-                    .collect(Collectors.groupingBy(InventoryHeader::getShipmentReferCode));
-            // 领料单不可用数量
-            for (Map.Entry<String, List<InventoryHeader>> entry : groupByReferCodeMap.entrySet()) {
-                String shipmentReferCode = entry.getKey();
-                List<InventoryHeader> invHeaderList = entry.getValue();
-                BigDecimal shipmentReferLockQty = invHeaderList.stream().map(InventoryHeader::getTotalQty).reduce(BigDecimal.ZERO, BigDecimal::add);
+            List<MesUnUsableQtyData> mesUnUsableQtyDataList = new ArrayList<>();
+            BigDecimal usableQty = BigDecimal.ZERO;
+            // 根据工单号加领料单号分组，统计每种分组的 不可用数量
+            Map<String, List<InventoryDetail>> groupMap = inventoryDetailList.stream()
+                    .filter(inventoryDetail -> StringUtils.isNotEmpty(inventoryDetail.getOrderCode()))
+                    .collect(Collectors.groupingBy(inventoryDetail -> inventoryDetail.getOrderCode() + "_" + StringUtils.nvl(inventoryDetail.getShipmentReferCode(), "")));
+            // 工单/领料单 不可用数量
+            for (Map.Entry<String, List<InventoryDetail>> entry : groupMap.entrySet()) {
+                String orderCode = entry.getKey().split("_", -1)[0];
+                String shipmentReferCode = entry.getKey().split("_", -1)[1];
+                List<InventoryDetail> inventoryDetails = entry.getValue();
+                BigDecimal qty = inventoryDetails.stream().map(InventoryDetail::getQty).reduce(BigDecimal.ZERO, BigDecimal::add);
+                if (StringUtils.isEmpty(shipmentReferCode)) {
+                    usableQty = usableQty.add(qty);
+                    continue;
+                }
                 MesUnUsableQtyData mesUnUsableQtyData = new MesUnUsableQtyData();
+                mesUnUsableQtyData.setOrderCode(orderCode);
                 mesUnUsableQtyData.setShipmentReferCode(shipmentReferCode);
-                mesUnUsableQtyData.setUnUsableQty(shipmentReferLockQty);
-                mesUnUsableQtyDataList.add(mesUnUsableQtyData);
-            }
-            // 被工单锁定的数量
-            Map<String, List<InventoryHeader>> groupByOrderCodeMap = inventoryHeaderList.stream()
-                    .filter(header -> StringUtils.isEmpty(header.getOrderCode()))
-                    .collect(Collectors.groupingBy(InventoryHeader::getOrderCode));
-            for (Map.Entry<String, List<InventoryHeader>> entry : groupByOrderCodeMap.entrySet()) {
-                String orderCode = entry.getKey();
-                List<InventoryHeader> invHeaderList = entry.getValue();
-                BigDecimal orderCodeLockQty = invHeaderList.stream().map(InventoryHeader::getTotalQty).reduce(BigDecimal.ZERO, BigDecimal::add);
-                MesUnUsableQtyData mesUnUsableQtyData = new MesUnUsableQtyData();
-                mesUnUsableQtyData.setChidOrderCode(orderCode);
-                mesUnUsableQtyData.setUnUsableQty(orderCodeLockQty);
+                mesUnUsableQtyData.setUnUsableQty(qty);
                 mesUnUsableQtyDataList.add(mesUnUsableQtyData);
+
             }
             materialData.setUsableQty(usableQty);
-            materialData.setUnUsableQty(allInventorQty.subtract(usableQty));
+            materialData.setUnUsableQty(allInventoryQty.subtract(usableQty));
             materialData.setMaterialCode(material.getCode());
             materialData.setUnUsableQtyDataList(mesUnUsableQtyDataList);
             mesSearchMaterialDataList.add(materialData);