Przeglądaj źródła

刘功能优化

liuhairui 3 lat temu
rodzic
commit
2b2bffe8f6

+ 60 - 0
application/admin/controller/Formula.php

@@ -529,6 +529,9 @@ class Formula extends Backend
         }
         $num = array_sum($total);
         foreach ($gyinfo as $key=>$value){
+            if($gyinfo[$key]['gy_name'] == null){//
+                $gyinfo[$key]['gy_name'] = '';//
+            }//
             $gyinfo[$key]['num'] = '';
             $gyinfo[$key]['percentage'] =  decode($value['percentage']);
             if (!empty($value['percentage'])){
@@ -543,4 +546,61 @@ class Formula extends Backend
         $data = \app\admin\model\GyName::select();
         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'));
+
+        $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);
+    }
+
 }

+ 3 - 2
application/admin/controller/Order.php

@@ -169,8 +169,8 @@ class Order extends Backend
                     switch ($k){
                         case 'no':
                             $arr['field'] = '编号';
-                            $arr['before'] = $row['no'];//写入订单管理日志表 查看修改前的字段值
-                            $arr['after'] = $params['no'];//写入订单管理日志表 查看修改后的字段值
+                            $arr['before'] = $row['no'];    //写入订单管理日志表 查看修改前的字段值
+                            $arr['after'] = $params['no'];  //写入订单管理日志表 查看修改后的字段值
                             continue;
                         case 'customer':
                             $arr['field'] = '订货单位';
@@ -376,6 +376,7 @@ class Order extends Backend
             return $this->view->fetch();
         }
     }
+
     //获取二维数组的重复数据
     function get_repeat_data($array){
         //计算出数组的总数量

+ 1 - 1
application/admin/controller/Product.php

@@ -75,7 +75,6 @@ class Product extends Backend
     //获取生产批次号等相关信息
     public function ajax(){
         $bach = $this->request->post('bach');
-
         $str = explode(';',$bach);
         $batch = $str[(count($str))-1];
         $bach_info = Db::name('task')->where('bach',$batch)->find();
@@ -150,6 +149,7 @@ class Product extends Backend
         $arr['bach'] = $bach['bach'];
         return json($arr);
     }
+
     public function add()
     {
         if (false === $this->request->isPost()) {

+ 19 - 0
application/admin/controller/Task.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
+use think\Db;
 
 /**
  * 作业票管理
@@ -22,7 +23,25 @@ class Task extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\Task;
+    }
+
+
+
 
+    /**
+     * 生产管理 作业票列表查看
+     */
+    public function show($ids)
+    {
+        $row = $this->model->get($ids);
+        $this->view->assign("row", $row);
+        $task = Db::name('task')->where('id',$ids)->find();
+        $formula_detail['detail']  = Db::name('formula_detail')->where('pid',$task['fid'])->select();
+        foreach ($formula_detail['detail'] as $key=>$value){
+            $formula_detail['detail'][$key]['percentage'] = decode($value['percentage']);
+        }
+        $this->view->assign("formula_detail", $formula_detail);
+        return $this->view->fetch();
     }
 
 

+ 5 - 4
application/admin/view/formula/task.html

@@ -79,18 +79,19 @@
             {/foreach}
         </table>
     </div>
+    <!--===========================================================-->
     <div style="display: none">
         <div class="form-group" id="print_area" >
         <div id="head">
             <table class="tg" style="width: 800px;">
                 <thead>
-                <div id="qrcode" style="margin:0 0 -50px 650px;width: 80px;height: 80px;">
+                <div id="qrcode" style="margin:0 0 -450px 500px;width: 80px;height: 80px;">
                     <img src="" id="myImage" alt=""/>
                 </div>
                 <tr>
                     <th class="tg-v8dz" colspan="6" >
-                        <p id="formula_no"></p>
-                        <hr style="border: 1px solid;margin-top: -5px">
+                        <!--<p id="formula_no"></p>-->
+                        <!--<hr style="border: 1px solid;margin-top: -5px">-->
                     </th>
                 </tr>
                 </thead>
@@ -98,7 +99,7 @@
                 <tr>
                     <td class="tg-s5vw"></td>
                     <td class="tg-svyg"></td>
-                    <td class="tg-ub5w" colspan="2" rowspan="2">作业票</td>
+                    <td class="tg-ub5w" colspan="2" rowspan="2">作业票&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
                     <td class="tg-4qqe"></td>
                     <td class="tg-s5vw"></td>
                 </tr>

+ 1 - 1
public/assets/js/backend/stock.js

@@ -43,7 +43,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 为表格绑定事件
             Table.api.bindevent(table);
 
-            var ref = setInterval(function(){//定时刷新
+            var ref = setInterval(function(){ //定时刷新
                     $.ajax({
                         type: "POST",
                         url: "order/stockad",

+ 13 - 1
public/assets/js/backend/task.js

@@ -34,7 +34,19 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'remark', title: __('Remark'), operate: 'LIKE'},
                         {field: 'fid', title: __('Fid')},
                         {field: 'create', title: __('Create'), operate: 'LIKE'},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'operate', title: '操作',  buttons:[{
+                                name:'task',
+                                text:'查看',
+                                title:'查看',
+                                icon:'fa fa-add',
+                                extend: 'data-area=["100%","100%"]',
+                                classname:'btn btn-xs btn-info btn-fields btn-dialog task',
+                                url:'task/show',
+                            }],
+                            table: table,
+                            events: Table.api.events.operate, formatter: Table.api.formatter.operate
+                        },
                     ]
                 ]
             });