杰生迭代

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackServiceImpl.java

@@ -277,17 +277,19 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
                 BigDecimal pickingArea = BigDecimal.ZERO;
                 BigDecimal backArea = BigDecimal.ZERO;
                 BigDecimal correctArea = BigDecimal.ZERO;
+                BigDecimal headTailCorrectArea = BigDecimal.ZERO;
 
                 for (StockBackPlanDetails item : stockBackPlanDetails) {
                     scheduleArea = scheduleArea.add(item.getQuantity());
                     pickingArea = pickingArea.add(item.getPickingArea()).add(item.getTransferInArea() == null ? BigDecimal.ZERO : item.getTransferInArea());
                     backArea = backArea.add(item.getBackArea()).add(item.getTransferOutArea() == null ? BigDecimal.ZERO : item.getTransferOutArea());
                     correctArea = correctArea.add(item.getCorrectArea());
+                    headTailCorrectArea = headTailCorrectArea.add(item.getHeadTailCorrectArea());
                 }
 
                 // 赋值使用率
                 BigDecimal value = BigDecimalUtil.init(scheduleArea).multiply(100).
-                        divideTry(pickingArea.subtract(backArea).subtract(correctArea), 2).getValue();
+                        divideTry(pickingArea.subtract(backArea).subtract(correctArea).subtract(headTailCorrectArea), 2).getValue();
 
                 map.put("useRate", value);
             } else {

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockCheckrecordServiceImpl.java

@@ -104,7 +104,9 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
         List<Map<String, Object>> inHouseList = stockDetailService.listMaps(Wrappers.<StockDetail>query()
                 .select("RfidCode rfidCode")
                 .eq("IsDelete", 0)
-                .eq("StockHouseId", stockHouseId));
+                .eq("StockHouseId", stockHouseId)
+                .ge("ExpiredDt", new Date())
+        );
 
         for (Map<String, Object> map : inHouseList) {
             String rfidCode = Convert.toStr(map.get("rfidCode"));
@@ -119,7 +121,6 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
                 JSONObject.toJSONString(rfidList)
         );
 
-
         String recordId = IdWorker.getIdStr();
 
         // 获取所有在库物料