dd

app/admin/controller/Purch.php

@@ -129,10 +129,15 @@ class Purch extends \app\BaseController
         $data['wsm_name']="";
         if($data['wsm_code']!=""){
             $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
-                ->where(["a.wsm_code"=>$data['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
+                ->leftJoin("warehouse_addr c","a.wsm_code=c.wsm_code and c.is_del=0")
+                ->where(["a.wsm_code"=>$data['wsm_code']])->field("a.name as wsm_name,b.name,b.code,c.wsm_name as wsm_contactor,c.wsm_mobile,c.wsm_addr,c.addr_code")->find();
             $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']:"";
+            $data['wsm_contactor'] =isset($wsmcode['wsm_contactor']) ? $wsmcode['wsm_contactor']:"";
+            $data['wsm_mobile'] =isset($wsmcode['wsm_mobile']) ? $wsmcode['wsm_mobile']:"";
+            $data['wsm_addr'] =isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
+            $data['addr_code'] =isset($wsmcode['addr_code']) ? $wsmcode['addr_code']:"";
             $inorder= Db::name("purchease_in")->where(['cgdNo'=>$data['cgdNo'],"is_del"=>0])->select();
             $data['child']=empty($inorder)? [] : $inorder;
         }
@@ -171,10 +176,10 @@ class Purch extends \app\BaseController
             if(empty($ware)){
                 return error_show(1004,"未找到仓库信息");
             }
-            $good = Db::name("good_stock")->where(["wsm_code"=>$wsm_code,"good_type_code"=>$data['good_type_code'],"is_del"=>0])->find();
-            if(empty($good)){
-                return error_show(1004,"未找到仓库下商品信息");
-            }
+//            $good = Db::name("good_stock")->where(["wsm_code"=>$wsm_code,"good_type_code"=>$data['good_type_code'],"is_del"=>0])->find();
+//            if(empty($good)){
+//                return error_show(1004,"未找到仓库下商品信息");
+//            }
             $data['wsm_code'] = $wsm_code;
         }
 

app/admin/controller/Purchin.php

@@ -216,6 +216,9 @@ class Purchin extends BaseController
         if($status===""){
             return error_show(1004,"参数status 不为空");
         }
+        if($info['status']==3){
+            return error_show(1004,"入库单已完成");
+        }
         $remark = isset($this->post['remark'])&&$this->post['remark']!="" ? trim($this->post['remark']) :"";
         Db::rollback();
         try{
@@ -264,6 +267,36 @@ class Purchin extends BaseController
                         return error_show(1002,"发货失败");
                     }
                 }
+                if($status==3){
+                    $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
+                    if(empty($cgdinfo)){
+                        Db::rollback();
+                        return error_show(1002,"未找到采购单数据");
+                    }
+                   $good = Db::name("good_stock")->where(["wsm_code"=>$info['wsm_code'],"good_type_code"=>$cgdinfo['good_type_code'],"is_del"=>0])->find();
+                    if(empty($good)) {
+                      $good=[
+                          "good_type_code"=>$cgdinfo['good_type_code'],
+                          "wsm_code"=>$info['wsm_code'],
+                          "usable_stock"=>0,
+                          "wait_out_stock"=>0,
+                          "total_stock"=>0,
+                          "addtime"=>date("Y-m-d H:i:s"),
+                          "updatetime"=>date("Y-m-d H:i:s"),
+                      ];
+                    }
+                    $good['usable_stock']+=$info['send_num'];
+                    $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);
+                    if($upd){
+                        Db::commit();
+                        return app_show(0,'商品入库成功');
+                    }else{
+                        Db::rollback();
+                        return error_show(1002,"商品入库失败");
+                    }
+                }
                 Db::commit();
                 return app_show(0,"状态修改完成");
             }