刘功能优化

application/admin/controller/Formula.php

@@ -547,60 +547,59 @@ class Formula extends Backend
         return json($data);
     }
 
-    //根据mn_formula_detail表pid进行gy_num工序号处理
-    public function demo(){
-        $info = Db::table  ('mn_formula_detail')
-            ->field('pid')->group('pid')->select();
-        foreach ($info as $k=>$v){
-            $res = Db::table  ('mn_formula_detail')->field('id,gy_name,gy_num')
-                ->where('pid','=',$v['pid'])->order('id asc')->select();
-            $a = 1;
-            foreach ($res as $k=>$v){
-                $v['gy_num'] = $a;
-                Db::table  ('mn_formula_detail')->where('id',$v['id'])->update(['gy_num'=>$v['gy_num']]);
-                if($v['gy_name'] <> null){
-                    $a++;
-                }
-            }
-            print('成功执行'.'|'.date('Y-m-d H:i:s'));
-        }
-    }
-
-    //根据 某个 表修改 某个字段 值为 多少
-    public function company(){
-        $info = Db::table('mn_formula_detail')->limit(0,10)->select();
-        foreach ($info as $k=>$v){
-            //根据id进行修改
-            Db::table  ('mn_formula_detail')->where('id',$v['id'])->update(['version'=>'v1.0']);
-        }
-        //查看要修改的数据有多少
-        $zong= Db::table('mn_formula_detail')->count();
-        //查看修改了多少数据
-        $count= Db::table('mn_formula_detail')->where('version','=','v1.0')->count();
-        print('共'.$zong.'数据'.'|'.'成功执行'.$count.'数据'.'|'.date('Y-m-d H:i:s'));
-    }
-
-    //获取原材料中可相互代替的原材料
-    public function dat(){
-        $zong= Db::table('mn_formula_detail')->where('material','like','%/%')->count();
-        $count= Db::table('mn_formula_replace')->count();
-        print('共'.$zong.'数据'.'&nbsp,&nbsp'.'成功执行'.$count.'数据'.'&nbsp,&nbsp'.date('Y-m-d H:i:s'));
+    //根据mn_formula_detail表pid进行gy_num工序号处理-----可删除方法
+//    public function demo(){
+//        $info = Db::table  ('mn_formula_detail')
+//            ->field('pid')->group('pid')->select();
+//        foreach ($info as $k=>$v){
+//            $res = Db::table  ('mn_formula_detail')->field('id,gy_name,gy_num')
+//                ->where('pid','=',$v['pid'])->order('id asc')->select();
+//            $a = 1;
+//            foreach ($res as $k=>$v){
+//                $v['gy_num'] = $a;
+//                Db::table  ('mn_formula_detail')->where('id',$v['id'])->update(['gy_num'=>$v['gy_num']]);
+//                if($v['gy_name'] <> null){
+//                    $a++;
+//                }
+//            }
+//            print('成功执行'.'|'.date('Y-m-d H:i:s'));
+//        }
+//    }
 
-        $info  = Db::table("mn_formula_detail")
-            ->field('id,material')
-            ->where('material','like','%/%')->limit(0,1000)->select();
-        $arr = [];
-        $a = 0;
-        foreach ($info as $k=>$v){
-            $material = explode('/',$v['material']);
-            for ($i=0;$i<count($material);$i++){
-                $arr[$a]['fid'] = $v['id'];//fid
-                $arr[$a]['material'] = $material[$i];//原材料
-//                $arr[$a]['remark']= '可完全相互代替';//备注
-            }
-        }
+    //根据 某个 表修改 某个字段 值为 多少-----可删除方法
+//    public function company(){
+//        $info = Db::table('mn_formula_detail')->limit(0,10)->select();
+//        foreach ($info as $k=>$v){
+//            //根据id进行修改
+//            Db::table  ('mn_formula_detail')->where('id',$v['id'])->update(['version'=>'v1.0']);
+//        }
+//        //查看要修改的数据有多少
+//        $zong= Db::table('mn_formula_detail')->count();
+//        //查看修改了多少数据
+//        $count= Db::table('mn_formula_detail')->where('version','=','v1.0')->count();
+//        print('共'.$zong.'数据'.'|'.'成功执行'.$count.'数据'.'|'.date('Y-m-d H:i:s'));
+//    }
 
+    //获取原材料中可相互代替的原材料-----可删除方法
+//    public function dat(){
+//        $zong= Db::table('mn_formula_detail')->where('material','like','%/%')->count();
+//        $count= Db::table('mn_formula_replace')->count();
+//        print('共'.$zong.'数据'.'&nbsp,&nbsp'.'成功执行'.$count.'数据'.'&nbsp,&nbsp'.date('Y-m-d H:i:s'));
+//
+//        $info  = Db::table("mn_formula_detail")
+//            ->field('id,material')
+//            ->where('material','like','%/%')->limit(0,1000)->select();
+//        $arr = [];
+//        $a = 0;
+//        foreach ($info as $k=>$v){
+//            $material = explode('/',$v['material']);
+//            for ($i=0;$i<count($material);$i++){
+//                $arr[$a]['fid'] = $v['id'];//fid
+//                $arr[$a]['material'] = $material[$i];//原材料
+////                $arr[$a]['remark']= '可完全相互代替';//备注
+//            }
+//        }
 //        Db::table('mn_formula_replace')->insert($arr);
-    }
+//    }
 
 }

application/admin/controller/Product.php

@@ -78,9 +78,9 @@ 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);
+
         $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,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){
@@ -92,46 +92,28 @@ class Product extends Backend
                 $v['replace'] = [];
             }
         }
