循环引入问题解决

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

@@ -42,8 +42,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
 
     private final UserService userService;
 
-
-    private final MaterialService materialService;
+    @Resource
+    private MaterialService materialService;
     @Resource
     private MaterialBatchService materialBatchService;
     @Resource

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

@@ -644,11 +644,11 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         if (depotList.size() > 1){
             depotName2 = depotList.get(1).getName();
         }
-        String nameStr = "名称*,规格,型号,颜色,品牌,类别,基础重量(kg),基本单位*,副单位,比例,多属性," +
-                "状态*,序列号,系统sku,商品条码,默认采购价,默认销售价,自定义1,自定义2,自定义3,备注";
-        String nameStr2 = "SPU编码（可留空）,SKU编码（可留空）,商品名称（SPU级）*,品牌,类目*,商品效期," + depotName1 + "*," + depotName2 + ",规格*,默认采购价*,默认销售价*," +
+//        String nameStr = "名称*,规格,型号,颜色,品牌,类别,基础重量(kg),基本单位*,副单位,比例,多属性," +
+//                "状态*,序列号,系统sku,商品条码,默认采购价,默认销售价,自定义1,自定义2,自定义3,备注";
+        String nameStr = "SPU编码（可留空）,SKU编码（可留空）,商品名称（SPU级）*,品牌,类目*,商品效期," + depotName1 + "*," + depotName2 + ",规格*,默认采购价*,默认销售价*," +
                 "基础单位*,是否启用*,UPC1*,UPC2,UPC3,UPC4,UPC5,单位1,单位1换算关系,单位2,单位2换算关系,单位3,单位3换算关系,单位4,单位4换算关系,单位5,单位5换算关系";
-        List<String> nameList = StringUtil.strToStringList(nameStr2);
+        List<String> nameList = StringUtil.strToStringList(nameStr);
         //期初库存缓存
         List<MaterialInitialStock> misList = materialInitialStockMapperEx.getListExceptZero();
         Map<String, String> misMap = new HashMap<>();
@@ -701,13 +701,6 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
                     objs[17 - 1 + index ] = unitList.get(i).getName();
                     objs[17 + index ] = unitList.get(i).getRatio().toString();
                 }
-                //仓库期初库存
-//                int i = 21;
-//                for(Depot depot: depotList) {
-//                    BigDecimal number = misMap.get(m.getId() + "_" + depot.getId());
-//                    objs[i] = number == null ? "0" : number.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
-//                    i++;
-//                }
                 objects.add(objs);
             }
         }