ad

app/admin/controller/Orderback.php

@@ -120,6 +120,7 @@ class Orderback extends Base
       $info['origin_price']=$orderinfo['origin_price'];
       $info['sale_price']=$orderinfo['sale_price'];
       $info['order_type']=$orderinfo['order_type'];
+      $info['order_source']=$orderinfo['order_source'];
       $info['total_price']=$orderinfo['total_price'];
       $info['companyNo']=$orderinfo['supplierNo'];
       $info['company'] = Db::name('business')->where(['companyNo' => $orderinfo['supplierNo'], 'is_del' => 0])->value('company','');
@@ -529,8 +530,7 @@ class Orderback extends Base
                         return error_show(1005,'采购单数据更新失败');
                     }
                     if($cgd['bkcode']!=""){
-                        $bk=Db::name("purchease_order")->where(["bkcode"=>$cgd['bkcode'],"order_type"=>1,"is_del"=>0])
-                            ->find();
+                        $bk=Db::name("purchease_order")->where(["bkcode"=>$cgd['bkcode'],"order_type"=>1,"order_source"=>0,"is_del"=>0])->find();
                         if($bk==false){
                             Db::rollback();
                             return error_show(1005,'未找到备库单数据');
@@ -540,7 +540,7 @@ class Orderback extends Base
                             Db::rollback();
                             return error_show(1005,'备库单未完全入库');
                         }
-                        $merge_num = Db::name("purchease_order")->where(["bkcode"=>$bk['bkcode'],"order_type"=>1,"is_del"=>0])->field("sum(send_num)-sum(th_num) as num")->find();
+                        $merge_num = Db::name("purchease_order")->where(["bkcode"=>$bk['bkcode'],"order_type"=>1,"is_del"=>0])->where("order_source","<>",0)->field("sum(send_num)-sum(th_num) as num")->find();
 
                         $orderbk['balance_num']=$orderbk['total_num']-$merge_num['num'];
                         $orderbk['merge_num']=$merge_num['num'];

app/admin/controller/Purch.php

@@ -25,7 +25,7 @@ class Purch extends Base
     public function  list(){
         $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']):"1";
         $size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']):"10";
-        $where = [['po.is_del', "=", 0], ['po.order_type', '<>', 5]];//不显示类型为5即订单导入生成的采购单
+        $where = [['po.is_del', "=", 0]];//不显示类型为5即订单导入生成的采购单
         $bkcode = isset($this->post['bk_code']) && $this->post['bk_code']!="" ? trim($this->post['bk_code']):"";
         if($bkcode!=""){
             $where[]=['po.bkcode',"like", "%{$bkcode}%"];
@@ -122,7 +122,8 @@ class Purch extends Base
 //        if(!empty($role['platform']) ){
 //            $where[]=["po.platform_id","in",$role['platform']];
 //        }
-        $count=Db::name("purchease_order")->alias('po')->leftJoin('order_num on','on.cgdNo=po.cgdNo')->where($where)->count();
+        $count=Db::name("purchease_order")->alias('po')->leftJoin('order_num on','on.cgdNo=po.cgdNo')->where($where)
+            ->whereOr([['po.order_type', '<>', 1],['po.order_source', '=', 0]])->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name("purchease_order")
@@ -131,6 +132,7 @@ class Purch extends Base
             ->leftJoin("depart_user u", "u.uid=po.cgder_id AND u.is_del=0")
             ->field('po.*,on.orderCode,u.itemid')
             ->where($where)
+            ->whereOr([['po.order_type', '<>', 1],['po.order_source', '=', 0]])
             ->page($page,$size)
             ->order("po.addtime desc")
             ->cursor();
@@ -485,7 +487,7 @@ class Purch extends Base
 
             $rs = Db::name('purchease_order')
                 ->alias('po')
-                ->field('po.id,po.order_type,po.status,po.cgder_id,po.cgder,po.supplierNo,po.supplier_name,po.wsm_code,wi.name wsm_name')
+                ->field('po.id,po.order_type,po.order_source,po.status,po.cgder_id,po.cgder,po.supplierNo,po.supplier_name,po.wsm_code,wi.name wsm_name')
                 ->leftJoin('warehouse_info wi', 'wi.wsm_code=po.wsm_code AND wi.is_del=0')
                 ->where([
                     'po.cgdNo' => $param['cgdNo'],
@@ -498,7 +500,7 @@ class Purch extends Base
             $update = ['updatetime' => date('Y-m-d H:i:s')];
 
             //order_type==1备库
-            if ($rs['order_type'] == 1) {
+            if ($rs['order_type'] == 1 && $rs['order_source']==0) {
 
                 if (empty($param['wsm_code'])) throw new Exception('备库单请传入仓库编码');
                 else {
@@ -865,6 +867,7 @@ class Purch extends Base
         $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
         $idinf['can']=$int;
         $idinf['order_type']=$dn['order_type'];
+        $idinf['order_source']=$dn['order_source'];
 
         //取出销售的工差单信息
         $diff = Db::name('sale_diff')->field('id,customer_remark,is_act,remark')->where('cgd_diffid',$id)->find();

app/admin/controller/Purchin.php

@@ -103,7 +103,7 @@ class Purchin extends Base
             ->where($where)
             ->where($condition)
             ->page($page,$size)
-            ->field("a.apply_name,a.sendtime,b.order_type,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,
+            ->field("a.apply_name,a.sendtime,b.order_type,b.order_source,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,
             a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,b.supplierNo,u.itemid")
             ->order("a.addtime desc")
             ->cursor();

app/command/NowReportHandle.php

@@ -191,8 +191,9 @@ class NowReportHandle extends Command
             $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,"c.status"=>[4,6]])->order("a.addtime desc")->value("c.addtime","");
-            $value['备库单号']=Db::name("purchease_order")->alias("a")->where(["spuCode"=>$value['产品编号'], "order_type"=>1])->order("a.addtime desc")->value("a.bkcode","");
+                $value['产品编号'],"order_type"=>1,"order_source"=>0,"c.status"=>[4,6]])->order("a.addtime desc")->value("c
+                .addtime","");
+            $value['备库单号']=Db::name("purchease_order")->alias("a")->where(["spuCode"=>$value['产品编号'], "order_type"=>1,"order_source"=>0])->order("a.addtime desc")->value("a.bkcode","");
             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天之后
@@ -362,7 +363,7 @@ class NowReportHandle extends Command
                 $value['单位']=Db::name("unit")->where(["id"=>$value['单位']])->value("unit",'');
                 if($value['是否库存品']==1){
                     $sendtype = Db::name("purchease_order")->alias("a")->leftJoin("purchease_in b","a.cgdNo=b.cgdNo")
-                        ->where(["bkcode"=>$value['发货方式'],"order_type"=>[1,5]])->order("b.addtime desc")->value("b.sendtype",'');
+                        ->where(["bkcode"=>$value['发货方式'],"order_type"=>1])->order("b.addtime desc")->value("b.sendtype",'');
                     $value['是否库存品']='是';
                 }else{
                     $sendtype = Db::name("purchease_order")->alias("a")->leftJoin("purchease_in b","a.cgdNo=b.cgdNo")
@@ -390,6 +391,7 @@ class NowReportHandle extends Command
             ->leftJoin("supplier ws","ws.code=wpo.supplierNo")
             ->where('wpi.status',"in", [4,6])
             ->where('wpo.order_type',"=",1)
+            ->where('wpo.order_source',"=",0)
             ->whereBetween('wpi.addtime', [$start, $end])
             ->field("wpo.companyNo '业务公司',
                             bkcode '备库单号',
@@ -442,7 +444,7 @@ class NowReportHandle extends Command
             ->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',"in", [1,5])
+            ->where('a.order_type',"=", 1)
             ->whereBetween('woo.addtime', [$start, $end])
             ->field("wpo.companyNo '业务公司',
                             bkcode '备库单号',