Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/AfterChild.php

@@ -508,7 +508,11 @@ class AfterChild extends Base
 
                     foreach ($param['list'] as $value) {
                         if ($value['can_sell_num'] > 0) {
-                            $stockid = Db::name('good_stock')
+                        $cell_stock= Db::name('good_stock')
+	                    ->where(['is_del' => 0, 'spuCode' => $spuCode, 'wsm_code' =>$info[$value['id']]['return_wsm_code']])
+	                    ->findOrEmpty();
+                        if(empty($cell_stock)){
+                        	     $stockid = Db::name('good_stock')
                                 ->insertGetId([
                                     'project_code' => '',
                                     'spuCode' => $spuCode,
@@ -524,7 +528,18 @@ class AfterChild extends Base
                                     'addtime' => $date,
                                     'updatetime' => $date,
                                 ]);
-                    if($stockid==false) throw new \Exception('商品库存新增失败');
+                            if($stockid==false) throw new \Exception('商品库存新增失败');
+                        }else{
+                        	$stockid = $cell_stock['id'];
+                        	 $cell_up=  Db::name('good_stock')
+	                                ->data(['updatetime' => $date])
+	                                ->where(['is_del' => 0, 'id' =>$stockid])
+	                                ->inc('usable_stock',$value['can_sell_num'])
+	                                ->inc('total_stock', $value['can_sell_num'])
+	                                ->update();
+	                          if($cell_up==false)  throw new Exception('次品仓库库存更新失败');
+                        }
+                       
                          $stockinfo=   Db::name('good_stock_info')
                                 ->insert([
                                     'stockid' => $stockid,
@@ -655,8 +670,7 @@ class AfterChild extends Base
                                 ->inc('total_stock', $value['can_sell_num'])
                                 ->update();
                             if($stockinfoe==false) throw new \Exception('商品库存更新失败');
-                        }
-                            else {
+                        } else {
                             //新建good_stock和good_stock_info
                             $stockid = Db::name('good_stock')
                                 ->insertGetId([
@@ -674,7 +688,9 @@ class AfterChild extends Base
                                     'addtime' => $date,
                                     'updatetime' => $date,
                                 ]);
+                           
 							if($stockid==false) throw new \Exception('商品库存新增失败');
+							 $stockids[$info[$value['id']]['return_wsm_code']] =  $stockid;
                             //从child_bn查询bn号并维护，新建到good_stock_info中
                             $child_bns = Db::name('child_bn')
                                 ->field('id,num,bnCode,origin_price')

app/admin/controller/Good.php

@@ -647,7 +647,7 @@ class Good extends Base
             $temp['company_no']=isset($wsm['companyNo'])?$wsm['companyNo']:"";
             $temp['company_name']=isset($wsm['company'])?$wsm['company']:"";
             if($value['spuCode']!=""){
-                $good=Db::name("good")
+                $good=Db::name("good_basic")
                     ->alias('g')
                     ->field('g.*,b.brand_name,u.unit')
                     ->where(["g.spuCode"=>$value['spuCode'],"g.is_del"=>0])
@@ -796,7 +796,7 @@ class Good extends Base
 
         $good = Db::name("good_stock")
             ->alias("a")
-            ->leftJoin("good c", "c.spuCode=a.spuCode")
+            ->leftJoin("good_basic c", "c.spuCode=a.spuCode")
             ->where(["a.wsm_code" => $wsm_code, "a.is_del" => 0, "c.is_del" => 0])
             ->select()
             ->toArray();
@@ -865,7 +865,7 @@ class Good extends Base
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo']!="" ? trim($this->post['supplierNo']):"";
         if($supplierNo!=="") $condition[]=['b.supplierNo','=', $supplierNo];
 
-        $count = Db::name("good")
+        $count = Db::name("good_basic")
             ->alias("b")
             ->join("good_stock c","c.spuCode = b.spuCode","left")
             ->leftJoin("warehouse_info a","a.wsm_code=c.wsm_code")
@@ -873,7 +873,7 @@ class Good extends Base
             ->group("b.spuCode,b.good_name,b.good_unit,b.cat_id,b.craft_desc,b.addtime")
             ->count();
         $page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
-        $list = Db::name("good")
+        $list = Db::name("good_basic")
             ->alias("b")
             ->join("good_stock c","c.spuCode = b.spuCode","left")
             ->leftJoin("warehouse_info a","a.wsm_code=c.wsm_code")

app/admin/controller/Resign.php

@@ -72,7 +72,7 @@ class Resign extends Base
         $end = isset($this->post['end']) && $this->post['end']!=="" ? $this->post['end']:"";
         if($end!==""){
            // $where['p.addtime'] = Db::Raw("<= '{$end}'");
-            $where[]=['p.addtime',"<=",$end];
+            $where[]=['p.addtime',"<=",$end." 23:59:59"];
         }
 //        $role=$this->checkRole();
         $condition=[];