ad

app/admin/controller/Purch.php

@@ -133,6 +133,8 @@ class Purch extends \app\BaseController
             $data['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
             $data['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
             $data['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
+            $inorder= Db::name("purchease_in")->where(['cgdNo'=>$data['cgdNo'],"is_del"=>0])->select();
+            $data['child']=empty($inorder)? [] : $inorder;
         }
         return app_show(0,"获取成功",$data);
     }

app/admin/controller/Purchin.php

@@ -3,9 +3,8 @@
 
 namespace app\admin\controller;
 use app\BaseController;
-use Illuminate\Support\Facades\Date;
 use think\facade\Db;
-
+use think\App;
 class Purchin extends BaseController
 {
     public $post="";
@@ -28,7 +27,7 @@ class Purchin extends BaseController
         if(empty($cgdinfo)){
             return error_show(1005,"未找到采购单数据");
         }
-       if($cgdinfo['status']!=3){
+       if($cgdinfo['status']!=1){
            return error_show(1005,"采购单未发货");
        }
         $wsm_in_code = makeNo("IC");
@@ -42,10 +41,10 @@ class Purchin extends BaseController
        }
        $recep = Db::name('warehouse_addr')->where(["wsm_code"=>$wsm_code,"is_del"=>0])->find();
 
-        $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
-        if($wsm_code==""){
-            return error_show(1004,"参数 wsm_code 不能为空");
-        }
+//        $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
+//        if($wsm_code==""){
+//            return error_show(1004,"参数 wsm_code 不能为空");
+//        }
 
         $data = GetUserInfo($this->post['token']);
         if((!empty($data) && $data['code']!=0) ||empty($data) ){
@@ -67,7 +66,7 @@ class Purchin extends BaseController
         $orin = [
             "wsm_in_code"=>$wsm_in_code,
             "cgdNo"=>$cgdNo,
-            "wsm_code"=>$wsm_in_code,
+            "wsm_code"=>$wsm_code,
             "wsm_reaper"=>isset($recep)&& $recep['wsm_name']!=''? $recep['wsm_name']:"",
             "send_num"=>$send_num,
             "post_company"=>$post_company,
@@ -88,18 +87,20 @@ class Purchin extends BaseController
                 if($status==1){
                     $cgdinfo['wsend_num']-=$send_num;
                     $cgdinfo['send_num']+=$send_num;
+                    $cgdinfo['send_status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
+                    $cgdinfo['status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
                     $cgdinfo['updatetime']=date("Y-m-d H:i:s");
                     $up=Db::name("purchease_order")->save($cgdinfo);
                     if($up){
                         Db::commit();
-                        return app_show(0,'新建成功');
+                        return app_show(0,'新建成功',["wsm_in_code"=>$wsm_in_code]);
                     }else{
                         Db::rollback();
                         return error_show(1004,"新建失败");
                     }
                 }
                 Db::commit();
-                return app_show(0,'新建成功');
+                return app_show(0,'新建成功',["wsm_in_code"=>$wsm_in_code]);
             }
             Db::rollback();
             return error_show(1004,"新建失败");
@@ -136,9 +137,12 @@ class Purchin extends BaseController
         if(empty($info)){
             return error_show(1004,"未找到数据");
         }
+        if($info['status']!=1){
+            return error_show(1004,"发货单状态有误");
+        }
         $order_num = isset($this->post['order_num']) && $this->post['order_num']!==''?intval($this->post['order_num'])
             :"";
-        if($order_num!==""){
+        if($order_num===""){
             return error_show(1004,"参数 order_num 不为空");
         }
         $error_list = isset($this->post['error_list']) && $this->post['error_list']!==''?$this->post['error_list']:"";
@@ -159,7 +163,8 @@ class Purchin extends BaseController
             $info['wait_num'] = $wait_num;
             $info['checkid'] = $userinfo['id'];
             $info['check_name'] = $userinfo['nickname'];
-            $info['error_num'] = $info['send_num']-$wait_num;
+            $info['status'] =2;
+            $info['error_num'] = $info['send_num']-$order_num;
             $info['updatetime'] = date("Y-m-d H:i:s");
             $up =Db::name("purchease_in")->save($info);
             if($up){
@@ -178,6 +183,7 @@ class Purchin extends BaseController
                         $data[]=$temp;
                     }
                     $derr= Db::name("purchease_info")->insertAll($data);
+                  //  echo Db::name("purchease_info")->getLastSql();
                     if($derr){
                         Db::commit();
                         return app_show(0,"验货完成");
@@ -226,6 +232,8 @@ class Purchin extends BaseController
                     }
                     $cgdinfo['wsend_num']+=$info['send_num'];
                     $cgdinfo['send_num']-=$info['send_num'];
+                    $cgdinfo['send_status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
+                    $cgdinfo['status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
                     $cgdinfo['updatetime']=date("Y-m-d H:i:s");
                     $up=Db::name("purchease_order")->save($cgdinfo);
                     if($up){
@@ -244,6 +252,8 @@ class Purchin extends BaseController
                     }
                     $cgdinfo['wsend_num']-=$info['send_num'];
                     $cgdinfo['send_num']+=$info['send_num'];
+                    $cgdinfo['send_status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
+                    $cgdinfo['status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
                     $cgdinfo['updatetime']=date("Y-m-d H:i:s");
                     $up=Db::name("purchease_order")->save($cgdinfo);
                     if($up){
@@ -297,12 +307,12 @@ class Purchin extends BaseController
         $error_remark = isset($this->post['error_remark']) &&$this->post['error_remark']!=="" ? trim($this->post['error_remark']):"" ;
         $post_code = isset($this->post['post_code']) &&$this->post['post_code']!=="" ? trim($this->post['post_code']):"" ;
         $post_company = isset($this->post['post_company']) &&$this->post['post_company']!=="" ? trim($this->post['post_company']):"" ;
+        $remark = isset($this->post['remark']) &&$this->post['remark']!=="" ? trim($this->post['remark']):"" ;
         $result = GetUserInfo($this->post['token']);
         if((!empty($result) && $result['code']!=0) ||empty($result) ){
             return error_show($result['code'],$result['message']);
         }
         $userinfo = $result['data'];
-
         $data=[
             "wsm_in_code"=>$incode,
             "wsm_num"=>$wsm_num,
@@ -314,6 +324,7 @@ class Purchin extends BaseController
             "error_remark"=>$error_remark,
             "post_code"=>$post_code,
             "post_company"=>$post_company,
+            "remark"=>$remark ,
             "apply_id"=>$userinfo['id'],
             "apply_name"=>$userinfo['nickname'],
             "status"=>0,