|
|
@@ -316,7 +316,6 @@
|
|
316
|
316
|
<select id="getjkqPlanList" parameterType="java.util.Map" resultType="java.util.HashMap" >
|
|
317
|
317
|
SELECT
|
|
318
|
318
|
a.hwxz,
|
|
319
|
|
- a.wjh,
|
|
320
|
319
|
a.ch,
|
|
321
|
320
|
a.hwh
|
|
322
|
321
|
FROM
|
|
|
@@ -353,7 +352,7 @@
|
|
353
|
352
|
jkqyq.sqyq_time,
|
|
354
|
353
|
jkqyq.is_Upload,
|
|
355
|
354
|
DATE_FORMAT(DATE_ADD(fcbgz.cjsj,INTERVAL 1 DAY),'%Y-%m-%d') AS jkqEnd
|
|
356
|
|
- FROM depot.storage_overhead_set overhead
|
|
|
355
|
+ FROM depot.storage_overhead_set overhead
|
|
357
|
356
|
LEFT JOIN lsreport_ts.data_kcgl_fcbgz_default fcbgz ON overhead.lsxz = fcbgz.hwxz
|
|
358
|
357
|
LEFT JOIN lsreport_ts.data_kcgl_xckc_default xckc ON fcbgz.DataID = xckc.DataID
|
|
359
|
358
|
LEFT JOIN depot.business_delivery_storage_notice notice ON xckc.tzdh = notice.bill_number
|
|
|
@@ -373,9 +372,6 @@
|
|
373
|
372
|
<if test="hwh != null">
|
|
374
|
373
|
AND fcbgz.hwh = #{hwh}
|
|
375
|
374
|
</if>
|
|
376
|
|
- <if test="wjh != null">
|
|
377
|
|
- AND notice.plan_number = #{wjh}
|
|
378
|
|
- </if>
|
|
379
|
375
|
<if test="executeType != null">
|
|
380
|
376
|
AND plan.execute_type = #{executeType}
|
|
381
|
377
|
</if>
|
