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

app/admin/controller/Log.php

@@ -3,10 +3,22 @@ declare (strict_types = 1);
 
 namespace app\admin\controller;
 
+use app\BaseController;
 use think\Request;
+use think\app;
+use think\Facade\Db;
 
-class Log
+class Log extends BaseController
 {
+    public $post = "";
+
+
+
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $this->post = $this->request->post();
+    }
     /**
      * 显示资源列表
      *
@@ -14,7 +26,14 @@ class Log
      */
     public function index()
     {
-        //
+        $page = isset($this->post['page']) && $this->post['page'] !== "" ? intval($this->post['page']) : "1";
+        $size = isset($this->post['size']) && $this->post['size'] !== "" ? intval($this->post['size']) : "10";
+        $condition = [['type',"=",1]];
+        $count = Db::name("action_log")->where($condition)->count();
+        $total = ceil($count/$size);
+        $page = $page >= $total ? $total : $page;
+        $list =Db::name("action_log")->where($condition)->page($page,$size)->select();
+        return app_show(0,"获取成功",['list'=>$list,"count"=>$count]);
     }
 
     /**
@@ -44,9 +63,13 @@ class Log
      * @param  int  $id
      * @return \think\Response
      */
-    public function read($id)
+    public function read()
     {
-        //
+        $id = isset($this->post['id'])&&$this->post['id']!=="" ? intval($this->post['id']) :"";
+        if($id===""){
+            return error_show(1004,"参数 id 不能为空");
+        }
+        $info = Db::name("action_log")->where(["id"=>$id])->find();
     }
 
     /**

app/admin/controller/Purch.php

@@ -133,6 +133,25 @@ 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;
+        }
+        $feed = Db::name("purchease_feedback")->where(['bkcode'=>$data['bkcode'],'is_del'=>0])->find();
+        $data['feedback'] = [];
+        if(!empty($feed)){
+            $feed['wsm_name']="";
+            if($feed['warehouse']!=""){
+                $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
+                    ->where(["a.wsm_code"=>$feed['warehouse']])->field("a.name as wsm_name,b.name,b.code")->find();
+                $feed['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+                $feed['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
+                $feed['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
+            }
+            if($feed['supplier']!=""){
+                $supplie = Db::name("supplier")->where(['code'=>$feed['supplier'],"is_del"=>0])->find();
+                $feed['supplier_name'] =isset($supplie['name']) ? $supplie['name']:"";
+            }
+            $data['feedback'] = $feed;
         }
         return app_show(0,"获取成功",$data);
     }
@@ -147,14 +166,100 @@ class Purch extends \app\BaseController
             return error_show(1004,"未找到数据");
         }
         $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 不能为空");
+        if($wsm_code!=""){
+            $ware = Db::name("warehouse_info")->where(["wsm_code"=>$wsm_code,"is_del"=>0])->find();
+            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,"未找到仓库下商品信息");
+            }
+            $data['wsm_code'] = $wsm_code;
         }
-        $ware = Db::name("warehouse_info")->where(["wsm_code"=>$wsm_code,"is_del"=>0])->find();
-        if(empty($ware)){
-            return error_show(1004,"未找到仓库信息");
+
+        $cgdid = isset($this->post['cgder_id'])&&$this->post['cgder_id']!=""?intval($this->post['cgder_id']):"";
+        if($cgdid!=''){
+            $cgduser = GetInfoById($this->post['token'],["id"=>$cgdid]);
+            if((!empty($cgduser) && $cgduser['code']!=0) ||empty($cgduser) ){
+                return error_show($cgduser['code'],$cgduser['message']);
+            }
+            $userinfo = $cgduser['data'];
+            $data['cgder_id'] = $cgdid;
+            $data['cgder'] = $userinfo['nickname'];
+        }
+        $good_num = isset($this->post['good_num'])&&$this->post['good_num']!=""?intval($this->post['good_num']):"";
+        if($good_num!=""){
+            $data['good_num'] = $good_num;
+        }
+        $good_price = isset($this->post['good_price'])&&$this->post['good_price']!=""?$this->post['good_price']:"";
+        if($good_price!=""){
+            $data['good_price'] = $good_price;
+        }
+//        $total_fee = isset($this->post['total_fee'])&&$this->post['total_fee']!=""?$this->post['total_fee']:"";
+//        if($total_fee!=""){
+//            $data['total_fee'] = $total_fee;
+//        }
+        $pakge_fee = isset($this->post['pakge_fee'])&&$this->post['pakge_fee']!=""?$this->post['pakge_fee']:"";
+        if($pakge_fee!=""){
+            $data['pakge_fee'] = $pakge_fee;
         }
-        $data['wsm_code'] = $wsm_code;
+
+        $cert_fee = isset($this->post['cert_fee'])&&$this->post['cert_fee']!=""?$this->post['cert_fee']:"";
+        if($cert_fee!=""){
+            $data['cert_fee'] = $cert_fee;
+        }
+
+        $open_fee = isset($this->post['open_fee'])&&$this->post['open_fee']!=""?$this->post['open_fee']:"";
+        if($open_fee!=""){
+            $data['open_fee'] = $open_fee;
+        }
+        $delivery_fee = isset($this->post['delivery_fee'])&&$this->post['delivery_fee']!=""?$this->post['delivery_fee']:"";
+        if($delivery_fee!=""){
+            $data['delivery_fee'] = $delivery_fee;
+        }
+        $mark_fee = isset($this->post['mark_fee'])&&$this->post['mark_fee']!=""?$this->post['mark_fee']:"";
+        if($mark_fee!=""){
+            $data['mark_fee'] = $mark_fee;
+        }
+        $teach_fee = isset($this->post['teach_fee'])&&$this->post['teach_fee']!=""?$this->post['teach_fee']:"";
+        if($teach_fee!=""){
+            $data['teach_fee'] = $teach_fee;
+        }
+
+        $nake_fee = isset($this->post['nake_fee'])&&$this->post['nake_fee']!=""?$this->post['nake_fee']:"";
+        if($nake_fee!=""){
+            $data['nake_fee'] = $nake_fee;
+        }
+        $weight = isset($this->post['weight'])&&$this->post['weight']!=""?$this->post['weight']:"";
+        if($weight!=""){
+            $data['weight'] = $weight;
+        }
+        $diff_weight = isset($this->post['diff_weight'])&&$this->post['diff_weight']!=""?$this->post['diff_weight']:"";
+        if($diff_weight!=""){
+            $data['diff_weight'] = $diff_weight;
+        }
+        $diff_fee = isset($this->post['diff_fee'])&&$this->post['diff_fee']!=""?$this->post['diff_fee']:"";
+        if($diff_fee!=""){
+            $data['diff_fee'] = $diff_fee;
+        }
+        $supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!=""?trim($this->post['supplierNo'])
+            :"";
+        if($supplierNo!=""){
+           $supplier =Db::name("supplier")->where(['code'=>$supplierNo])->find();
+           if(empty($supplier)){
+               return error_show(1004,"未找到供应商信息");
+           }
+            $data['supplierNo'] = $supplierNo;
+            $data['supplier_name'] = $supplier['name'];
+        }
+        $remark = isset($this->post['remark'])&&$this->post['remark']!=""?trim($this->post['remark']):"";
+        if($remark!=""){
+            $data['remark'] = $remark;
+        }
+        $data['good_price'] = round(($data['pakge_fee']+$data['weight']*$data['gold_price']+$data['nake_fee']+$data['mark_fee']+$data['cert_fee']+$data['open_fee']/$data['good_num']
+        +$data['teach_fee']*$data['weight']+$data['delivery_fee']),2);
+        $data['total_fee'] = round($data['good_price']*$data['good_num'],2);
         $data['updatetime'] =date("Y-m-d H:i:s");
         $upd=Db::name("purchease_order")->save($data);
          return $upd?app_show(0,"更新成功"):error_show(1004,'更新失败');
@@ -171,10 +276,13 @@ class Purch extends \app\BaseController
             return error_show(1004,"未找到数据");
         }
         $remark= isset($this->post['remark']) && $this->post['remark']!="" ?trim($this->post['remark']):"";
-        $status = isset($this->post['status'])&&$this->post['status']!=""? intval($this->post['status']):"";
-        if($status==""){
+        $status = isset($this->post['status'])&&$this->post['status']!==""? intval($this->post['status']):"";
+        if($status===""){
             return error_show(1004,"参数status 不能为空");
         }
+        if($data['send_status']>1 && $status==0){
+            return error_show(1004,"采购单发货中无法取消");
+        }
         $data['status'] = $status;
         $data['remark'] = $remark;
         $data['updatetime'] =date("Y-m-d H:i:s");

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,

app/admin/controller/Resign.php

@@ -212,6 +212,24 @@ class Resign extends BaseController
             $info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
             $info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
         }
+        $feed = Db::name("purchease_feedback")->where(['bkcode'=>$info['bk_code'],'is_del'=>0])->find();
+        $info['feedback'] = [];
+        if(!empty($feed)){
+        $feed['wsm_name']="";
+        if($feed['warehouse']!=""){
+            $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
+                ->where(["a.wsm_code"=>$feed['warehouse']])->field("a.name as wsm_name,b.name,b.code")->find();
+            $feed['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
+            $feed['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
+            $feed['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
+        }
+        if($feed['supplier']!=""){
+            $supplie = Db::name("supplier")->where(['code'=>$feed['supplier'],"is_del"=>0])->find();
+            $feed['supplier_name'] =isset($supplie['name']) ? $supplie['name']:"";
+        }
+        $info['feedback'] = $feed;
+        }
+
         return app_show(0,"获取成功",$info);
     }
     public  function edit(){
@@ -528,6 +546,7 @@ class Resign extends BaseController
                         'diff_fee'=>$purse['diff_price'],
                         'cgder_id'=>$purse['purchaser_id'],
                         'cgder'=>$purse['purchaser'],
+                        "remark"=>$purse['remark'],
                         'supplierNo'=>$purse['supplier'],
                         'supplier_name'=>isset($supplier['name']) ? $supplier['name']:"",
                         'lasttime'=>$purse['expecttime'],