Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -425,7 +425,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                tmgs.sku_code            as "skuCode",
                sys.f_remove_zero(tpoi.item_qty)    as "orderQty",
                sys.f_remove_zero(tpoi.item_qty - tpoi.outing_qty - tpoi.out_qty + t.outing_qty + t.out_qty) as "canOutingQty",
-               case when t.sku_id is null then tmp.sup_name || '(外协)' else  tmgb.brand_name end AS brandName,
+               case when t.sku_id is null then '外协' else  tmgb.brand_name end AS brandName,
                tmgb.short_name AS "shortName",
                t.price_out,
                sys.f_remove_zero(t.outing_qty + t.out_qty)                                                  as outing_qty,
@@ -575,7 +575,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                t.item_index,
                t.sku_id,
                tmgs.sku_images,
-               case when t.sku_id is null then tmp.sup_name || '(外协)' else  tmgb.brand_name end AS brand_name,
+               case when t.sku_id is null then '外协' else  tmgb.brand_name end AS brand_name,
                tmgb.short_name,
                tmgs.sku_code                                                                         as "skuCode",
                case when t.sku_id is null then t.sku_model  else  tmgs.sku_model end                 as "skuModel",

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.xml

@@ -1151,7 +1151,7 @@
         tmgs.sku_spec AS list_sku_spec,
         tpoi.fact_price AS list_fact_price,
         tpoi.fact_amt AS list_fact_amt,
-        case when tpoi.sku_id is null then tmp.sup_name || '(外协)' else  tmgb.brand_name end AS list_brand_name,
+        case when tpoi.sku_id is null then '外协' else  tmgb.brand_name end AS list_brand_name,
         tmgb.short_name AS list_short_name,
         tmgs.price_purchase AS list_price_purchase,
         tmgs.price_standard AS list_price_standard,

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -1064,7 +1064,7 @@
         ,tpi.non_std_code as "nonStdCode"
         ,tmgb.short_name as "shortName"
         ,tmgb.brand_name as "brandName"
-        ,CASE WHEN tpoi.sku_id IS NULL THEN tmsp.sup_name || '(外协)' ELSE tmw.wh_name end as "whName"
+        ,CASE WHEN tpoi.sku_id IS NULL THEN '外协' ELSE tmw.wh_name end as "whName"
         ,tmgc.cat_name as "catName"
         ,series.series_name as "seriesName"
         ,sys.f_remove_zero(tpoi.outing_qty) as "outingQty"

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -197,7 +197,7 @@
                t.sku_model as "skuModel",
                t.sku_name  as "skuName",
                tmgs.sku_images,
-               tmgb.brand_name,
+        case when t.sku_id is null then '外协' else  tmgb.brand_name end AS brand_name,
                tmgb.short_name,
                dkic_b.f_box_piece(u2.unit_name,ul.unit_name,t.box,t.piece) AS "boxPiece",
                t.pack_box,

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -738,7 +738,7 @@ public class ReportService {
             List<Map<String, Object>> psiOrderByUser = reportMapper.getPsiOrderByUser(params);
             items.addAll(psiOrderByUser);
             // 判断类型
-            for (Map<String, Object> item : items) {
+/*            for (Map<String, Object> item : items) {
                 if (Double.valueOf(String.valueOf(item.get("facAmt")).equals("null") ? "0" : String.valueOf(item.get("facAmt"))) > 0) {
                     item.put("type", "销售订单");
                 } else if (Double.valueOf(String.valueOf(item.get("outAmt")).equals("null") ? "0" : String.valueOf(item.get("outAmt"))) < 0) {
@@ -748,7 +748,7 @@ public class ReportService {
                 } else if (Double.valueOf(String.valueOf(item.get("sumAmtRec")).equals("null") ? "0" : String.valueOf(item.get("sumAmtRec"))) < 0) {
                     item.put("type", "客户退款");
                 }
-            }
+            }*/
             // 筛选出符合条件的明细
             List<Map<String, Object>> userArrearsItem = items.stream()
                     .filter(item -> item.get("objectId").equals(map.get("objectId")))
@@ -764,8 +764,8 @@ public class ReportService {
                         + Double.valueOf(String.valueOf(item.get("outAmt")).equals("null") ? "0" : String.valueOf(item.get("outAmt")))
                         - Double.valueOf(String.valueOf(item.get("sumAmtRec")).equals("null") ? "0" : String.valueOf(item.get("sumAmtRec"))));
             });
-            map.put("item", userArrearsItem);
-            map.put("totalMoney", total);
+//            map.put("item", userArrearsItem);
+            map.put("arrears", total);
         }
         if (Integer.parseInt(params.get("currentPage").toString()) == 1) {
             // 查询公司概况
@@ -780,7 +780,6 @@ public class ReportService {
                         + Double.valueOf(String.valueOf(debt.get("outAmt")).equals("null") ? "0" : String.valueOf(debt.get("outAmt")))
                         - Double.valueOf(String.valueOf(incomeExpenditure.get("arrears")).equals("null") ? "0" : String.valueOf(incomeExpenditure.get("arrears"))));
             }
-            // todo
             List<Map<String, Object>> overviewList = new ArrayList<>();
             overviewList.add(sales);
             overviewList.add(incomeExpenditure);