kangwei: 水厂结算测试

@@ -33,7 +33,7 @@
     </select>
     </select>
 
 
     <!-- 根据ids获取：水厂结算单 -->
     <!-- 根据ids获取：水厂结算单 -->
-   <!-- <select id="waterDepartSettlement" resultType="com.skua.modules.erp.vo.ErpSettlementVO">
+    <select id="waterDepartSettlement" resultType="com.skua.modules.erp.vo.ErpSettlementVO">
         select d.depart_name ,aaa.* from (
         select d.depart_name ,aaa.* from (
             select mi.depart_id  ,dc.contract_code, mi.distribut_contract_id ,sum(mi.material_num) material_num, dc.contract_name 'project_name',  round(sum(dm.distribut_price * mi.material_num),2)  total_price,
             select mi.depart_id  ,dc.contract_code, mi.distribut_contract_id ,sum(mi.material_num) material_num, dc.contract_name 'project_name',  round(sum(dm.distribut_price * mi.material_num),2)  total_price,
                 round(sum(dm.distribut_price * mi.material_num *(100+dm.tax_amount) /100),2)  total_price_tax
                 round(sum(dm.distribut_price * mi.material_num *(100+dm.tax_amount) /100),2)  total_price_tax
@@ -43,7 +43,7 @@
             group by  mi.depart_id  ,dc.contract_code
             group by  mi.depart_id  ,dc.contract_code
         )aaa
         )aaa
         left join sys_depart d  on aaa.depart_id = d.id
         left join sys_depart d  on aaa.depart_id = d.id
-    </select>-->
+    </select>
     <!--  根据入库单ids，获取水厂结算单详情-->
     <!--  根据入库单ids，获取水厂结算单详情-->
     <select id="queryWaterDepartSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementVO">
     <select id="queryWaterDepartSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementVO">
          select d.depart_name, dc.contract_name ,dc.project_name, dc.contract_code, dm.distribut_price 'unit_price'  , pm.good_brand , pm.good_origin, mf.jishu_file_path,  mf.appearance_info,  mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign,  dm.tax_amount ,
          select d.depart_name, dc.contract_name ,dc.project_name, dc.contract_code, dm.distribut_price 'unit_price'  , pm.good_brand , pm.good_origin, mf.jishu_file_path,  mf.appearance_info,  mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign,  dm.tax_amount ,