Merge branch 'plm' of ssh://192.168.10.210:10022/wugg/stock into plm

.gitignore

@@ -9,4 +9,5 @@ LICENSE.txt
 /public/nginx.htaccess
 /public/storage/
 /config/
+.env
 

app/admin/controller/Allot.php

@@ -85,15 +85,14 @@ class Allot extends BaseController
         $data=[];
         foreach ($list as $value){
             $db = Db::name('warehouse_info')->alias('a')->join("supplier b","b.code=a.supplierNo","left")
-                ->field("a.name,a.wsm_code,b.name rname,b.code")->where(['a.wsm_code'=>$value['wsm_out'],"a
-                .wsm_type"=>1,'a.is_del'=>0])->find();
+                ->field("a.name,a.wsm_code,b.name rname,b.code")->where(['a.wsm_code'=>$value['wsm_out'],"
+                a.wsm_type"=>1,'a.is_del'=>0])->find();
             $value['name'] =isset($db['name']) ? $db['name']:"";
             $value['wsm_code'] =isset($db['wsm_code']) ? $db['wsm_code']:"";
             $value['rname'] =isset($db['rname']) ? $db['rname']:"";
            $value['code'] =isset($db['code']) ? $db['code']:"";
             $dc = Db::name('warehouse_info')->alias('a')->join("supplier b","b.code=a.supplierNo","left")
-                ->field("a.name,a.wsm_code,b.name tname,b.code")->where(['a.wsm_code'=>$value['wsm_in'],"a
-               .wsm_type"=>1,'a.is_del'=>0])->find();
+                ->field("a.name,a.wsm_code,b.name tname,b.code")->where(['a.wsm_code'=>$value['wsm_in'],"a.wsm_type"=>1,'a.is_del'=>0])->find();
             $value['wsm_in_name'] =isset($dc['name']) ? $dc['name']:"";
             $value['wsm_in_code'] =isset($dc['wsm_code']) ? $dc['wsm_code']:"";
             $value['tname'] =isset($dc['tname']) ? $dc['tname']:"";

app/admin/controller/Cat.php

@@ -17,23 +17,14 @@ public function __construct(App $app)
 }
 public function list(){
     $where=[];
-    $pid =  isset($this->post['pid']) &&$this->post['pid']!=="" ?intval($this->post['pid']): "";
-    if($pid!==""){
-        $where[]=["pid","=",$pid];
-    }
+    $pid =  isset($this->post['pid']) &&$this->post['pid']!=="" ?intval($this->post['pid']): "0";
+    $where[]=["pid","=",$pid];
+
     $cat_name=isset($this->post['cat_name']) && $this->post['cat_name'] !==""? intval($this->post['cat_name']) :"";
     if($cat_name!==""){
         $where[]=['cat_name',"like","%$cat_name%"];
     }
-    $list = Db::name('cat')->where(['pid'=>$pid])->select();
-    foreach ($list as $value) {
-        $str = Db::name('cat')->where(['pid' => $value['id']])->select();
-        foreach ($str as $stn) {
-            $var = Db::name('cat')->where(['pid' => $stn['id']])->select();
-        }
-    }
-    //var_dump(Db::name('cat')->getLastSql());
-    $data = Db::name("cat")->where(['pid'=>0])->select();
+    $data = Db::name("cat")->where($where)->select();
     $vmp = [];
     foreach ($data as $sts){
         $vmp[]=stro($sts);

app/admin/controller/Purchback.php

@@ -221,4 +221,25 @@ public function info(){
     $info['can']=$int;
     return app_show(0,"获取成功",$info);
 }
+
+    public function delete(){
+        $returnCode = isset($this->post['returnCode']) && $this->post['returnCode'] !==""? trim($this->post['returnCode']) :"";
+        if($returnCode==""){
+            return error_show(1002,"参数returnCode不能为空");
+        }
+        $info= Db::name("purchease_back")->where(['returnCode'=>$returnCode,"is_del"=>0])->find();
+        if(empty($info)){
+            return error_show(1002,"未找到数据");
+        }
+        $del = Db::name("purchease_back")->where(['returnCode'=>$returnCode])->save(["is_del"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
+        if($del){
+            $sto = ["order_code"=>$returnCode,"status"=>$info['status'],"action_remark"=>'',"action_type"=>"delete"];
+            ActionLog::logAdd($this->post['token'],$sto,"CGTHD",0,["is_del"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
+            $process=["order_code"=>$returnCode,"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>'CGTHD'];
+            ProcessOrder::workdel($process);
+            return error_show(0,"删除成功");
+        }else{
+            return error_show(1002,"删除失败");
+        }
+    }
 }

app/admin/controller/Purchin.php

@@ -355,7 +355,7 @@ class Purchin extends BaseController
             $info['updatetime'] = date("Y-m-d H:i:s");
             $update = Db::name("purchease_in")->save($info);
             if($update){
-                ActionLog::logAdd($this->post['token'],$order,"rkd",$status,$this->post);
+                ActionLog::logAdd($this->post['token'],$order,"入库单",$status,$this->post);
                 $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>'RKD'];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 if($status==0){
@@ -434,10 +434,11 @@ class Purchin extends BaseController
                     $good['total_stock']=$good['usable_stock']+$good['wait_out_stock'];
                     $good['updatetime'] = date("Y-m-d H:i:s");
                     $upd=  Db::name("good_stock")->save($good);
-                    $good_data[]=["stock_id"=> $good['id'],"type"=>1,'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
+                    $good_data[]=["stock_id"=>isset($good['id'])? $good['id']:Db::name("good_stock")->getLastInsID(),"type"=>1,
+                    'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
                     if($upd){
-                        GoodLog::LogAdd($this->post['token'],$good_data,'rkd');
-                        ActionLog::logAdd($this->post['token'],$order,"gst", 1,$good  );
+                        GoodLog::LogAdd($this->post['token'],$good_data,'入库单');
+                        ActionLog::logAdd($this->post['token'],$order,"仓库库存", 1,$good  );
                         Db::commit();
                         return app_show(0,'商品入库成功');
                     }else{

app/admin/controller/Reorder.php

@@ -266,6 +266,12 @@ class Reorder extends \app\BaseController
                     $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
                     $value['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
                 }
+                $orderwsm = Db::name("sale_info")->where(["orderCode"=>$info["orderCode"],"wsm_code"=>$value["wsm_code"]])->find();
+                $value["wsm_total"] = isset($orderwsm["num"]) ? $orderwsm["num"]:0;
+                $send = Db::name("order_out")->where(["wsm_code" => $value['wsm_code'], 'orderCode' => $info['orderCode']])->sum("send_num");
+                $value['wsm_send'] = $send ?? 0;
+                $value['wsm_wsend'] = $value['wsm_total'] - $value['wsm_send'];
+
                 $wsm[]=$value;
             }
         }
@@ -282,6 +288,10 @@ class Reorder extends \app\BaseController
                 $value['post_fee']=isset($addrlist['post_fee'])?$addrlist['post_fee']:"";
                 $value['addive_time']=isset($addrlist['addive_time'])?$addrlist['addive_time']:"";
                 $value['customer_code']=isset($addrlist['customer_code']) ?$addrlist['customer_code']:"" ;
+                $value['receipt_quantity']=isset($addrlist['receipt_quantity']) ?$addrlist['receipt_quantity']:"" ;
+                $send = Db::name("order_out")->where(['addrid' => $addrlist['id'], 'orderCode' => $addrlist['orderCode']])->sum("send_num");
+                $value['addr_send'] = $send ?? 0;
+                $value['addr_wsend'] = $value['receipt_quantity'] - $value['addr_send'];
                 $customer = Db::name("customer_info")->where(['companyNo'=>$addrlist['customer_code']])->find();
                 $value['customer_name'] = isset($customer['companyName']) ? $customer['companyName']:"";
                 $addrinfo[]=$value;
@@ -384,7 +394,7 @@ class Reorder extends \app\BaseController
         try{
             $temp= $info['status'];
             $info['status'] =$status;
-            $info['remark'] =$remark;
+            $remark!=""? $info['remark'] =$remark:"";
             $info["updatetime"]=date("Y-m-d H:i:s");
             $up = Db::name("sale_return")->save($info);
             if($up){

app/admin/controller/Resign.php

@@ -223,11 +223,14 @@ class Resign extends BaseController
         if(empty($info)){
             return error_show(1002,'未找到数据');
         }
-        $goon = Db::name('good')->where(['good_code'=>$info['good_code']])->field("cat_id")->find();
+        $goon = Db::name('good')->alias("a")->leftJoin("good_type b","a.good_code=b.good_code")->where
+        (['a.good_code'=>$info['good_code']])->field("cat_id,noble_metal")->find();
         if(empty($goon)){
             return error_show(1002,"未找到商品数据");
         }
         $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
+        $info['noble_metal']= isset($goon['noble_metal']) && $goon['noble_metal'] !='' ? $goon['noble_metal']:'';
+        $info['noble_id']= isset($goon['noble_metal']) && $goon['noble_metal'] !='' ? array_search($goon['noble_metal'],\think\facade\Config::get("noble")):'';
         $info['wsm_name']="";
         if($info['wsm_code']!=""){
             $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
@@ -478,8 +481,8 @@ class Resign extends BaseController
                 $temp=$info['status'];
                 $info['status']=2;
                 $info['addtime']=date("Y-m-d H:i:s");
-                $ood=Db::name('purchease')->save($info,true);
-                if($ood>0){
+                $ood=Db::name('purchease')->save($info);
+                if($ood){
                     $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_id"=>$info['id'], "order_status"=>$info['status']];
                     ProcessOrder::AddProcess($this->post['token'],$order);
                     $ste = ["order_code"=>$info['bk_code'],"status"=>$temp,"action_remark"=>'',"action_type"=>"status"];

app/admin/route/app.php

@@ -223,6 +223,7 @@ Route::rule('backlist','admin/Purchback/list');
 Route::rule('backstatus','admin/Purchback/status');
 Route::rule('backfe','admin/Purchback/backfe');
 Route::rule('backinfo','admin/Purchback/info');
+Route::rule('backdel','admin/Purchback/delete');
 
 Route::rule('aftercreate','admin/After/create');
 Route::rule('afterinfo','admin/After/info');