|
|
@ -244,7 +244,7 @@
|
|
|
|
e.vehicle_number vehicleName,
|
|
|
|
e.vehicle_number vehicleName,
|
|
|
|
c.poundlist_time poundlistTime,
|
|
|
|
c.poundlist_time poundlistTime,
|
|
|
|
f.product_id productId,
|
|
|
|
f.product_id productId,
|
|
|
|
f.spec spec,
|
|
|
|
l.spec spec,
|
|
|
|
f.unit unit,
|
|
|
|
f.unit unit,
|
|
|
|
IFNULL(f.gross_weight,0) grossWeight,
|
|
|
|
IFNULL(f.gross_weight,0) grossWeight,
|
|
|
|
IFNULL(f.tare_weight,0) tareWeight,
|
|
|
|
IFNULL(f.tare_weight,0) tareWeight,
|
|
|
@ -267,11 +267,14 @@
|
|
|
|
LEFT JOIN jg_contract i on h.contract_id = i.id
|
|
|
|
LEFT JOIN jg_contract i on h.contract_id = i.id
|
|
|
|
LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
|
|
|
|
LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
|
|
|
|
LEFT JOIN jg_product k on f.product_id = k.id
|
|
|
|
LEFT JOIN jg_product k on f.product_id = k.id
|
|
|
|
|
|
|
|
LEFT JOIN jg_warehousing_storage_product l on l.warehousing_storage_id = b.id
|
|
|
|
|
|
|
|
|
|
|
|
where a.warehousing_storage_id in
|
|
|
|
where a.warehousing_storage_id in
|
|
|
|
<foreach item="item" index="index" collection="storageIdList"
|
|
|
|
<foreach item="item" index="index" collection="storageIdList"
|
|
|
|
open="(" separator="," close=")">
|
|
|
|
open="(" separator="," close=")">
|
|
|
|
#{item}
|
|
|
|
#{item}
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
|
|
|
|
|
GROUP BY a.id
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
<select id="getWarehousingstorageList5" resultType="jnpf.entity.CwaccountvoucherEntity">
|
|
|
|
<select id="getWarehousingstorageList5" resultType="jnpf.entity.CwaccountvoucherEntity">
|
|
|
@ -375,7 +378,7 @@
|
|
|
|
e.vehicle_number vehicleName,
|
|
|
|
e.vehicle_number vehicleName,
|
|
|
|
c.poundlist_time poundlistTime,
|
|
|
|
c.poundlist_time poundlistTime,
|
|
|
|
f.product_id productId,
|
|
|
|
f.product_id productId,
|
|
|
|
f.spec spec,
|
|
|
|
l.spec spec,
|
|
|
|
f.unit unit,
|
|
|
|
f.unit unit,
|
|
|
|
IFNULL(f.gross_weight,0) grossWeight,
|
|
|
|
IFNULL(f.gross_weight,0) grossWeight,
|
|
|
|
IFNULL(f.tare_weight,0) tareWeight,
|
|
|
|
IFNULL(f.tare_weight,0) tareWeight,
|
|
|
@ -399,11 +402,13 @@
|
|
|
|
LEFT JOIN jg_contract i on h.contract_id = i.id
|
|
|
|
LEFT JOIN jg_contract i on h.contract_id = i.id
|
|
|
|
LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
|
|
|
|
LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
|
|
|
|
LEFT JOIN jg_product k on f.product_id = k.id
|
|
|
|
LEFT JOIN jg_product k on f.product_id = k.id
|
|
|
|
|
|
|
|
LEFT JOIN jg_warehousing_outbound_product l on l.warehousing_outbound_id = b.id
|
|
|
|
where a.warehousing_outbound_id in
|
|
|
|
where a.warehousing_outbound_id in
|
|
|
|
<foreach item="item" index="index" collection="storageIdList"
|
|
|
|
<foreach item="item" index="index" collection="storageIdList"
|
|
|
|
open="(" separator="," close=")">
|
|
|
|
open="(" separator="," close=")">
|
|
|
|
#{item}
|
|
|
|
#{item}
|
|
|
|
</foreach>
|
|
|
|
</foreach>
|
|
|
|
|
|
|
|
GROUP BY a.id
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
<select id="getWarehousingstorageList8" resultType="jnpf.entity.CwaccountvoucherEntity">
|
|
|
|
<select id="getWarehousingstorageList8" resultType="jnpf.entity.CwaccountvoucherEntity">
|
|
|
|