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

app/admin/controller/Orderback.php

@@ -154,22 +154,25 @@ class Orderback extends \app\BaseController
                   Db::commit();
                   return app_show(0,'更新成功');
               }
-              $temp =[];
+              //$temp =[];
               foreach($errorlist as $value){
                   $data=[];
+                  isset($value['id'])&&$value['id']!=''?$data['id']=$value['id']:"";
                   $data['thNo']=$thNo;
                   $data['error_num']=$value['error_num'];
                   $data['error_code']=$value['error_code'];
                   $data['error_remark']=$value['error_remark'];
-                  $data['addtime']=date("Y-m-d H:i:s");
+                  $data['is_del']=isset($value['is_del'])?$value['is_del']:0;
+                  isset($value['id'])&&$value['id']!=''? "" : $data['addtime']=date("Y-m-d H:i:s");
                   $data['updatetime']=date("Y-m-d H:i:s");
-                  $temp[]=$data;
-              }
-              $in = Db::name("order_backinfo")->insertAll($temp);
-              if($in){
-                  Db::commit();
-                  return app_show(0,'更新成功');
+                  $in = Db::name("order_backinfo")->save($data);
+                  if(!$in){
+                      Db::rollback();
+                      return error_show(1005,'更新失败');
+                  }
               }
+             Db::commit();
+             return app_show(0,'更新成功');
           }
           Db::rollback();
           return error_show(1005,'更新失败');

app/admin/controller/Sale.php

@@ -461,6 +461,7 @@ class Sale extends BaseController
     }
 }
     public function status(){
+        $token= isset($this->post['token']) && $this->post['token'] !=="" ? trim($this->post['token']) :"";
     $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"";
     if($id==""){
         return error_show(1002,"参数id不能为空");
@@ -478,6 +479,7 @@ class Sale extends BaseController
             if ($zxinfo == false) {
                 return error_show(1004, "未找到咨询单数据");
             }
+            $gold['price']=0;
             if ($zxinfo['zx_type'] == 2) {
                 if ($zxinfo['metals'] == "") {
                     return error_show(1004, "未找到咨询单贵金属类型数据");
@@ -487,14 +489,22 @@ class Sale extends BaseController
                 if (empty($gold)) {
                     return error_show(1004, "未找到咨询单贵金属类型数据");
                 }
+                $dio['gold_price']=$gold['price'];
             }
             $wsm = Db::name("warehouse_info")->where(["supplierNo" => $zxinfo['gysNo'], "wsm_type" => 2])->find();
             if (empty($wsm)) {
                 return error_show(1002, "供应商仓库未找到");
             }
-            $dio['gold_price']=$gold['price'];
+
         }
-    Db::startTrans();
+        $apply_id =GetUserInfo($token);
+        if(empty($apply_id)||$apply_id['code']!=0){
+            return error_show(1002,"申请人数据不存在");
+        }
+        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+        $ri= isset($apply_id["data"]['nickname']) ?  $apply_id["data"]['nickname'] : "";
+
+        Db::startTrans();
     try {
         $dio['status']=$status;
         $dio['updatetime']=date("Y-m-d H:i:s");
@@ -567,6 +577,36 @@ class Sale extends BaseController
                     Db::rollback();
                     return error_show(1002,"咨询采购单创建商品失败");
                 }
+                if($dio['send_type']==1){
+                    $addr = Db::name('order_addr')->where(["orderCode"=>$dio['orderCode'],'is_del'=>0])->select();
+                    foreach ($addr as $value){
+                        $outCode=makeNo("CK");
+                        $data=[
+                            "wsm_code"=>$wsm['wsm_code'],
+                            "orderCode"=>$dio['orderCode'],
+                            "outCode"=>$outCode,
+                            "order_type"=>$dio['order_type'],
+                            "apply_id"=>$rm,
+                            "apply_name"=>$ri,
+                            "addrid"=>$value['id'],
+                            "post_name"=>'',
+                            "post_code"=>'',
+                            "post_fee"=>'',
+                            "sendtime"=>date("Y-m-d H:i:s"),
+                            "send_num"=>$value['receipt_quantity'],
+                            "check_num"=>0,
+                            "error_num"=>0,
+                            "status"=>0,
+                            "addtime"=>date("Y-m-d H:i:s"),
+                            "updatetime"=>date("Y-m-d H:i:s")
+                        ];
+                        $datainfo = Db::name('order_out')->insert($data);
+                        if(!$datainfo){
+                            Db::rollback();
+                            return error_show(1003,"创建失败");
+                        }
+                    }
+                }
             }
         }
         Db::commit();

app/admin/controller/Salezx.php

@@ -40,7 +40,7 @@ class Salezx extends \app\BaseController
         if($supplier==false){
             return error_show(1004,"未找到平台供应商数据");
         }
-        $wsm=Db::name("warehouse_info")->where(["supplierNo"=>$zxinfo['gsyNo'],"wsm_type"=>2])->find();
+        $wsm=Db::name("warehouse_info")->where(["supplierNo"=>$zxinfo['gysNo'],"wsm_type"=>2])->find();
         if(empty($wsm)){
             return error_show(1004,"未找到供应商仓库数据");
         }
@@ -347,6 +347,14 @@ class Salezx extends \app\BaseController
                             return error_show(0,"咨询订单地址更新失败");
                         }
                     }
+                }else{
+                    if($saleinfo['send_type']==1 && $sendtype==2){
+                        $up=Db::name('order_addr')->where(["orderCode"=>$saleinfo['orderCode']])->save(["is_del"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
+                        if(!$up){
+                            Db::rollback();
+                            return error_show(0,"咨询订单地址更新失败");
+                        }
+                    }
                 }
                     Db::commit();
                     return error_show(0,"咨询订单更新成功");