|
|
@@ -206,11 +206,11 @@ class NowReportHandle extends Command
|
|
|
$value['申请部门'] = get_company_name_by_uid(intval($value['申请部门']));
|
|
|
$value['一级分类'] = isset($cat[0]['name'])?$cat[0]['name']:"";
|
|
|
$value['可用库存金额'] = bcmul((string)$value['可用库存数量'] ?? '0', (string)$value['成本单价'] ?? '0', 2);
|
|
|
- $value['当前库存金额'] = bcmul((string)$value['当前库存'] ?? '0', (string)$value['成本单价'] ?? '0', 2);
|
|
|
+ $value['当前库存金额'] = bcmul((string)$value['当前库存数量'] ?? '0', (string)$value['成本单价'] ?? '0', 2);
|
|
|
// $value['最近入库时间'] =Db::name("purchease_order")->alias("a")->leftJoin("purchease_in c","a.cgdNo=c.cgdNo")->where(["spuCode"=>$value['产品编号'],"order_type"=>1,"order_source"=>0,"c.status"=>[4,6]])->order("a.addtime desc")->value("c.addtime","");
|
|
|
if (!empty($value['备库创建时间'])) {
|
|
|
- $value['保质期时间'] = date('Y-m-d H:i:s', strtotime($value['最近入库时间']) + 31536000);//365天之后
|
|
|
- $value['库存天数'] = bcdiv((string)(time() - strtotime($value['最近入库时间'])), (string)(24 * 3600));//365天之后
|
|
|
+ $value['保质期时间'] = date('Y-m-d H:i:s', strtotime($value['备库创建时间']) + 31536000);//365天之后
|
|
|
+ $value['库存天数'] = bcdiv((string)(time() - strtotime($value['备库创建时间'])), (string)(24 * 3600));//365天之后
|
|
|
}
|
|
|
yield $list[] = $value;
|
|
|
}
|
|
|
@@ -466,27 +466,27 @@ class NowReportHandle extends Command
|
|
|
bkcode '备库单号',
|
|
|
woo.orderCode '销售单号',
|
|
|
woo.outCode '出库单号',
|
|
|
- wpo.cgdNo '采购单号',
|
|
|
- wpo.spuCode '商品编号',
|
|
|
- '' as '一级分类',
|
|
|
- '' as '二级分类',
|
|
|
- wgb.cat_id as '三级分类',
|
|
|
- wgb.cat_id as '财务核算编号',
|
|
|
- wpo.good_name as '商品名称',
|
|
|
- woo.send_num'出库数量',
|
|
|
- round( woo.send_num* wpo.good_price,2) '出库金额',
|
|
|
- woo.sendtime '本次出库时间',
|
|
|
- wgb.tax/100 '税率',
|
|
|
+ wpo.cgdNo '采购单号',
|
|
|
+ wpo.spuCode '商品编号',
|
|
|
+ '' as '一级分类',
|
|
|
+ '' as '二级分类',
|
|
|
+ wgb.cat_id as '三级分类',
|
|
|
+ wgb.cat_id as '财务核算编号',
|
|
|
+ wpo.good_name as '商品名称',
|
|
|
+ woo.send_num'出库数量',
|
|
|
+ round( woo.send_num* wpo.good_price,2) '出库金额',
|
|
|
+ woo.sendtime '本次出库时间',
|
|
|
+ wgb.tax/100 '税率',
|
|
|
'' as '不含税出库金额',
|
|
|
''as '税额',
|
|
|
- a.apply_id as '业务部门',
|
|
|
- a.apply_name as '业务员',
|
|
|
- wpo.cgder as '采购员',
|
|
|
- wpo.good_price '成本裸价',
|
|
|
- wor.return_num '出库退货数量',
|
|
|
- wwi.wsm_type '仓库类型',
|
|
|
- ws.name '供应商名称',
|
|
|
- wwi.name '仓库名称'
|
|
|
+ a.apply_id as '业务部门',
|
|
|
+ a.apply_name as '业务员',
|
|
|
+ wpo.cgder as '采购员',
|
|
|
+ wpo.good_price '成本裸价',
|
|
|
+ wor.return_num '出库退货数量',
|
|
|
+ wwi.wsm_type '仓库类型',
|
|
|
+ ws.name '供应商名称',
|
|
|
+ wwi.name '仓库名称'
|
|
|
")->cursor();
|
|
|
$data=[];
|
|
|
foreach($list as $value){
|
|
|
@@ -511,47 +511,47 @@ class NowReportHandle extends Command
|
|
|
$list =$db->name("cgd_info")
|
|
|
->where(['ShortText1617866362204'=>'客服确认单'])->whereBetweenTime('createdTime',$start,$end)->field(
|
|
|
"year(createdTime) AS `年`,
|
|
|
-month(createdTime) AS `月`,
|
|
|
-dayofmonth(createdTime) AS `日`,
|
|
|
-ShortText1618270466672 '公司名称',
|
|
|
-department '业务部门',
|
|
|
-ownerName '业务人员',
|
|
|
-ShortText1617866362204 '订单类型',
|
|
|
-'' as '商品类型',
|
|
|
-'' as '发货编号',
|
|
|
-Number1618240600907 '本次发货数量',
|
|
|
-createdTime '本次发货时间',
|
|
|
-ShortText1617866360004 '确认单编号',
|
|
|
-ShortText1617861001482 '商品编号',
|
|
|
-ShortText1617865626160 '一级分类',
|
|
|
-''as '二级分类',
|
|
|
-'' as '三级分类',
|
|
|
- '' as '财务核算编码',
|
|
|
- ShortText1617861966146 as '商品名称',
|
|
|
- ShortText1617865685744 as '单位',
|
|
|
- Number1618240600907 '下单数量',
|
|
|
- '' AS `销售货款`,
|
|
|
- ShortText1618315935182 as '采购单单号',
|
|
|
- ownerName '采购员',
|
|
|
- Number1617865804813 AS `采购裸价`,
|
|
|
- Number1617865807879 AS `加标费`,
|
|
|
- Number1617865810822 AS `包装费`,
|
|
|
- Number1617865813284 AS `证书费`,
|
|
|
- Number1617865816181 AS `开模费`,
|
|
|
- number1618240204358 AS `工艺费`,
|
|
|
- number1618240287778 AS `物流费`,
|
|
|
- Number1617865818517 AS `成本合计`,
|
|
|
- Number1618240685904 AS `采购货款`,
|
|
|
- ShortText1617865688485 AS `采购税点`,
|
|
|
- ShortText1620399144946 AS `供应商名称`,
|
|
|
- '否'as '是否库存品',
|
|
|
- '' as '发货方式',
|
|
|
- '' AS `退货编号`,
|
|
|
- '' AS `退货数量`,
|
|
|
- '' as '退货金额',
|
|
|
- '' as '售前退货数量',
|
|
|
- '' as '售前退货金额'
|
|
|
- ")->cursor();
|
|
|
+ month(createdTime) AS `月`,
|
|
|
+ dayofmonth(createdTime) AS `日`,
|
|
|
+ ShortText1618270466672 '公司名称',
|
|
|
+ department '业务部门',
|
|
|
+ ownerName '业务人员',
|
|
|
+ ShortText1617866362204 '订单类型',
|
|
|
+ '' as '商品类型',
|
|
|
+ '' as '发货编号',
|
|
|
+ Number1618240600907 '本次发货数量',
|
|
|
+ createdTime '本次发货时间',
|
|
|
+ ShortText1617866360004 '确认单编号',
|
|
|
+ ShortText1617861001482 '商品编号',
|
|
|
+ ShortText1617865626160 '一级分类',
|
|
|
+ ''as '二级分类',
|
|
|
+ '' as '三级分类',
|
|
|
+ '' as '财务核算编码',
|
|
|
+ ShortText1617861966146 as '商品名称',
|
|
|
+ ShortText1617865685744 as '单位',
|
|
|
+ Number1618240600907 '下单数量',
|
|
|
+ '' AS `销售货款`,
|
|
|
+ ShortText1618315935182 as '采购单单号',
|
|
|
+ ownerName '采购员',
|
|
|
+ Number1617865804813 AS `采购裸价`,
|
|
|
+ Number1617865807879 AS `加标费`,
|
|
|
+ Number1617865810822 AS `包装费`,
|
|
|
+ Number1617865813284 AS `证书费`,
|
|
|
+ Number1617865816181 AS `开模费`,
|
|
|
+ number1618240204358 AS `工艺费`,
|
|
|
+ number1618240287778 AS `物流费`,
|
|
|
+ Number1617865818517 AS `成本合计`,
|
|
|
+ Number1618240685904 AS `采购货款`,
|
|
|
+ ShortText1617865688485 AS `采购税点`,
|
|
|
+ ShortText1620399144946 AS `供应商名称`,
|
|
|
+ '否'as '是否库存品',
|
|
|
+ '' as '发货方式',
|
|
|
+ '' AS `退货编号`,
|
|
|
+ '' AS `退货数量`,
|
|
|
+ '' as '退货金额',
|
|
|
+ '' as '售前退货数量',
|
|
|
+ '' as '售前退货金额'
|
|
|
+ ")->cursor();
|
|
|
$data=[];
|
|
|
foreach($list as $value){
|
|
|
$value['销售货款'] = $db->name("qrd_info")->where(['sequenceNo'=>$value['确认单编号']])->value('Number1618248813613','');
|
