刘功能优化

application/admin/controller/Feeding.php

@@ -126,15 +126,17 @@ class Feeding extends Backend
         $pro = 0;
         //按照百分比计算出应投重量
         foreach($res as &$v){
-            if($process){//已有工序,接上一次工序
+            if($process){ //已有工序,接上一次工序
                 foreach ($process as $val){
-
                     if(($val['material']==$v['material'] || in_array($val['material'],explode('/',$v['material']))) && $val['t_id']==$v['id']){
                         $v['weight']=$val['weight'];
                         $pro = $val['gy_num'];
                     }
                 }
             }
+            if($v['gy_name'] == null){
+                $v['gy_name'] = '';
+            }
             if($v['percentage']){
                 $v['nweight']=round($v['number']*decode($v['percentage'])/100,2);
             }else{

application/admin/controller/Order.php

@@ -45,8 +45,7 @@ class Order extends Backend
      * @throws \think\Exception
      * @throws DbException
      */
-    public function index()
-    {
+    public function index(){
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if (false === $this->request->isAjax()) {
@@ -77,8 +76,7 @@ class Order extends Backend
      * @return string
      * @throws \think\Exception
      */
-    public function add()
-    {
+    public function add(){
         if (false === $this->request->isPost()) {
             return $this->view->fetch();
         }
@@ -108,7 +106,8 @@ class Order extends Backend
             $arr['username'] = $user_info['nickname'];
             $arr['type'] = 1;
             $arr['orderstu'] = 1;
-            $this->model->save($arr);/////log
+            $this->model->save($arr);//添加到订单管理
+            $this->logmodel->save($arr);//在添加订单管理日志
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {
             Db::rollback();
@@ -120,17 +119,19 @@ class Order extends Backend
         $this->success();
     }
 
-    public function stockad(){//传达到库存管理 如果数据库有新增数据返回1
+    /**
+     * 根据订单表 stock.js检测是否有新订单 有返回值为1 代表有新增订单数据
+     * @return string
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+
+    public function stockad(){
         $company_id = $_SESSION['think']['admin']['company_id'];//查询对应公司id
-        $order = Db::name('order')->where('company_id',$company_id)->where('orderstu',1)->select();
+        $order = Db::name('order')->where('company_id',$company_id)->where('orderstu',1)->find();
         if(!empty($order)){
-            foreach ($order as $v=>$k){
-                if($k['orderstu']){
-                    return $k['orderstu'];
-                }else{
-                    return '';
-                }
-            }
+            return $order['orderstu'];
         }
     }
 
@@ -165,42 +166,156 @@ class Order extends Backend
             $arr = [];
             foreach ($params as $k=>$v){
                 if($v!=$row[$k]) {
-                    if ($k == 'no') {
-                        $arr['field'] = '编号';
-                    } elseif ($k == 'customer') {
-                        $arr['field'] = '订货单位';
-                    } elseif ($k == 'product') {
-                        $arr['field'] = '品名';
-                    } elseif ($k == 'specs') {
-                        $arr['field'] = '包装规格';
-                    } elseif ($k == 'unit') {
-                        $arr['field'] = '单位';
-                    } elseif ($k == 'number') {
-                        $arr['field'] = '数量';
-                    } elseif ($k == 'price') {
-                        $arr['field'] = '单价';
-                    } elseif ($k == 'delivery_date') {
-                        $arr['field'] = '交货期';
-                    } elseif ($k == 'remark') {
-                        $arr['field'] = '备注';
-                    } elseif ($k == 'date') {
-                        $arr['field'] = '日期';
-                    } elseif ($k == 'user_name') {
-                        $arr['field'] = '经办';
-                    } elseif ($k == 'examine') {
-                        $arr['field'] = '审核';
-                    } elseif ($k == 'status') {
-                        $arr['field'] = '状态';
+                    switch ($k){
+                        case 'no':
+                            $arr['field'] = '编号';
+                            $arr['before'] = $row['no'];//写入订单管理日志表 查看修改前的字段值
+                            $arr['after'] = $params['no'];//写入订单管理日志表 查看修改后的字段值
+                            continue;
+                        case 'customer':
+                            $arr['field'] = '订货单位';
+                            $arr['before'] = $row['customer'];
+                            $arr['after'] = $params['customer'];
+                            continue;
+                        case 'product':
+                            $arr['field'] = '品名';
+                            $arr['before'] = $row['product'];
+                            $arr['after'] = $params['product'];
+                            continue;
+                        case 'specs':
+                            $arr['field'] = '包装规格';
+                            $arr['before'] = $row['specs'];
+                            $arr['after'] = $params['specs'];
+                            continue;
+                        case 'unit':
+                            $arr['field'] = '单位';
+                            $arr['before'] = $row['unit'];
+                            $arr['after'] = $params['unit'];
+                            continue;
+                        case 'number':
+                            $arr['field'] = '数量';
+                            $arr['before'] = $row['number'];
+                            $arr['after'] = $params['number'];
+                            continue;
+                        case 'price':
+                            $arr['field'] = '单价';
+                            $arr['before'] = $row['price'];
+                            $arr['after'] = $params['price'];
+                            continue;
+                        case 'delivery_date':
+                            $arr['field'] = '交货期';
+                            $arr['before'] = $row['delivery_date'];
+                            $arr['after'] = $params['delivery_date'];
+                            continue;
+                        case 'remark':
+                            $arr['field'] = '备注';
+                            $arr['before'] = $row['remark'];
+                            $arr['after'] = $params['remark'];
+                            continue;
+                        case 'date':
+                            $arr['field'] = '日期';
+                            $arr['before'] = $row['date'];
+                            $arr['after'] = $params['date'];
+                            continue;
+                        case 'user_name':
+                            $arr['field'] = '经办';
+                            $arr['before'] = $row['user_name'];
+                            $arr['after'] = $params['user_name'];
+                            continue;
+                        case 'examine':
+                            $arr['field'] = '审核';
+                            $arr['before'] = $row['examine'];
+                            $arr['after'] = $params['examine'];
+                            continue;
+                        case 'status':
+                            $arr['field'] = '状态';
+                            if ($row['status'] == 1) {
+                                $arr['before'] = '计划中';
+                                $arr['after'] = '计划中';
+                            }
+                            if ($row['status'] == 2) {
+                                $arr['before'] = '生产中';
+                                $arr['after'] = '生产中';
+                            }
+                            if ($row['status'] == 3) {
+                                $arr['before'] = '已完成';
+                                $arr['after'] = '已完成';
+                            }
+                            continue;
                     }
+//                    if ($k == 'no') {
+//                        $arr['field'] = '编号';
+//                        $arr['before'] = $row['no'];//写入订单管理日志表 查看修改前的字段值
+//                        $arr['after'] = $params['no'];//写入订单管理日志表 查看修改后的字段值
+//                    } elseif ($k == 'customer') {
+//                        $arr['field'] = '订货单位';
+//                        $arr['before'] = $row['customer'];
+//                        $arr['after'] = $params['customer'];
+//                    } elseif ($k == 'product') {
+//                        $arr['field'] = '品名';
+//                        $arr['before'] = $row['product'];
+//                        $arr['after'] = $params['product'];
+//                    } elseif ($k == 'specs') {
+//                        $arr['field'] = '包装规格';
+//                        $arr['before'] = $row['specs'];
+//                        $arr['after'] = $params['specs'];
+//                    } elseif ($k == 'unit') {
+//                        $arr['field'] = '单位';
+//                        $arr['before'] = $row['unit'];
+//                        $arr['after'] = $params['unit'];
+//                    } elseif ($k == 'number') {
+//                        $arr['field'] = '数量';
+//                        $arr['before'] = $row['number'];
+//                        $arr['after'] = $params['number'];
+//                    } elseif ($k == 'price') {
+//                        $arr['field'] = '单价';
+//                        $arr['add_text'] = $row['price'];
+//                        $arr['after'] = $params['price'];
+//                    } elseif ($k == 'delivery_date') {
+//                        $arr['field'] = '交货期';
+//                        $arr['before'] = $row['delivery_date'];
+//                        $arr['after'] = $params['delivery_date'];
+//                    } elseif ($k == 'remark') {
+//                        $arr['field'] = '备注';
+//                        $arr['before'] = $row['remark'];
+//                        $arr['after'] = $params['remark'];
+//                    } elseif ($k == 'date') {
+//                        $arr['field'] = '日期';
+//                        $arr['before'] = $row['date'];
+//                        $arr['after'] = $params['date'];
+//                    } elseif ($k == 'user_name') {
+//                        $arr['field'] = '经办';
+//                        $arr['before'] = $row['user_name'];
+//                        $arr['after'] = $params['user_name'];
+//                    } elseif ($k == 'examine') {
+//                        $arr['field'] = '审核';
+//                        $arr['before'] = $row['examine'];
+//                        $arr['after'] = $params['examine'];
+//                    } elseif ($k == 'status') {
+//                        $arr['field'] = '状态';
+//                        if( $row['status'] == 1){
+//                            $arr['before'] = '计划中';
+//                            $arr['after'] = '计划中';
+//                        }
+//                        if( $row['status'] == 2){
+//                            $arr['before'] = '生产中';
+//                            $arr['after'] = '生产中';
+//                        }
+//                        if( $row['status'] == 3){
+//                            $arr['before'] = '已完成';
+//                            $arr['after'] = '已完成';
+//                        }
+//                    }
                     $user_info = Session::get('admin');
-                    $arr['userid'] = $user_info['id'];
-                    $arr['username'] = $user_info['nickname'];
-                    $arr['oid'] = $row['id'];
-                    $arr['type'] = 2;
+                    $arr['userid'] = $user_info['id'];//用户id
+                    $arr['username'] = $user_info['nickname'];//用户名
+                    $arr['oid'] = $row['id'];//订单表id
+                    $arr['type'] = 2;//订单日志类型 2 修改后
+                    $arr['orderstu'] = 2;//订单状态
                     $res[]=$arr;
                 }
             }
-            $this->model->saveAll($res);////log
+            $this->logmodel->saveAll($res);//添加订单日志表,查哪个用户在什么时间修改哪个字段值
 
             $result = $row->allowField(true)->save($params);
             Db::commit();
@@ -231,8 +346,6 @@ class Order extends Backend
             if (!empty($list)){
                 $res = $this->get_repeat_data($list);
             }
-
-
 //             halt($res);die;
             $this->view->assign('ids',$ids);
             $this->view->assign('row', $res);

application/admin/controller/Product.php

@@ -38,8 +38,6 @@ class Product extends Backend
         $this->view->assign("statusList", $this->model->getStatusList());
     }
 
-
-
     /**
      * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
@@ -81,10 +79,14 @@ class Product extends Backend
         $str = explode(';',$bach);
         $batch = $str[(count($str))-1];
         $bach_info = Db::name('task')->where('bach',$batch)->find();
-        Cache::set('bach',serialize($bach_info),0);
+//        Cache::set('bach',serialize($bach_info),0);
         $form = Db::name('formula')->find($bach_info['fid']);
-        $res = Db::name('formula_detail')->where('pid = '.$bach_info['fid'].' and version = "'.$form['version'].'"')->field('id,pid,material,version,is_replace')->select();
+//        $res = Db::name('formula_detail')->where('pid = '.$bach_info['fid'].' and version = "'.$form['version'].'"')->field('id,pid,material,version,is_replace,gy_name')->select();
+        $res = Db::name('formula_detail')->where('pid',$bach_info['fid'])->where('version',$form['version'])->field('id,pid,material,version,is_replace,gy_name')->select();
         foreach($res as &$v){
+//            if($v['gy_name'] == null){
+//                $v['gy_name'] = '';
+//            }
             if($v['is_replace']==1){
                 $v['replace'] = Db::name('formula_replace')->where('fid',$v['id'])->order('id','desc')->select();
             }else{
@@ -92,7 +94,7 @@ class Product extends Backend
             }
         }
         //查出所有关于批次号的数据存储
-        Cache::set('data',serialize($res),0);
+//        Cache::set('data',serialize($res),0);
         return json($bach_info);
     }
 
@@ -127,7 +129,7 @@ class Product extends Backend
             }
         }
         //查询数据库↓          缓存↑
-        /*$form = Db::name('formula')->find($bach['fid']);
+        $form = Db::name('formula')->find($bach['fid']);
         $res = Db::name('formula_detail')->where('pid = '.$bach['fid'].' and material like "%'.encrypt($formula).'%" and version = "'.$form['version'].'"')->select();
         $arr = [];
 
@@ -142,7 +144,7 @@ class Product extends Backend
                 $arr=$v;
                 $arr['error']=0;
             }
-        }*/
+        }
         $arr['pname']  = $bach['name'];//配方名称
         $arr['time'] = date("Y-m-d H:i:s");
         $arr['bach'] = $bach['bach'];

application/admin/view/task/index.html

@@ -7,13 +7,13 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('task/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('task/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('task/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('task/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('task/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+                        <!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('task/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
                         <div class="dropdown btn-group {:$auth->check('task/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
                             <ul class="dropdown-menu text-left" role="menu">
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>

public/assets/js/backend/stock.js

@@ -67,7 +67,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                             layer.close(index);//点击确定关闭弹窗
                                         },
                                         error: function(){ //失败返回调用
-                                            alert("处理异常！");
+                                            alert("网络异常！");
                                         }
                                     });
                                 });
@@ -81,7 +81,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             }
                         }
                     });
-            },3000000);//
+            },10000);//10000 十秒
 
 
         },