kangwei: 药剂入库水厂结算修改

@@ -45,7 +45,7 @@
         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.ErpSettlementItemVO">
          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 ,
          round(dm.distribut_price * mi.material_num,2)  total_price,
          round(dm.distribut_price * mi.material_num,2)  total_price,
             round(dm.distribut_price * mi.material_num *(100+dm.tax_amount) /100,2)  total_price_tax, mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num,
             round(dm.distribut_price * mi.material_num *(100+dm.tax_amount) /100,2)  total_price_tax, mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num,