|
|
@@ -365,8 +365,8 @@ class NowReportHandle extends Command
|
|
|
wgb.cat_id as '三级分类',
|
|
|
wgb.cat_id as '财务核算编号',
|
|
|
wpo.good_name as '商品名称',
|
|
|
- wpi.send_num '入库数量',
|
|
|
- round(wpi.send_num* good_price,2) '入库金额',
|
|
|
+ if(wpi.status=4,wpi.send_num,wpi.wsm_num) '入库数量',
|
|
|
+ round( if(wpi.status=4,wpi.send_num,wpi.wsm_num) * good_price, 2 ) '入库金额',
|
|
|
wpo.updatetime '本次入库时间',
|
|
|
wgb.tax/100 '采购税率',
|
|
|
'' as '不含税入库金额',
|
|
|
@@ -399,6 +399,7 @@ class NowReportHandle extends Command
|
|
|
public function F($start,$end){
|
|
|
$list =Db::name("order_out")->alias('woo')->leftJoin("sale a","a.orderCode=woo.orderCode")
|
|
|
->leftJoin("order_num won","won.orderCode=a.orderCode")
|
|
|
+ ->leftJoin("order_back wor","wor.outCode=woo.outCode and wor.status=4")
|
|
|
->leftJoin("purchease_order wpo","wpo.cgdNo=won.cgdNo")
|
|
|
->leftJoin("good_basic wgb","wgb.spuCode=wpo.spuCode")
|
|
|
->leftJoin("supplier ws","ws.code=wpo.supplierNo")
|
|
|
@@ -416,16 +417,17 @@ class NowReportHandle extends Command
|
|
|
wgb.cat_id as '三级分类',
|
|
|
wgb.cat_id as '财务核算编号',
|
|
|
wpo.good_name as '商品名称',
|
|
|
- woo.send_num '出库库数量',
|
|
|
- round(woo.send_num* good_price,2) '出库金额',
|
|
|
+ woo.send_num'出库数量',
|
|
|
+ round( woo.send_num* good_price,2) '出库金额',
|
|
|
woo.sendtime '本次出库时间',
|
|
|
wgb.tax/100 '税率',
|
|
|
'' as '不含税出库金额',
|
|
|
- '' as '税额',
|
|
|
+ ''as '税额',
|
|
|
a.apply_id as '业务部门',
|
|
|
a.apply_name as '业务员',
|
|
|
wpo.cgder as '采购员',
|
|
|
nake_fee '成本裸价',
|
|
|
+ wor.return_num 出库退货数量',
|
|
|
wsm_type '仓库类型',
|
|
|
ws.name '供应商名称',
|
|
|
wwi.name '仓库名称'
|
