Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -173,7 +173,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 .eq(WarehouseBaseInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
                 .eq(WarehouseBaseInfo.QueryFiles.SHOW_FLAG, NumberConstant.CONSTANT1);
         if (!StringUtils.isEmpty(warehouseName)) {
-            warehouseBaseInfoWrapper.like(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, "%" + warehouseName + "%");
+//            warehouseBaseInfoWrapper.like(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, "%" + warehouseName + "%");
+            warehouseBaseInfoWrapper.eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, warehouseName);
         }
         //PC端用
         if (!StringUtils.isEmpty(warehouseType)) {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -691,25 +691,21 @@
         COUNT(w.id)
         FROM
         warehouse_base_info w
-        LEFT JOIN warehouse_in_out_info wioi ON wioi.base_id = w.id
-        AND wioi.delete_flag = 0
-        AND wioi.in_out_type = '收购入库'
-        AND wioi.status_flag = '3'
         LEFT JOIN warehousing_order war ON war.base_id = w.id  AND war.in_type = '收购入库'
         AND war.delete_flag = '0'
-        LEFT JOIN source_relation_info sri ON sri.source_id = war.id
-        AND sri.delete_flag = '0'
-        LEFT JOIN in_out_warehouse_task iowt ON iowt.id = sri.task_id
-        AND iowt.in_out_flag = 1
-        AND iowt.in_out_type_key = 1
-        AND iowt.delete_flag = '0'
-        LEFT JOIN warehouse_in_out_info wioi1 ON wioi1.in_out_task_no = iowt.in_out_task_no
-        AND wioi1.car_no = sri.car_no
-        AND wioi1.delete_flag = 0
-        AND wioi1.status_flag = 3
-        LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = iowt.contract_no
-        AND ssrr.warehouse_record_id = wioi1.id
-        AND ssrr.delete_flag = 0
+--         LEFT JOIN source_relation_info sri ON sri.source_id = war.id
+--         AND sri.delete_flag = '0'
+--         LEFT JOIN in_out_warehouse_task iowt ON iowt.id = sri.task_id
+--         AND iowt.in_out_flag = 1
+--         AND iowt.in_out_type_key = 1
+--         AND iowt.delete_flag = '0'
+--         LEFT JOIN warehouse_in_out_info wioi1 ON wioi1.in_out_task_no = iowt.in_out_task_no
+--         AND wioi1.car_no = sri.car_no
+--         AND wioi1.delete_flag = 0
+--         AND wioi1.status_flag = 3
+--         LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = iowt.contract_no
+--         AND ssrr.warehouse_record_id = wioi1.id
+--         AND ssrr.delete_flag = 0
         LEFT JOIN expense_info ei ON ei.warehouse_id = w.id and ei.delete_flag = '0'
         AND ei.expenses_type = '2'
         AND ei.expenses_purpose = '3'
@@ -736,31 +732,63 @@
         WHEN w.delete_flag = '1' THEN
         CONCAT( w.warehouse_name, '(已删)' ) ELSE w.warehouse_name
         END AS warehouseName,
-        sum( wioi.net_weight ) AS acquisitionWeight,
-        sum( ssrr.settlement_weight ) AS saleWeight,
-        sum( ssrr.amount_ing_receivable ) AS salesVolume,
-        SUM(ei.amount_money) as cost
+        sum( war.in_warehouse_weight  ) AS acquisitionWeight,
+        (SELECT
+        sum(ssrr.settlement_weight)*sri.proportion
         FROM
-        warehouse_base_info w
-        LEFT JOIN warehouse_in_out_info wioi ON wioi.base_id = w.id
-        AND wioi.delete_flag = 0
-        AND wioi.in_out_type = '收购入库'
-        AND wioi.status_flag = '3'
-        LEFT JOIN warehousing_order war ON war.base_id = w.id  AND war.in_type = '收购入库'
-        AND war.delete_flag = '0'
-        LEFT JOIN source_relation_info sri ON sri.source_id = war.id
+        warehouse_base_info wbi
+        LEFT JOIN warehousing_order ward ON ward.base_id = wbi.id
+        AND ward.in_type = '收购入库'
+        AND ward.delete_flag = '0'
+        LEFT JOIN source_relation_info sri ON sri.source_id = ward.id
+        AND sri.delete_flag = '0'
+        LEFT JOIN in_out_warehouse_task iowt ON iowt.id = sri.task_id
+        AND iowt.in_out_flag = 1
+        AND iowt.in_out_type_key = 1
+        AND iowt.delete_flag = '0'
+        LEFT JOIN warehouse_in_out_info wioi1 ON wioi1.in_out_task_no = iowt.in_out_task_no
+        AND wioi1.delete_flag = 0
+        AND wioi1.status_flag = 3
+        LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = iowt.contract_no
+        AND ssrr.warehouse_record_id = wioi1.id
+        where wbi.id=w.id) as saleWeight,
+        (SELECT
+        sum(ssrr.amount_ing_receivable)*sri.proportion
+        FROM
+        warehouse_base_info wbi
+        LEFT JOIN warehousing_order ward ON ward.base_id = wbi.id
+        AND ward.in_type = '收购入库'
+        AND ward.delete_flag = '0'
+        LEFT JOIN source_relation_info sri ON sri.source_id = ward.id
         AND sri.delete_flag = '0'
         LEFT JOIN in_out_warehouse_task iowt ON iowt.id = sri.task_id
         AND iowt.in_out_flag = 1
         AND iowt.in_out_type_key = 1
         AND iowt.delete_flag = '0'
         LEFT JOIN warehouse_in_out_info wioi1 ON wioi1.in_out_task_no = iowt.in_out_task_no
-        AND wioi1.car_no = sri.car_no
         AND wioi1.delete_flag = 0
         AND wioi1.status_flag = 3
         LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = iowt.contract_no
         AND ssrr.warehouse_record_id = wioi1.id
-        AND ssrr.delete_flag = 0
+        where wbi.id=w.id) as salesVolume,
+        IFNULL(SUM(ei.amount_money),0) as cost
+        FROM
+        warehouse_base_info w
+        LEFT JOIN warehousing_order war ON war.base_id = w.id  AND war.in_type = '收购入库'
+        AND war.delete_flag = '0'
+--         LEFT JOIN source_relation_info sri ON sri.source_id = war.id
+--         AND sri.delete_flag = '0'
+--         LEFT JOIN in_out_warehouse_task iowt ON iowt.id = sri.task_id
+--         AND iowt.in_out_flag = 1
+--         AND iowt.in_out_type_key = 1
+--         AND iowt.delete_flag = '0'
+--         LEFT JOIN warehouse_in_out_info wioi1 ON wioi1.in_out_task_no = iowt.in_out_task_no
+--         AND wioi1.car_no = sri.car_no
+--         AND wioi1.delete_flag = 0
+--         AND wioi1.status_flag = 3
+--         LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = iowt.contract_no
+--         AND ssrr.warehouse_record_id = wioi1.id
+--         AND ssrr.delete_flag = 0
         LEFT JOIN expense_info ei ON ei.warehouse_id = w.id and ei.delete_flag = '0'
         AND ei.expenses_type = '2'
         AND ei.expenses_purpose = '3'