。。

src/main/java/com/chinaitop/depot/storage/mapper/StorageKcglJkqyqDefaultMapper.xml

@@ -316,7 +316,6 @@
    <select id="getjkqPlanList" parameterType="java.util.Map" resultType="java.util.HashMap" >
 	SELECT
 	a.hwxz,
-	a.wjh,
 	a.ch,
 	a.hwh
 	FROM
@@ -353,7 +352,7 @@
 		jkqyq.sqyq_time,
 		jkqyq.is_Upload,
 		DATE_FORMAT(DATE_ADD(fcbgz.cjsj,INTERVAL 1 DAY),'%Y-%m-%d') AS jkqEnd
-		FROM depot.storage_overhead_set overhead 
+		FROM depot.storage_overhead_set overhead
 		LEFT JOIN lsreport_ts.data_kcgl_fcbgz_default fcbgz ON overhead.lsxz = fcbgz.hwxz
 		LEFT JOIN lsreport_ts.data_kcgl_xckc_default xckc ON fcbgz.DataID = xckc.DataID
 		LEFT JOIN depot.business_delivery_storage_notice notice ON xckc.tzdh = notice.bill_number
@@ -373,9 +372,6 @@
 	<if test="hwh != null">
 	AND fcbgz.hwh = #{hwh}
 	</if>
-	<if test="wjh != null">
-	AND notice.plan_number = #{wjh}
-	</if>
 	<if test="executeType != null">
 	AND plan.execute_type = #{executeType}
 	</if>

src/main/java/com/chinaitop/depot/storage/mapper/StorageOverheadSetMapper.xml

@@ -281,7 +281,7 @@
 	overhead.warning_day,
 	jkqyq.sqyq_time,
 	jkqyq.is_Upload
-	FROM depot.storage_overhead_set overhead 
+	FROM depot.storage_overhead_set overhead
 	LEFT JOIN lsreport_ts.data_kcgl_fcbgz_default fcbgz ON overhead.lsxz = fcbgz.hwxz
 	LEFT JOIN lsreport_ts.data_kcgl_xckc_default xckc ON fcbgz.DataID = xckc.DataID
 	LEFT JOIN depot.business_delivery_storage_notice notice ON xckc.tzdh = notice.bill_number