|
|
@@ -513,6 +513,95 @@
|
|
|
<if test="fOriginalbillno != null and fOriginalbillno != ''">and leg.f_originalbillno = #{fOriginalbillno}</if>
|
|
|
<if test="fPreqty != null ">and leg.f_preqty = #{fPreqty}</if>
|
|
|
<if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
|
|
|
+ <if test='orgStorageDate != null and orgStorageDate[0] != null and orgStorageDate[0]!= ""'>
|
|
|
+ and leg.f_originalbilldate >= #{orgStorageDate[0]}
|
|
|
+ </if>
|
|
|
+ <if test='orgStorageDate != null and orgStorageDate[1] != null and orgStorageDate[1]!= ""'>
|
|
|
+ and leg.f_originalbilldate <= #{orgStorageDate[1]}
|
|
|
+ </if>
|
|
|
+ <if test="fPregrossweight != null ">and leg.f_pregrossweight = #{fPregrossweight}</if>
|
|
|
+ <if test="fPrenetweight != null ">and leg.f_prenetweight = #{fPrenetweight}</if>
|
|
|
+ <if test="fQtyd != null ">and leg.f_qtyD = #{fQtyd}</if>
|
|
|
+ <if test="fTrademodeid != null ">and leg.f_trademodeid = #{fTrademodeid}</if>
|
|
|
+ <if test="fGoodsid != null ">and leg.f_goodsid = #{fGoodsid}</if>
|
|
|
+ <if test="fVolumnd != null ">and leg.f_volumnD = #{fVolumnd}</if>
|
|
|
+ <if test="fGrossweightd != null ">and leg.f_grossweightD = #{fGrossweightd}</if>
|
|
|
+ <if test="fNetweightd != null ">and leg.f_netweightD = #{fNetweightd}</if>
|
|
|
+ <if test="fVolumnc != null ">and leg.f_volumnC = #{fVolumnc}</if>
|
|
|
+ <if test="fQtyc != null ">and leg.f_qtyC = #{fQtyc}</if>
|
|
|
+ <if test="fOriginalbilldate != null ">and leg.f_originalbilldate = #{fOriginalbilldate}</if>
|
|
|
+ <if test="fMarks != null and fMarks != ''">and leg.f_marks = #{fMarks}</if>
|
|
|
+ <if test="fQtyblc != null ">and leg.f_qtyblc = #{fQtyblc}</if>
|
|
|
+ <if test="fGrossweightc != null ">and leg.f_grossweightC = #{fGrossweightc}</if>
|
|
|
+ <if test="fNetweightc != null ">and leg.f_netweightC = #{fNetweightc}</if>
|
|
|
+ <if test="fGrossweightblc != null ">and leg.f_grossweightblc = #{fGrossweightblc}</if>
|
|
|
+ <if test="fNetweightblc != null ">and leg.f_netweightblc = #{fNetweightblc}</if>
|
|
|
+ <if test="fCntrno != null and fCntrno != ''">and leg.f_cntrno LIKE concat('%', #{fCntrno}, '%')</if>
|
|
|
+ <if test="fMblno != null ">and leg.f_mblno LIKE concat('%', #{fMblno}, '%') </if>
|
|
|
+ <if test="fStatus != null and fStatus != ''">and leg.f_status = #{fStatus}</if>
|
|
|
+ <if test="fWarehouseid != null ">and leg.f_warehouseid = #{fWarehouseid} </if>
|
|
|
+ <if test="fLocation != null and fLocation ==1 ">
|
|
|
+ and leg.f_warehouse_locationid = #{fWarehouseLocationid}
|
|
|
+ </if>
|
|
|
+ <if test="fLocation != null and fLocation ==0 ">
|
|
|
+ and ware.ancestors LIKE concat('%', #{fWarehouseLocationid}, '%')
|
|
|
+ </if>
|
|
|
+ </where>
|
|
|
+ ${params.dataScope}
|
|
|
+ </select>
|
|
|
+ <!--<select id="selectInventoryList" parameterType="TWhgenleg" resultType="Map">
|
|
|
+ select
|
|
|
+ leg.f_id AS fId,
|
|
|
+ leg.f_corpid AS fCorpIds,
|
|
|
+ corp.f_name AS fCorpid,
|
|
|
+ ware.f_warehouse_information AS fWarehouseids,
|
|
|
+ area.f_name AS fWarehouseLocationids,
|
|
|
+ leg.f_originalbillno AS fOriginalbillno,
|
|
|
+ leg.f_warehouse_locationid AS fWarehouseLocationid,
|
|
|
+ dict1.dict_label AS fTrademodeid,
|
|
|
+ goods.f_name AS fGoodsids,
|
|
|
+ leg.f_trademodeid AS fTrademodeids,
|
|
|
+ goods.f_packagespecs AS fPackagespecs,
|
|
|
+ leg.f_goodsid AS fGoodsid,
|
|
|
+ SUM(leg.f_volumnD) AS fVolumnD,
|
|
|
+ SUM(leg.f_qtyD) AS fQtyD,
|
|
|
+ leg.f_mblno AS fMblno,
|
|
|
+ SUM(leg.f_grossweightD) AS fGrossweightD,
|
|
|
+ SUM(leg.f_netweightD) AS fNetweightD,
|
|
|
+ SUM(leg.f_volumnC) AS fVolumnC,
|
|
|
+ SUM(leg.f_volumnblc) AS fVolumnblc,
|
|
|
+ SUM(leg.f_qtyC) AS fQtyC,
|
|
|
+ leg.f_business_type AS fBusinessType,
|
|
|
+ SUM(leg.f_grossweightC) AS fGrossweightC,
|
|
|
+ SUM(leg.f_netweightC) AS fNetweightC,
|
|
|
+ SUM(leg.f_qtyblc) AS fQtyblc,
|
|
|
+ leg.f_billingway AS fBillingway,
|
|
|
+ leg.f_chargedate AS fChargedate,
|
|
|
+ SUM(leg.f_grossweightblc) AS fGrossweightblc,
|
|
|
+ SUM(leg.f_netweightblc) AS fNetweightblc,
|
|
|
+ dict.dict_label AS fBusinessTypes,
|
|
|
+ leg.f_marks AS fMarks,
|
|
|
+ DATE_FORMAT( leg.create_time, '%Y-%m-%d' ) AS createTime,
|
|
|
+ DATE_FORMAT( leg.f_originalbilldate, '%Y-%m-%d' ) AS fOriginalbilldate,
|
|
|
+ leg.f_cntrno AS fCntrno
|
|
|
+ FROM
|
|
|
+ t_whgenleg leg
|
|
|
+ left join sys_user u on leg.create_by = u.user_name
|
|
|
+ left join sys_dept d on u.dept_id = d.dept_id
|
|
|
+ LEFT JOIN t_corps corp ON corp.f_id = leg.f_corpid
|
|
|
+ LEFT JOIN t_goods goods ON goods.f_id = leg.f_goodsid
|
|
|
+ LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouse_locationid
|
|
|
+ LEFT JOIN sys_dict_data dict ON dict.dict_value = leg.f_business_type
|
|
|
+ LEFT JOIN t_warehouse_area area ON area.f_id = leg.f_warehouse_locationid
|
|
|
+ LEFT JOIN sys_dict_data dict1 ON dict1.dict_value = leg.f_trademodeid
|
|
|
+ <where>
|
|
|
+ dict.status = '0'
|
|
|
+ AND dict1.status = '0'
|
|
|
+ AND dict.dict_type = 'storage_type'
|
|
|
+ AND dict1.dict_type = 'data_trademodes'
|
|
|
+ <if test="fOriginalbillno != null and fOriginalbillno != ''">and leg.f_originalbillno = #{fOriginalbillno}</if>
|
|
|
+ <if test="fPreqty != null ">and leg.f_preqty = #{fPreqty}</if>
|
|
|
+ <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
|
|
|
<if test="fMblno != null ">and leg.f_mblno LIKE concat('%', #{fMblno}, '%') </if>
|
|
|
<if test='orgStorageDate != null and orgStorageDate[0] != null and orgStorageDate[0]!= ""'>
|
|
|
and leg.f_originalbilldate >= #{orgStorageDate[0]}
|
|
|
@@ -548,8 +637,9 @@
|
|
|
and ware.ancestors LIKE concat('%', #{fWarehouseLocationid}, '%')
|
|
|
</if>
|
|
|
</where>
|
|
|
+ GROUP BY leg.f_corpid, leg.f_mblno, leg.f_originalbillno, leg.f_originalbilldate, leg.f_warehouse_locationid, leg.f_goodsid, leg.f_trademodeid
|
|
|
${params.dataScope}
|
|
|
- </select>
|
|
|
+ </select>-->
|
|
|
|
|
|
<select id="selectWhgenlegList" resultType="java.util.Map">
|
|
|
select
|
lazhaoqian