优化进销存统计的查询接口

jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java

@@ -299,11 +299,6 @@ public class DepotItemController {
             //存放数据json数组
             JSONArray dataArray = new JSONArray();
             if (null != dataList) {
-                List<Long> idList = new ArrayList<>();
-                for (DepotItemVo4WithInfoEx m : dataList) {
-                    idList.add(m.getMId());
-                }
-                List<MaterialExtend> meList = materialExtendService.getListByMIds(idList);
                 for (DepotItemVo4WithInfoEx diEx : dataList) {
                     JSONObject item = new JSONObject();
                     Long mId = diEx.getMId();
@@ -325,14 +320,8 @@ public class DepotItemController {
                     item.put("inSum", inSum);
                     item.put("outSum", outSum);
                     item.put("thisSum", thisSum);
-                    for(MaterialExtend me:meList) {
-                        if(me.getMaterialId().longValue() == diEx.getMId().longValue()) {
-                            if(me.getPurchaseDecimal()!=null) {
-                                item.put("unitPrice", me.getPurchaseDecimal());
-                                item.put("thisAllPrice", thisSum.multiply(me.getPurchaseDecimal()));
-                            }
-                        }
-                    }
+                    item.put("unitPrice", diEx.getPurchaseDecimal());
+                    item.put("thisAllPrice", thisSum.multiply(diEx.getPurchaseDecimal()));
                     dataArray.add(item);
                 }
             }

jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml

@@ -191,7 +191,7 @@
         select m.id MId, me.bar_code, m.name MName, m.mfrs MMfrs, m.model MModel, m.standard MStandard,
         m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,
         concat_ws('', m.unit, u.basic_unit) MaterialUnit, m.color MColor, u.name unit_name,
-        (select purchase_decimal from jsh_material_extend me
+        (select ifnull(purchase_decimal,0) from jsh_material_extend me
         where me.material_id=m.id and me.default_flag=1 and ifnull(me.delete_Flag,'0') !='1' limit 0,1)
         purchase_decimal
         from jsh_material m