|
|
@@ -53,12 +53,13 @@
|
|
|
<result property="fIsPass" column="f_is_pass"/>
|
|
|
<result property="fBilltype" column="f_billtype"/>
|
|
|
<result property="fBillingQty" column="f_billing_qty"/>
|
|
|
+ <result property="fIsInventory" column="f_is_inventory"/>
|
|
|
<result property="fBusinessType" column="f_business_type"/>
|
|
|
<result property="fBillingDeadline" column="f_billing_deadline"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectTWarehousebillsitemsVo">
|
|
|
- select f_id, f_pid, f_lineno, f_srcid, f_goodsid, f_billno, f_warehouselocid, f_mblno, f_originalbillno, f_bsdate, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_planvolumn, f_originalbilldate, f_transfer_warehouselocid, f_planqty, f_billingway, f_plangrossweight, f_packagespecs, f_chargedate, f_plannetweight, f_qty, f_grossweight, f_volumn, f_netweight, f_cntrno, f_truckno, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark, f_marks, f_inventory_days, f_storage_fee_deadline, f_amt, f_billing_days, f_driver_name, f_driver_tel, f_driver_id_car, f_serial_number, f_is_pass, f_billtype, f_billing_qty, f_billing_deadline, f_business_type from t_warehousebillsitems
|
|
|
+ select f_id, f_pid, f_lineno, f_srcid, f_goodsid, f_billno, f_warehouselocid, f_mblno, f_originalbillno, f_bsdate, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_planvolumn, f_originalbilldate, f_transfer_warehouselocid, f_planqty, f_billingway, f_plangrossweight, f_packagespecs, f_chargedate, f_plannetweight, f_qty, f_grossweight, f_volumn, f_netweight, f_cntrno, f_truckno, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark, f_marks, f_inventory_days, f_storage_fee_deadline, f_amt, f_billing_days, f_driver_name, f_driver_tel, f_driver_id_car, f_serial_number, f_is_pass, f_billtype, f_billing_qty, f_billing_deadline, f_business_type, f_is_inventory from t_warehousebillsitems
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectTWarehousebillsitemsList" parameterType="TWarehousebillsitems"
|
|
|
@@ -83,8 +84,9 @@
|
|
|
<if test="fPlanqty != null ">and f_planqty = #{fPlanqty}</if>
|
|
|
<if test="fPlanvolumn != null ">and f_planvolumn = #{fPlanvolumn}</if>
|
|
|
<if test="fChargedate != null ">and f_chargedate = #{fChargedate}</if>
|
|
|
- <if test="fBusinessType != null "> and f_business_type = #{fBusinessType}</if>
|
|
|
+ <if test="fIsInventory != null ">and f_is_inventory = #{fIsInventory}</if>
|
|
|
<if test="fPackagespecs != null ">and f_packagespecs = #{fPackagespecs}</if>
|
|
|
+ <if test="fBusinessType != null "> and f_business_type = #{fBusinessType}</if>
|
|
|
<if test="fPlangrossweight != null ">and f_plangrossweight = #{fPlangrossweight}</if>
|
|
|
<if test="fPlannetweight != null ">and f_plannetweight = #{fPlannetweight}</if>
|
|
|
<if test="fQty != null ">and f_qty = #{fQty}</if>
|
|
|
@@ -120,6 +122,7 @@
|
|
|
goods.f_name AS fGoodsids,
|
|
|
item.f_warehouselocid AS fWarehouselocid,
|
|
|
area.f_name AS fWarehouselocids,
|
|
|
+ ware.f_name AS fWarehouseids,
|
|
|
item.f_is_pass AS fIsPass,
|
|
|
item.f_originalbillno AS fOriginalbillno,
|
|
|
item.f_mblno AS fMblno,
|
|
|
@@ -145,6 +148,7 @@
|
|
|
item.f_serial_number AS fSerialNumber,
|
|
|
item.f_marks AS fMarks,
|
|
|
item.f_grossweight AS fGrossweight,
|
|
|
+ item.f_is_inventory AS fIsInventory,
|
|
|
item.f_business_type AS fBusinessType,
|
|
|
item.f_netweight AS fNetweight,
|
|
|
item.f_cntrno AS fCntrno,
|
|
|
@@ -155,6 +159,7 @@
|
|
|
t_warehousebillsitems item
|
|
|
LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
|
|
|
LEFT JOIN t_warehouse_area area ON area.f_id = item.f_warehouselocid
|
|
|
+ LEFT JOIN t_warehouse ware ON ware.f_id = area.f_warehouseid
|
|
|
<where>
|
|
|
<if test="fPid != null ">and item.f_pid = #{fPid}</if>
|
|
|
</where>
|
|
|
@@ -182,18 +187,18 @@
|
|
|
<if test="fCntqty != null">f_cntqty,</if>
|
|
|
<if test="fGoodsval != null">f_goodsval,</if>
|
|
|
<if test="fCntrtype != null">f_cntrtype,</if>
|
|
|
- <if test="fPlanvolumn != null">f_planvolumn,</if>
|
|
|
<if test="fOriginalbilldate != null">f_originalbilldate,</if>
|
|
|
+ <if test="fBillingway != null">f_billingway,</if>
|
|
|
<if test="fTransferWarehouselocid != null">f_transfer_warehouselocid,</if>
|
|
|
<if test="fPlanqty != null">f_planqty,</if>
|
|
|
- <if test="fBillingway != null">f_billingway,</if>
|
|
|
+ <if test="fPlanvolumn != null">f_planvolumn,</if>
|
|
|
+ <if test="fChargedate != null">f_chargedate,</if>
|
|
|
<if test="fPlangrossweight != null">f_plangrossweight,</if>
|
|
|
<if test="fPackagespecs != null">f_packagespecs,</if>
|
|
|
- <if test="fChargedate != null">f_chargedate,</if>
|
|
|
<if test="fPlannetweight != null">f_plannetweight,</if>
|
|
|
<if test="fQty != null">f_qty,</if>
|
|
|
- <if test="fGrossweight != null">f_grossweight,</if>
|
|
|
<if test="fVolumn != null">f_volumn,</if>
|
|
|
+ <if test="fGrossweight != null">f_grossweight,</if>
|
|
|
<if test="fNetweight != null">f_netweight,</if>
|
|
|
<if test="fCntrno != null">f_cntrno,</if>
|
|
|
<if test="fTruckno != null">f_truckno,</if>
|
|
|
@@ -218,6 +223,7 @@
|
|
|
<if test="fBillingQty != null">f_billing_qty,</if>
|
|
|
<if test="fBillingDeadline != null">f_billing_deadline,</if>
|
|
|
<if test="fBusinessType != null">f_business_type,</if>
|
|
|
+ <if test="fIsInventory != null">f_is_inventory,</if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="fPid != null">#{fPid},</if>
|
|
|
@@ -233,18 +239,18 @@
|
|
|
<if test="fCntqty != null">#{fCntqty},</if>
|
|
|
<if test="fGoodsval != null">#{fGoodsval},</if>
|
|
|
<if test="fCntrtype != null">#{fCntrtype},</if>
|
|
|
- <if test="fPlanvolumn != null">#{fPlanvolumn},</if>
|
|
|
<if test="fOriginalbilldate != null">#{fOriginalbilldate},</if>
|
|
|
+ <if test="fBillingway != null">#{fBillingway},</if>
|
|
|
<if test="fTransferWarehouselocid != null">#{fTransferWarehouselocid},</if>
|
|
|
<if test="fPlanqty != null">#{fPlanqty},</if>
|
|
|
- <if test="fBillingway != null">#{fBillingway},</if>
|
|
|
+ <if test="fPlanvolumn != null">#{fPlanvolumn},</if>
|
|
|
+ <if test="fChargedate != null">#{fChargedate},</if>
|
|
|
<if test="fPlangrossweight != null">#{fPlangrossweight},</if>
|
|
|
<if test="fPackagespecs != null">#{fPackagespecs},</if>
|
|
|
- <if test="fChargedate != null">#{fChargedate},</if>
|
|
|
<if test="fPlannetweight != null">#{fPlannetweight},</if>
|
|
|
<if test="fQty != null">#{fQty},</if>
|
|
|
- <if test="fGrossweight != null">#{fGrossweight},</if>
|
|
|
<if test="fVolumn != null">#{fVolumn},</if>
|
|
|
+ <if test="fGrossweight != null">#{fGrossweight},</if>
|
|
|
<if test="fNetweight != null">#{fNetweight},</if>
|
|
|
<if test="fCntrno != null">#{fCntrno},</if>
|
|
|
<if test="fTruckno != null">#{fTruckno},</if>
|
|
|
@@ -269,6 +275,7 @@
|
|
|
<if test="fBillingQty != null">#{fBillingQty},</if>
|
|
|
<if test="fBillingDeadline != null">#{fBillingDeadline},</if>
|
|
|
<if test="fBusinessType != null">#{fBusinessType},</if>
|
|
|
+ <if test="fIsInventory != null">#{fIsInventory},</if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
|
|
|
@@ -322,6 +329,7 @@
|
|
|
<if test="fIsPass != null">f_is_pass = #{fIsPass},</if>
|
|
|
<if test="fBilltype != null">f_billtype = #{fBilltype},</if>
|
|
|
<if test="fBillingQty != null">f_billing_qty = #{fBillingQty},</if>
|
|
|
+ <if test="fIsInventory != null">f_is_inventory = #{fIsInventory},</if>
|
|
|
<if test="fBillingDeadline != null">f_billing_deadline = #{fBillingDeadline},</if>
|
|
|
<if test="fBusinessType != null">f_business_type = #{fBusinessType},</if>
|
|
|
</trim>
|
|
|
@@ -356,6 +364,7 @@
|
|
|
item.f_volumn AS fVolumn,
|
|
|
item.f_marks AS fMarks,
|
|
|
item.f_billing_days AS fBillingDays,
|
|
|
+ item.f_is_inventory AS fIsInventory,
|
|
|
item.f_qty AS fQty,
|
|
|
item.f_grossweight AS fGrossweight,
|
|
|
item.f_netweight AS fNetweight,
|
阿伏兔