|
|
@@ -234,7 +234,7 @@
|
|
|
resultType="com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems">
|
|
|
SELECT
|
|
|
( @ii := @ii + 1 ) AS fId,
|
|
|
- wi.f_billno AS fMblno,
|
|
|
+ wi.src_bill_no AS fMblno,
|
|
|
CASE
|
|
|
wi.f_billtype
|
|
|
WHEN 'SJRK' THEN
|
|
|
@@ -244,7 +244,7 @@
|
|
|
WHEN 'KCZZ' THEN
|
|
|
'库存总账'
|
|
|
END AS fBilltype,
|
|
|
- g.f_name AS fGoodsid,
|
|
|
+ wi.f_product_name AS fGoodsid,
|
|
|
wi.f_marks AS fMarks,
|
|
|
/*'' AS fBillingQty1,*/
|
|
|
wi.f_billing_qty AS fBillingQty,
|
|
|
@@ -258,8 +258,8 @@
|
|
|
wi.f_amt AS fAmt2
|
|
|
FROM
|
|
|
t_warehousebills w
|
|
|
- LEFT JOIN t_warehousebillsitems wi ON w.f_id = wi.f_pid
|
|
|
- LEFT JOIN t_goods g ON g.f_id = wi.f_goodsid,(
|
|
|
+ LEFT JOIN t_warehousebillsfees wi ON w.f_id = wi.f_pid
|
|
|
+ ,(
|
|
|
SELECT
|
|
|
@ii := 0
|
|
|
) AS ii
|
maxianghua