Эх сурвалжийг харах

Merge branch 'version1.5' into dev_wf

wufeng 2 жил өмнө
parent
commit
2baf263669

+ 4 - 3
app/command/NowReportHandle.php

@@ -356,8 +356,9 @@ class NowReportHandle extends Command
             ->whereBetween('wpi.addtime', [$start, $end])
             ->field("wpo.companyNo '业务公司',
                             bkcode '备库单号',
+                            wpi.wsm_in_code '入库单号',
                             wpi.cgdNo '采购单号',
-                               wpo.skuCode '商品编号',
+                              wpo.spuCode '商品编号',
                                '' as '一级分类',
                                '' as '二级分类',
                                 wgb.cat_id as '三级分类',
@@ -408,14 +409,14 @@ class NowReportHandle extends Command
                             bkcode '备库单号',
                             woo.orderCode '销售单号',
                             woo.outCode '出库单号',
-                               wpo.skuCode '商品编号',
+                               wpo.spuCode '商品编号',
                                '' as '一级分类',
                                '' as '二级分类',
                                 wgb.cat_id as '三级分类',
                                 wgb.cat_id as '财务核算编号',
                                wpo.good_name as '商品名称',
                             woo.send_num '出库库数量',
-                               round(woo.send_num* sale_price,2) '出库金额',
+                               round(woo.send_num* good_price,2) '出库金额',
                                woo.sendtime '本次出库时间',
                                 wgb.tax/100 '税率',
                             '' as '不含税出库金额',