Merge remote-tracking branch 'origin/master' into master

@@ -14,7 +14,7 @@
     </select>
     </select>
     <!--  根据入库单ids，获取供应商结算单详情-->
     <!--  根据入库单ids，获取供应商结算单详情-->
     <select id="querySupplierSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
     <select id="querySupplierSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
-        select sm.supp_name 'supplierName',d.depart_name,  mf.jishu_file_path,  mf.appearance_info,  mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign,
+        select sm.supp_name 'supplierName',d.depart_name, mi.depart_id, mf.jishu_file_path,  mf.appearance_info,  mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign,
 					pc.contract_name,pc.contract_code,pc.project_name , mi.purchase_contract_id  , pm.good_brand , pm.good_origin,   pm.unit_price ,mi.material_num,  pm.tax_amount ,round(pm.unit_price * mi.material_num,2)  total_price,
 					pc.contract_name,pc.contract_code,pc.project_name , mi.purchase_contract_id  , pm.good_brand , pm.good_origin,   pm.unit_price ,mi.material_num,  pm.tax_amount ,round(pm.unit_price * mi.material_num,2)  total_price,
 					round(pm.unit_price * mi.material_num *100 /(100+ ifnull(pm.tax_amount,0)) ,2)  total_price_tax,
 					round(pm.unit_price * mi.material_num *100 /(100+ ifnull(pm.tax_amount,0)) ,2)  total_price_tax,
                     mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification, mi.measuring_unit,mi.good_code,mi.id 'material_in_id'
                     mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification, mi.measuring_unit,mi.good_code,mi.id 'material_in_id'
@@ -42,7 +42,7 @@
     </select>
     </select>
     <!--  根据入库单ids，获取水厂结算单详情-->
     <!--  根据入库单ids，获取水厂结算单详情-->
     <select id="queryWaterDepartSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
     <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,mi.depart_id, 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 *100 /(100+ ifnull(dm.tax_amount,0)) ,2)  total_price_tax,
          round(dm.distribut_price * mi.material_num,2)  total_price, round(dm.distribut_price * mi.material_num *100 /(100+ ifnull(dm.tax_amount,0)) ,2)  total_price_tax,
              mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num,
              mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num,
              mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification,  mi.measuring_unit,mi.good_code,mi.id 'material_in_id'
              mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification,  mi.measuring_unit,mi.good_code,mi.id 'material_in_id'