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

@@ -85,7 +85,7 @@ public class PurchasePlanItem implements  Serializable{
 
 
 	@Excel(name = "去年出库数量", width = 15)
 	@Excel(name = "去年出库数量", width = 15)
 	@ApiModelProperty(value = "去年出库数量")
 	@ApiModelProperty(value = "去年出库数量")
-	private Integer outNum;
+	private String outNum;
 
 
 	@Excel(name = "总价", width = 15)
 	@Excel(name = "总价", width = 15)
 	@ApiModelProperty(value = "总价")
 	@ApiModelProperty(value = "总价")

@@ -4,13 +4,13 @@
 
 
     <!--查询 入库单 -->
     <!--查询 入库单 -->
     <select id="queryArrivalRecordByList" resultType="com.skua.modules.erp.vo.ArrivalRecordExcelExportVO">
     <select id="queryArrivalRecordByList" resultType="com.skua.modules.erp.vo.ArrivalRecordExcelExportVO">
-       select d.depart_name, pc.contract_code 'purchaseContractCode',  dc.contract_code 'distributContractCode' ,ss.sparepart_name,mi.*
-            from erp_material_in mi
-            left join sys_depart d on d.id = mi.depart_id
-            left join erp_purchase_contract pc on pc.id = mi.purchase_contract_id
-            left join erp_distribut_contract dc on  dc.id = mi.distribut_contract_id
-            left join equipment_sparepart_supplies ss on ss.id = mi.supplier_id
-          <where>
+        select d.depart_name, pc.contract_code 'purchaseContractCode',  dc.contract_code 'distributContractCode' , sm.supp_name 'supplierName' ,mi.*
+        from erp_material_in mi
+        left join sys_depart d on d.id = mi.depart_id
+        left join erp_purchase_contract pc on pc.id = mi.purchase_contract_id
+        left join erp_distribut_contract dc on  dc.id = mi.distribut_contract_id
+        left join ajh_supplier_manage sm on sm.id= mi.supplier_id
+        <where>
               mi.audit_status =3
               mi.audit_status =3
               <if test="startTime != null and startTime !=''">
               <if test="startTime != null and startTime !=''">
                   and mi.arrive_time &gt;= #{startTime}
                   and mi.arrive_time &gt;= #{startTime}
@@ -61,4 +61,14 @@
         </where>
         </where>
         group by sparepart_id,purchase_contract_id,depart_id,supplier_id
         group by sparepart_id,purchase_contract_id,depart_id,supplier_id
     </select>
     </select>
+
+
+    <!-- -->
+    <select id="checkNum" resultType="java.lang.Double">
+        select  (dm.material_num  - aaa.num1 - 100) num  from (
+          select sum(material_num) 'num1' from erp_material_in where good_code = 'HH102802' and distribut_contract_id ='1850726733397950466'
+        )aaa
+        left join erp_distribut_material  dm  on (dm.contract_id  = '1850726733397950466' and dm.good_code ='HH102802')
+    </select>
+
 </mapper>
 </mapper>