|
@@ -10,6 +10,7 @@
|
|
|
<result property="fSrcid" column="f_srcid"/>
|
|
|
<result property="fLineno" column="f_lineno"/>
|
|
|
<result property="fBillno" column="f_billno"/>
|
|
|
+ <result property="fShipper" column="f_shipper"/>
|
|
|
<result property="fGoodsid" column="f_goodsid"/>
|
|
|
<result property="fSrcBsdate" column="f_src_bsdate"/>
|
|
|
<result property="fMblno" column="f_mblno"/>
|
|
@@ -106,7 +107,7 @@
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectTWarehousebillsitemsVo">
|
|
|
- select f_id, f_pid, f_srcid, f_lineno, f_billno, f_goodsid, f_mblno, f_src_bsdate, f_originalbillno, f_transfer_warehouselocid, f_warehouselocid,
|
|
|
+ select f_id, f_pid, f_srcid, f_lineno, f_billno, f_shipper, f_goodsid, f_mblno, f_src_bsdate, f_originalbillno, f_transfer_warehouselocid, f_warehouselocid,
|
|
|
f_originalbilldate, f_bsdate, f_billingway, f_chargedate, f_boxno, f_goodsval, f_cntqty, f_packagespecs, f_cntrtype, f_planvolumn,
|
|
|
f_planqty, f_plangrossweight, f_plannetweight, f_volumn, f_qty, f_grossweight, f_netweight, f_cntrno, f_truckno, f_marks, f_actual_weight, f_billstatus,
|
|
|
del_flag, create_by, create_time, update_by, update_time, remark, f_inventory_days, f_storage_fee_deadline, f_amt, f_billing_days,
|
|
@@ -124,6 +125,7 @@
|
|
|
<if test="fGoodsid != null ">and f_goodsid = #{fGoodsid}</if>
|
|
|
<if test="fMblno != null and fMblno != ''">and f_mblno = #{fMblno}</if>
|
|
|
<if test="fBillno != null and fBillno != ''">and f_billno = #{fBillno}</if>
|
|
|
+ <if test="fShipper != null and fShipper != ''">and f_shipper like concat('%', #{fShipper}, '%')</if>
|
|
|
<if test="fSrcBsdate != null ">and f_src_bsdate = #{fSrcBsdate}</if>
|
|
|
<if test="fWarehouselocid != null ">and f_warehouselocid = #{fWarehouselocid}</if>
|
|
|
<if test="fBsdate != null ">and f_bsdate = #{fBsdate}</if>
|
|
@@ -178,6 +180,7 @@
|
|
|
item.f_srcid AS fSrcid,
|
|
|
item.f_lineno AS fLineno,
|
|
|
item.f_billno AS fBillno,
|
|
|
+ item.f_shipper AS fShipper,
|
|
|
item.f_goodsid AS fGoodsid,
|
|
|
goods.f_name AS fGoodsids,
|
|
|
goods.if_cntrno AS ifCntrno,
|
|
@@ -262,6 +265,7 @@
|
|
|
<if test="fSrcid != null">f_srcid,</if>
|
|
|
<if test="fLineno != null">f_lineno,</if>
|
|
|
<if test="fBillno != null">f_billno,</if>
|
|
|
+ <if test="fShipper != null">f_shipper,</if>
|
|
|
<if test="fGoodsid != null">f_goodsid,</if>
|
|
|
<if test="fMblno != null">f_mblno,</if>
|
|
|
<if test="fSrcBsdate != null">f_src_bsdate,</if>
|
|
@@ -331,6 +335,7 @@
|
|
|
<if test="fSrcid != null">#{fSrcid},</if>
|
|
|
<if test="fLineno != null">#{fLineno},</if>
|
|
|
<if test="fBillno != null">#{fBillno},</if>
|
|
|
+ <if test="fShipper != null">#{fShipper},</if>
|
|
|
<if test="fGoodsid != null">#{fGoodsid},</if>
|
|
|
<if test="fMblno != null">#{fMblno},</if>
|
|
|
<if test="fSrcBsdate != null">#{fSrcBsdate},</if>
|
|
@@ -403,6 +408,7 @@
|
|
|
<if test="fSrcid != null">f_srcid = #{fSrcid},</if>
|
|
|
<if test="fLineno != null">f_lineno = #{fLineno},</if>
|
|
|
<if test="fBillno != null">f_billno = #{fBillno},</if>
|
|
|
+ <if test="fShipper != null">f_shipper = #{fShipper},</if>
|
|
|
<if test="fGoodsid != null">f_goodsid = #{fGoodsid},</if>
|
|
|
<if test="fMblno != null">f_mblno = #{fMblno},</if>
|
|
|
<if test="fSrcBsdate != null">f_src_bsdate = #{fSrcBsdate},</if>
|
|
@@ -499,6 +505,7 @@
|
|
|
ware.f_warehouseid AS warehouse,
|
|
|
item.f_id AS fId,
|
|
|
item.f_billno AS fBillno,
|
|
|
+ item.f_shipper AS fShipper,
|
|
|
item.f_goodsid AS fGoodsid,
|
|
|
item.f_bsdate AS fBsdate,
|
|
|
item.f_billingway AS fBillingway,
|
|
@@ -534,6 +541,7 @@
|
|
|
<if test="warehouse.fGoodsid != null and warehouse.fGoodsid != ''">and item.f_goodsid = #{warehouse.fGoodsid}</if>
|
|
|
<if test="warehouse.fWarehouseid != null and warehouse.fWarehouseid != ''">and ware.f_warehouseid = #{warehouse.fWarehouseid}</if>
|
|
|
<if test="warehouse.fMblno != null and warehouse.fMblno != ''">and item.f_mblno like concat('%',#{warehouse.fMblno},'%')</if>
|
|
|
+ <if test="warehouse.fShipper != null and warehouse.fShipper != ''">and item.f_shipper like concat('%',#{warehouse.fShipper},'%')</if>
|
|
|
</where>
|
|
|
</select>
|
|
|
|
|
@@ -542,6 +550,7 @@
|
|
|
ware.f_warehouseid,
|
|
|
item.f_id,
|
|
|
item.f_billno,
|
|
|
+ item.f_shipper,
|
|
|
item.f_goodsid,
|
|
|
item.f_bsdate,
|
|
|
item.f_billingway,
|
|
@@ -576,6 +585,7 @@
|
|
|
<if test="warehouse.fGoodsid != null and warehouse.fGoodsid != ''">and item.f_goodsid = #{warehouse.fGoodsid}</if>
|
|
|
<if test="warehouse.fWarehouseid != null and warehouse.fWarehouseid != ''">and ware.f_warehouseid = #{warehouse.fWarehouseid}</if>
|
|
|
<if test="warehouse.fMblno != null and warehouse.fMblno != ''">and item.f_mblno like concat('%',#{warehouse.fMblno},'%')</if>
|
|
|
+ <if test="warehouse.fShipper != null and warehouse.fShipper != ''">and item.f_shipper like concat('%',#{warehouse.fShipper},'%')</if>
|
|
|
</where>
|
|
|
</select>
|
|
|
|
|
@@ -716,6 +726,7 @@
|
|
|
SELECT
|
|
|
t.f_id fId,
|
|
|
t.f_pid fPid,
|
|
|
+ t.f_shipper fShipper,
|
|
|
t.f_bsdate bsdate,
|
|
|
corp.f_name corpName,
|
|
|
t.f_mblno fMblno,
|
|
@@ -924,7 +935,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectListByCorpId" resultMap="TWarehousebillsitemsResult">
|
|
|
- select t.f_tocorpid, item.f_id, item.f_goodsid, item.f_mblno, item.f_originalbillno, item.f_transfer_warehouselocid,
|
|
|
+ select t.f_tocorpid, item.f_id, item.f_shipper, item.f_goodsid, item.f_mblno, item.f_originalbillno, item.f_transfer_warehouselocid,
|
|
|
item.f_warehouselocid, item.f_originalbilldate, item.f_bsdate, item.f_billingway, item.f_chargedate, item.f_boxno, item.f_goodsval,
|
|
|
item.f_cntqty, item.f_volumn, item.f_qty, item.f_grossweight, item.f_netweight, item.f_cntrno, item.f_marks, item.f_billtype
|
|
|
from t_warehousebills t LEFT JOIN t_warehousebillsitems item ON item.f_pid = t.f_id
|
|
@@ -984,7 +995,7 @@
|
|
|
<select id="biInAndOutStockList" resultType="map">
|
|
|
select
|
|
|
ifnull(tc.f_cname, tc.f_name) as customerName,
|
|
|
- ifnull(tb.f_shipper, tc.f_name) as shipper,
|
|
|
+ ifnull(ifnull(tb.f_shipper, tc.f_cname), tc.f_name) as shipper,
|
|
|
ts.f_warehouse_information as warehouseName,
|
|
|
tg.f_name as goodsName,
|
|
|
concat(ts.f_qty, '/',
|