|
|
@@ -459,7 +459,7 @@ class NowReportHandle extends Command
|
|
|
->leftJoin("warehouse_info wwi","wwi.wsm_code = wpo.wsm_code")
|
|
|
->where('woo.status',">=", 2)
|
|
|
->where('a.order_type',"=", 1)
|
|
|
- ->whereBetween('woo.addtime', [$start, $end])
|
|
|
+ ->whereBetween('woo.sendtime', [$start, $end])
|
|
|
->field("wpo.companyNo '业务公司',
|
|
|
bkcode '备库单号',
|
|
|
woo.orderCode '销售单号',
|
|
|
@@ -736,14 +736,12 @@ ShortText1617865626160 '一级分类',
|
|
|
->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("order_back wor", "wor.outCode=woo.outCode and wor.status=4 and wor.is_del=0")
|
|
|
+ ->leftJoin("purchease_order wpo", "wpo.cgdNo=won.cgdNo and wpo.is_del=0")
|
|
|
+ ->leftJoin("good_basic wgb", "wgb.spuCode=wpo.spuCode and wgb.is_del=0")
|
|
|
->leftJoin("supplier ws", "ws.code=wpo.supplierNo")
|
|
|
->leftJoin("warehouse_info wwi", "wwi.wsm_code = wpo.wsm_code")
|
|
|
- ->where('woo.status', ">=", 2)
|
|
|
- ->where('a.order_type', "=", 1)
|
|
|
- ->whereBetween('woo.sendtime', [$start, $end])
|
|
|
+ ->where([['woo.status', ">=", 2],['a.order_type', "=", 1],['woo.addtime','between', [$start, $end]]])
|
|
|
->field("wpo.companyNo '业务公司',bkcode '备库单号',woo.orderCode '销售单号',woo.outCode '出库单号',wpo.cgdNo '采购单号',wpo.spuCode '商品编号','' as '一级分类','' as '二级分类',wgb.cat_id as '三级分类',wpo.good_name as '商品名称',woo.send_num'出库数量',woo.sendtime '本次出库时间',a.apply_id as '业务部门',a.apply_name as '业务员',wpo.cgder as '采购员',wor.return_num '出库退货数量',wwi.wsm_type '仓库类型',ws.name '供应商名称',wwi.name '仓库名称'")
|
|
|
->cursor();
|
|
|
$data = [];
|
