刘功能优化1201

application/admin/controller/Feeding.php

@@ -23,7 +23,7 @@ class Feeding extends Backend
      */
     protected $model = null;
 
-    protected $noNeedRight = ['get_formula','get_task','get_material'];
+    protected $noNeedRight = ['get_formula','get_task'];
 
     public function _initialize()
     {
@@ -188,26 +188,6 @@ class Feeding extends Backend
         $row['process'] = $pro+1;
         return json($row);
     }
-    public function get_material(){
-        $bach = $this->request->post('bach');//批次号
-        $material = $this->request->post('material');//原材料
-        if (!$bach || !$material){
-            $this->error('扫码数据不能为空');
-        }
-        $task = Db::name('task')->where('bach',$bach)->find();
-        $map = [];
-        $map['f_name'] = $task['name'];
-        $map['name'] = $material;
-        $data = Db::name('formula_material')->where($map)->find();
-        $result['data'] = $data;
-        if ($data){
-            $result['total'] = 1;
-        }else{
-            $result['total'] = 0;
-        }
-//        print_r($result);die;
-        return json($result);
-    }
     //查找替代料
     /*public function replace(){
         $bach = $this->request->post('bach');

application/admin/controller/Formula.php

@@ -455,19 +455,18 @@ class Formula extends Backend
         $params['remark'] = $base[6];
         $params['machine'] = $base[7];
         $params['oid'] = $base[8];
-
         $params['create'] = date('Y-m-d H:i:s');
         $result = false;
         Db::startTrans();
         try {
-
+            Db::name('order')->where('id',$params['oid'])->setField('status',2);
             $result = Db::name('task')->insert($params);
             //更改订单已完成数量，修改订单状态
             $order_info = Db::name('order')->where('id',$params['oid'])->find();
             if (empty($order_info['completed'])){
                 $new_completed = $params['number'];
                 $order_status = 2;//生产中
-                Db::name('order')->where('id',$params['oid'])->setField('status',2);
+//                Db::name('order')->where('id',$params['oid'])->setField('status',2);
             }else{
                 $new_completed = $params['number'] + $order_info['completed'];
             }

application/admin/controller/Order.php

@@ -315,17 +315,17 @@ class Order extends Backend
 
     //生产作业票
     public function task(){
-        $ids = input('ids');
+        $ids = input('ids');//获取订单id
         if (!$ids) {
             $this->error(__('No Results were found'));
         }
         if (false === $this->request->isPost()) {
-            //生产部=>开票人
+            //生产部=>开票人=>审核人
             $sckp = Db::name('personnel')->where('bid',"=",3)->where('position','=',"sckp")->order('name desc')->select();
-            //生产部=>审核人
             $scsh = Db::name('personnel')->where('bid',"=",3)->where('position','=',"scsh")->order('name desc')->select();
             $this->assign('sckp',$sckp);
             $this->assign('scsh',$scsh);
+
             $order = Db::name('order')->where('id',$ids)->find();
             $map = [];
             $map['name'] = array('like','%'.$order['product'].'%');
@@ -335,13 +335,15 @@ class Order extends Backend
             if (!empty($list)){
                 $res = $this->get_repeat_data($list);
             }
+
             //批次号顺序新增
             $tastbach = Db::name('task')->order('bach desc')->find();
             $bach = $tastbach['bach'] +1;
             $this->view->assign('bach',$bach);
-//             halt($res);die;
             $this->view->assign('ids',$ids);
+
             $this->view->assign('row', $res);
+            $this->view->assign('machineList',\app\admin\model\Machine::select());
             return $this->view->fetch();
         }
     }

application/admin/controller/Printt.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 
 use app\common\controller\Backend;
 
+
 class Printt extends Backend
 {
     public function index(){

application/admin/controller/Task.php

@@ -44,6 +44,17 @@ class Task extends Backend
             $this->error(__('You have no permission'));
         }
         if (false === $this->request->isPost()) {
+            $ids = input('ids');
+            $order = Db::name('task')->field('drawer_name,examine_name')->where('id',"=",$ids)->find();
+            $personnel_sckp = Db::name('personnel')->where('name','=',$order['drawer_name'])->find();
+            $personnel_scsh = Db::name('personnel')->where('name','=',$order['examine_name'])->find();
+            //查询生产部 开票人 审核人
+            $sckp = Db::name('personnel')->where('bid',"=",3)->where('position','=',"sckp")->order('name desc')->select();
+            $scsh = Db::name('personnel')->where('bid',"=",3)->where('position','=',"scsh")->order('name desc')->select();
+            $this->assign('sckp',$sckp);
+            $this->assign('scsh',$scsh);
+            $this->assign('personnel_sckp',$personnel_sckp);
+            $this->assign('personnel_scsh',$personnel_scsh);
             //新增关联订单
             $order = Db::name('order')->where('status','neq',3)->field('id,customer,product,number,completed')->select();
             $uncompleted_order = array();

application/admin/view/formula/task.html

@@ -75,7 +75,6 @@
                 {/foreach}
             </select>
         </div>
-
     </div>
 
     <div class="form-group">

application/admin/view/order/task.html

@@ -30,6 +30,7 @@
         </div>
         <label class="control-label col-xs-12 col-sm-1">批次号:</label>
         <div class="col-xs-12 col-sm-3">
+            <input id="hidden" type="hidden" value="{$bach}">
             <input id="c-bach" class="form-control" name="row[bach]" type="text" value="{$bach}">
         </div>
     </div>
@@ -63,6 +64,16 @@
             <input id="c-remark" class="form-control" name="row[remark]" type="text">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-1">机台选择:</label>
+        <div class="col-xs-12 col-sm-3">
+            <select id="c-mid" data-rule="required" class="control-label col-xs-12 col-sm-8 selectpicker" name="row[mid]">
+                {foreach name="machineList" item="machine"}
+                <option value="{$machine.name}" {in name="key" value=""}selected{/in}>{$machine.name}</option>
+                {/foreach}
+            </select>
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1"></label>
         <button type="button" id="add" class="btn btn-success">确定生成作业票</button>

application/admin/view/task/edit.html

@@ -10,7 +10,13 @@
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-5">{:__('Drawer_name')}:</label>
             <div class="col-xs-12 col-sm-6">
-                <input id="c-drawer_name"  class="form-control" name="row[drawer_name]" value="{$row.drawer_name}" type="text">
+                <select  id="c-drawer_name" data-rule="required" class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[drawer_name]" type="text" value="{$row['drawer_name']}">
+                    <option value="{$personnel_sckp.name}">{$personnel_sckp.name}</option>
+                    {foreach $sckp as $key=>$vv}
+                    <option value="{$vv.name}">{$vv.name}</option>
+                    {/foreach}
+                </select>
+                <!--<input id="c-drawer_name"  class="form-control" name="row[drawer_name]" value="{$row.drawer_name}" type="text">-->
             </div>
         </div>
         <div class="form-group">
@@ -42,7 +48,13 @@
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-5">{:__('Examine_name')}:</label>
             <div class="col-xs-12 col-sm-6">
-                <input id="c-examine_name"  class="form-control" name="row[examine_name]" value="{$row.examine_name}" type="text">
+                <select  id="c-examine_name" data-rule="required" class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[examine_name]" type="text" value="{$row['examine_name']}">
+                    <option value="{$personnel_scsh.name}">{$personnel_scsh.name}</option>
+                    {foreach $scsh as $key=>$vv}
+                    <option value="{$vv.name}">{$vv.name}</option>
+                    {/foreach}
+                </select>
+                <!--<input id="c-examine_name"  class="form-control" name="row[examine_name]" value="{$row.examine_name}" type="text">-->
             </div>
         </div>
         <div class="form-group">