1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehouseBaseInfoController.java

@@ -241,5 +241,12 @@ public class WarehouseBaseInfoController {
     public Page<WarehouseBaseInfo> selectBaseInfo(WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.selectBaseInfo(warehouseBaseInfo);
     }
+    /**
+     * 库点利润图表
+     */
+    @GetMapping("/selectWarehouseChart")
+    public WarehouseBaseInfo selectWarehouseChart(WarehouseBaseInfo warehouseBaseInfo) {
+        return warehouseBaseInfoService.selectWarehouseChart(warehouseBaseInfo);
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -243,6 +243,10 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
      */
     @TableField(exist = false)
     private Double saleWeight;
+    @TableField(exist = false)
+    private List<WarehouseBaseInfo> chartList;
+    @TableField(exist = false)
+    private List<WarehouseBaseInfo> formList;
 
 
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WarehouseBaseInfoMapper.java

@@ -94,4 +94,11 @@ public interface WarehouseBaseInfoMapper extends BaseMapper<WarehouseBaseInfo> {
      * @return
      */
     List<WarehouseBaseInfo> getBaseListByCondition(Map<String, Object> pageView);
+    /**
+     * 库点利润图
+     *
+     * @param pageView
+     * @return
+     */
+    List<WarehouseBaseInfo> getWarehouseChartByCondition(Map<String, Object> pageView);
 }

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

@@ -97,4 +97,10 @@ public interface IContractManagementInfoService extends IService<ContractManagem
      * @return
      */
     Page<ContractManagementInfo> selectContractInfo(ContractManagementInfo contractManagementInfo);
+    /**
+     * 合同利润图表
+     *
+     * @param contractManagementInfo
+     */
+    ContractManagementInfo selectContractChart(ContractManagementInfo contractManagementInfo);
 }

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

@@ -151,4 +151,10 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
      * @return
      */
     Page<WarehouseBaseInfo> selectBaseInfo(WarehouseBaseInfo warehouseBaseInfo);
+    /**
+     * 库点利润图表
+     *
+     * @param warehouseBaseInfo
+     */
+    WarehouseBaseInfo selectWarehouseChart(WarehouseBaseInfo warehouseBaseInfo);
 }

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

@@ -5547,4 +5547,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         return page;
     }
 
+    @Override
+    public WarehouseBaseInfo selectWarehouseChart(WarehouseBaseInfo warehouseBaseInfo) {
+        WarehouseBaseInfo warehouseBaseInfo1=new WarehouseBaseInfo();
+        Map<String, Object> pageView = new HashMap<>();
+        //  公司ID
+        pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
+        pageView.put("startDate", warehouseBaseInfo.getStartDate());
+        pageView.put("endDate", warehouseBaseInfo.getEndDate());
+        List<WarehouseBaseInfo> dataList = baseMapper.getWarehouseChartByCondition(pageView);
+        warehouseBaseInfo1.setChartList(dataList);
+
+        return warehouseBaseInfo1;
+    }
+
 }

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

@@ -677,8 +677,8 @@
         SELECT
         COUNT(w.id)
         FROM warehouse_base_info w
-        LEFT JOIN contract_expenses_info c on w.id = c.base_id
-        LEFT JOIN cost_management_info cm on w.id = cm.base_id
+        LEFT JOIN contract_expenses_info c on w.id = c.warehouse_id
+        LEFT JOIN cost_management_info cm on w.id = cm.warehouse_id
         WHERE
         w.comp_id = #{compId}
         <if test="startDate != null">
@@ -703,8 +703,8 @@
         c.pay_deadline as payDeadline,
         cm.cost
         FROM warehouse_base_info w
-        LEFT JOIN contract_expenses_info c on w.id = c.base_id
-        LEFT JOIN cost_management_info cm on w.id = cm.base_id
+        LEFT JOIN contract_expenses_info c on w.id = c.warehouse_id
+        LEFT JOIN cost_management_info cm on w.id = cm.warehouse_id
         WHERE
         w.comp_id = #{compId}
         <if test="startDate != null">
@@ -722,4 +722,45 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
+    <!-- 库点利润图 -->
+    <select id="getWarehouseChartByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo">
+        SELECT
+        wioi.goods_name AS goodsName,
+        SUM( IFNULL( sri.proportion, 1 ) * IFNULL( ssrr.amount_ing_receivable, 0 ) ) -sum( pm.amount_ing_payable ) AS profit
+        FROM
+        warehouse_in_out_info wioi
+        LEFT JOIN warehouse_base_info wbi ON wbi.id = wioi.base_id
+        AND wbi.delete_flag = 0
+        LEFT JOIN quality_inspection_management qim ON qim.warehouse_in_out_id = wioi.id
+        AND qim.delete_flag = 0
+        LEFT JOIN payment_management pm ON pm.relation_id = qim.relation_id
+        AND pm.delete_flag = 0
+        LEFT JOIN warehousing_order war ON war.warehouse_in_out_id = wioi.id
+        AND war.comp_id = wbi.comp_id
+        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
+        WHERE
+        wioi.in_out_type = '收购入库'
+        AND wioi.status_flag = '3'
+        AND wbi.comp_id= #{compId}
+        AND (DATE_FORMAT(wioi.in_out_date,"%Y%m%d") &gt;=
+        DATE_FORMAT(#{startDate},"%Y%m%d"))
+        AND (DATE_FORMAT(wioi.in_out_date,"%Y%m%d") &lt;=
+        DATE_FORMAT(#{endDate},"%Y%m%d"))
+        GROUP BY
+        wioi.goods_name;
+    </select>
 </mapper>