|
|
@@ -665,7 +665,7 @@ ShortText1617865626160 '一级分类',
|
|
|
->leftJoin("good_zixun wgz", "wgz.spuCode=wpo.spuCode")
|
|
|
->leftJoin("supplier ws", "ws.code=wpo.supplierNo")
|
|
|
->where('woo.status', ">=", 2)
|
|
|
- ->whereBetween('woo.addtime', [$start, $end])
|
|
|
+ ->whereBetween('woo.sendtime', [$start, $end])
|
|
|
->field(" year(`a`.`addtime`) AS `年`,month(`a`.`addtime`) AS `月`,dayofmonth(`a`.`addtime`) AS `日`,a.supplierNo as '公司名称', a.apply_id '业务部门名称' ,a.apply_name as '业务人员',a.order_type as '订单类型',a.good_type as '商品类型',woo.outCode '发货编号',`woo`.`send_num` AS `本次发货数量`,`woo`.`sendtime` AS `本次发货时间`,`woo`.`orderCode` AS `确认单编号`,`a`.`good_code` AS `商品编号`,'' as '一级分类','' as '二级分类',a.cat_id as '三级分类','' as '财务核算编码',a.good_name as '商品名称',ifnull( `wgb`.`good_unit`, `wgz`.`good_unit` ) as '单位',`a`.`good_num` AS `下单数量`,`wpo`.`cgdNo` AS `采购单单号`,`wpo`.`cgder` AS `采购员`,`ws`.`name` AS `供应商名称`,`wgb`.`is_stock` as '是否库存品',if (`wgb`.`is_stock`=1,wpo.bkcode,wpo.cgdNo) as '发货方式',ifnull( `wor`.`thNo`, '' ) AS `退货编号`,ifnull( `wor`.`return_num`, '' ) AS `退货数量`,'' as '售前退货数量'")
|
|
|
->cursor();
|
|
|
$order_tyepe = ["库存销售", '非库存销售', '咨询销售', '项目销售', '平台库存销售', '平台非库存销售'];
|
|
|
@@ -743,7 +743,7 @@ ShortText1617865626160 '一级分类',
|
|
|
->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 '销售单号',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 = [];
|
