|
|
@@ -379,7 +379,7 @@
|
|
|
LEFT JOIN t_corps corpSub ON corpSub.f_id = bill.f_sbu
|
|
|
LEFT JOIN t_warehouse ware ON ware.f_id = bill.f_warehouseid
|
|
|
LEFT JOIN t_warehouse ware1 ON ware1.f_id = bill.f_inwarehouseid
|
|
|
- LEFT JOIN t_warehousebillsitems item ON item.f_pid = bill.f_id
|
|
|
+ LEFT JOIN t_warehousebillsitems item ON item.f_pid = bill.f_id and item.del_flag = '0'
|
|
|
LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
|
|
|
LEFT JOIN sys_dict_data dictIn ON dictIn.dict_value = bill.f_business_type and dictIn.dict_type in ('st_in_type','st_out_type','st_trans_type')
|
|
|
LEFT JOIN (
|
|
|
@@ -409,7 +409,6 @@
|
|
|
) twfC ON twfC.f_pid = bill.f_id
|
|
|
<where>
|
|
|
bill.del_flag = '0'
|
|
|
- and item.del_flag = '0'
|
|
|
<if test="fTypeid == null or fTypeid == ''">and bill.f_typeid IS NULL</if>
|
|
|
<if test="fTypeid != null and fTypeid != ''">and bill.f_typeid = #{fTypeid}</if>
|
|
|
<if test="fFeeStatus != null and fFeeStatus != ''">and bill.f_fee_status = #{fFeeStatus}</if>
|
|
|
@@ -612,14 +611,13 @@
|
|
|
LEFT JOIN t_corps corpSub ON corpSub.f_id = bill.f_sbu
|
|
|
LEFT JOIN t_warehouse ware ON ware.f_id = bill.f_warehouseid
|
|
|
LEFT JOIN t_warehouse ware1 ON ware1.f_id = bill.f_inwarehouseid
|
|
|
- LEFT JOIN t_warehousebillsitems item ON item.f_pid = bill.f_id
|
|
|
+ LEFT JOIN t_warehousebillsitems item ON item.f_pid = bill.f_id and item.del_flag = '0'
|
|
|
LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
|
|
|
LEFT JOIN sys_dict_data dict ON dict.dict_value = bill.f_trademodeid
|
|
|
LEFT JOIN t_fee tf on tf.t_mblno = bill.f_mblno
|
|
|
<where>
|
|
|
dict.status = '0'
|
|
|
and bill.del_flag = '0'
|
|
|
- and item.del_flag = '0'
|
|
|
AND dict.dict_type = 'data_trademodes'
|
|
|
AND bill.f_typeid IS NULL
|
|
|
<if test="fFeeStatus != null and fFeeStatus != ''">and bill.f_fee_status = #{fFeeStatus}</if>
|
|
|
@@ -3542,7 +3540,7 @@
|
|
|
SELECT DISTINCT w.f_id AS fId, w.f_billno AS fBillno, corp.f_name AS fCorpid, w.f_billing_deadline AS fBillingDeadline, w.remark,
|
|
|
w.f_billstatus AS fBillstatus, w.create_by AS createBy, w.create_time AS createTime, w.f_fee_status fFeeStatus,
|
|
|
w.f_trademodeid AS fTrademodeid,dict.dict_label AS fTrademodeName ,w.checklists AS checklists
|
|
|
- FROM t_warehousebills w LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id
|
|
|
+ FROM t_warehousebills w LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id and item.del_flag = '0'
|
|
|
LEFT JOIN t_corps corp ON corp.f_id = w.f_corpid
|
|
|
left join sys_user u on w.create_by = u.user_name
|
|
|
left join sys_user u1 on w.f_storekeeper = u1.user_name
|
纪新园