Merge remote-tracking branch 'origin/dev_hjj_522'

src/main/java/com/jsh/erp/service/impl/AuditServiceImpl.java

@@ -44,7 +44,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
 
     private final UserService userService;
 
-    private final MaterialBatchService materialBatchService;
+    @Resource
+    private MaterialBatchService materialBatchService;
     @Resource
     private TaskStocktakingService taskStocktakingService;
     @Resource

src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java

@@ -71,19 +71,12 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
     @Resource
     private MaterialCurrentStockMapperEx materialCurrentStockMapperEx;
     @Resource
-    private LogService logService;
-    @Resource
     private MaterialMapperEx materialMapperEx;
-
     @Resource
     private SyncTescoSystemService syncTescoSystemService;
-
     @Resource
     private MaterialBatchService materialBatchService;
 
-    @Resource
-    private DepotItemService depotItemService;
-
     /**
      * pda根据订单信息查询商品列表
      * @return
@@ -93,7 +86,7 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
         List<PDADepotItemVO> list = depotItemMapper.pdaList(id);
         for (PDADepotItemVO pdaDepotItemVO : list) {
             Unit unitInfo = materialService.findUnit(pdaDepotItemVO.getMaterialId()); //查询多单位信息
-            pdaDepotItemVO.setActualQuantityInStorage(depotItemService.getFinishNumber(pdaDepotItemVO.getMaterialExtendId(), pdaDepotItemVO.getId(), pdaDepotItemVO.getHeaderId(), unitInfo, pdaDepotItemVO.getMaterialUnit(), "basic").toString());
+            pdaDepotItemVO.setActualQuantityInStorage(this.getFinishNumber(pdaDepotItemVO.getMaterialExtendId(), pdaDepotItemVO.getId(), pdaDepotItemVO.getHeaderId(), unitInfo, pdaDepotItemVO.getMaterialUnit(), "basic").toString());
             BigDecimal stock;
             if (unitInfo != null && unitInfo.getId() != null){
                 stock = unitService.parseStockByUnit(materialService.getCurrentStockByMaterialIdAndDepotId(pdaDepotItemVO.getMaterialId(),pdaDepotItemVO.getDepotId()),unitInfo,pdaDepotItemVO.getCommodityUnit());

src/main/java/com/jsh/erp/service/impl/MaterialExtendServiceImpl.java

@@ -49,13 +49,6 @@ public class MaterialExtendServiceImpl extends ServiceImpl<MaterialExtendMapper,
     @Resource
     private MaterialService materialService;
     @Resource
-    private DepotItemService depotItemService;
-    @Resource
-    private InventoryLogService inventoryLogService;
-    @Resource
-    private SyncTescoSystemService syncTescoSystemService;
-
-    @Resource
     private MaterialUnitService materialUnitService;
     @Resource
     private MaterialUpcService materialUpcService;

src/main/java/com/jsh/erp/service/impl/MaterialServiceImpl.java

@@ -84,8 +84,6 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
     @Resource
     private DepotHeadService depotHeadService;
     @Resource
-    private SupplierService supplierService;
-    @Resource
     private DepotMapperEx depotMapperEx;
     @Resource
     private MaterialBatchService materialBatchService;

src/main/java/com/jsh/erp/service/impl/TaskStocktakingServiceImpl.java

@@ -42,8 +42,6 @@ public class TaskStocktakingServiceImpl extends ServiceImpl<TaskStocktakingMappe
 
     private final DepotMapper depotMapper;
 
-    private final DepotService depotService;
-
     private final TaskStocktakingItemMapper taskStocktakingItemMapper;
 
     private final TaskStocktakingMapper taskStocktakingMapper;