-        //查出所有关于批次号的数据存储
-//        Cache::set('data',serialize($res),0);
+
+
         return json($bach_info);
     }
 
     //获取配方单信息
     public function get_formula(){
-        $bach = unserialize(Cache::get('bach'));//获取配方单信息
+
+        $bach = $this->request->post('bach');
+        $str = substr($bach,0,-1);
+        $str = explode(';',$str);
+        $batch = $str[(count($str))-1];
+        $bach_info = Db::name('task')->where('bach',$batch)->find();
         $formula = $this->request->post('formula');//配方名称
-//        $data = unserialize(Cache::get('data'));//获取当前批次号缓存数据
         $arr = [];
         $arr['material']=$formula;
-//        foreach($data as $vv) {
-//            //没有替代料   error==0为有当前配方,   error==1为没有配方,,前台提示
-//            if ($vv['is_replace'] == 0) {
-//                if ($vv['material'] == $formula) {
-//                    $arr['error'] = 0;
-//                    break;
-//                } else {
-//                    $arr['error'] = 1;
-//                }
-//            } else {//有替代料
-//                foreach ($vv['replace'] as $val) {
-//                    if ($val['material'] == $formula) {
-//                        $arr['error'] = 0;
-//                        break;
-//                    } else {
-//                        $arr['error'] = 1;
-//                    }
-//                }
-//                if ($arr['error'] == 0) {
-//                    break;
-//                }
-//            }
-//        }
-        //查询数据库↓          缓存↑
-        $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 = [];
 
+        //查询数据库↓
+        $form = Db::name('formula')->find($bach_info['fid']);
+        $res = Db::name('formula_detail')->where('pid = '.$bach_info['fid'].' and material like "%'.$formula.'%" and version = "'.$form['version'].'"')->select();
+
+        $arr = [];
         if(!$res){
             $arr['material'] = $formula;
             $arr['error']=1;
@@ -145,9 +127,9 @@ class Product extends Backend
             }
         }
 
-        $arr['pname']  = $bach['name'];//配方名称
+        $arr['pname']  = $bach_info['name'];//配方名称
         $arr['time'] = date("Y-m-d H:i:s");
-        $arr['bach'] = $bach['bach'];
+        $arr['bach'] = $bach_info['bach'];
         return json($arr);
     }
 

application/admin/view/product/show.html

@@ -81,6 +81,7 @@
             <button type="button" class="btn btn-default btn-embossed print-link">打印</button>
         </div>
     </div>
+
     <div style="display: none">
         <div class="form-group" id="print_area" >
             <div id="head">
@@ -133,19 +134,8 @@
                         <th>包装规格</th>
                         <th>机组</th>
                     </tr>
-                    {foreach name='row.data' item='vo'}
-                    <tr>
-                        <td>{$row.batch}</td>
-                        <td>{$row.pname}</td>
-                        <td>{$vo.material}</td>
-                        <td>{$vo.sum}</td>
-                        <td>{$row.specifications}</td>
-                        <td>{$row.unit}</td>
-                        <!--<td><button type="submit" class="btn btn-primary btn-embossed disabled">{:__('Del')}</button></td>-->
-                    </tr>
-                    {/foreach}
-                </table>
 
+                </table>
             </div>
         </div>
     </div>

application/admin/view/task/show.html

@@ -1,4 +1,5 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
     <div style="width: 40%;float:left;margin: 0px 0px 0px 0px">
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-5">{:__('Name')}:</label>
@@ -39,8 +40,7 @@
             </div>
         </div>
     </div>
-
-
+<!--=================================================================================================-->
     <div class="form-group">
         <table class="table table-striped table-bordered table-hover table-nowrap" id="table">
             <tr>
@@ -51,7 +51,6 @@
                 <th class="col-xs-12 col-sm-1">工序</th>
                 <th class="col-xs-12 col-sm-1">版本号</th>
                 <th class="col-xs-12 col-sm-2">日期</th>
-                <!--<th class="col-xs-12 col-sm-2">操作</th>-->
             </tr>
             {foreach name='formula_detail.detail' item='vo'}
             <tr>
@@ -62,10 +61,10 @@
                 <td><input class='form-control' style="text-align: center" type="text" readonly value="{$vo.gy_num}"></td>
                 <td><input class='form-control' style="text-align: center" type="text" readonly value="{$vo.version}"></td>
                 <td><input class='form-control' style="text-align: center" type="text" readonly value="{$vo.create}"></td>
-                <!-- <td><button type="submit" class="btn btn-primary btn-embossed disabled">{:__('Del')}</button></td>-->
             </tr>
             {/foreach}
         </table>
     </div>
+
 </form>
 

public/assets/js/backend/product.js

@@ -101,6 +101,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                         url: "product/get_formula",
                         data: {
                             formula: $("#wuliao").val(),
+                            bach:$("#c-batch").val()
                         },
                         //扫描一个物料添加一行表格
                         success(res) {
@@ -123,6 +124,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                                         <td></td>
                                     </tr>`;
                             //写入页面
+                            $("#print_gy").append(html);
                             $("#table").append(str);
                             // $("#print_gy").append(html);
                             //清空物料扫描后的值,下次直接重新扫描即可
@@ -135,10 +137,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                                         btn: ['确认', '取消'],
                                         area: ['60%', '60%'],
                                     },function(index) { //点击确定写入打印页面
-                                        $("#print_gy").append(html);
                                         layer.close(index);
                                     },function(){ //点击取消删除添加的最后一个元素
                                         $("#table tr:last").remove();
+                                        $("#print_gy tr:last").remove();
                                     });
                                     //语音播报
                                     var synth = window.speechSynthesis;