第一次提交

application/admin/controller/Order.php

@@ -107,7 +107,8 @@ class Order extends Backend
             $arr['userid'] = $user_info['id'];
             $arr['username'] = $user_info['nickname'];
             $arr['type'] = 1;
-            $this->logmodel->save($arr);
+            $arr['orderstu'] = 1;
+            $this->model->save($arr);/////log
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {
             Db::rollback();
@@ -119,6 +120,20 @@ class Order extends Backend
         $this->success();
     }
 
+    public function stockad(){//传达到库存管理 如果数据库有新增数据返回1
+//        $auth_group = Db::name('auth_group')->where('name','仓库')->find();
+//        if($auth_group['name']=='仓库'){
+            $order = Db::name('order')->where('orderstu',1)->select();
+            foreach ($order as $v=>$k){
+                if($k['orderstu']){
+                    return $k['orderstu'];
+                }else{
+                    return '';
+                }
+            }
+//        }
+    }
+
     public function edit($ids = null)
     {
         $row = $this->model->get($ids);
@@ -185,7 +200,7 @@ class Order extends Backend
                     $res[]=$arr;
                 }
             }
-            $this->logmodel->saveAll($res);
+            $this->model->saveAll($res);////log
 
             $result = $row->allowField(true)->save($params);
             Db::commit();

application/admin/controller/Stock.php

@@ -239,4 +239,20 @@ class Stock extends Backend
 
         $this->success();
     }
+
+    /**
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     * 库存管理提示来新订单 进行处理修改状态
+     */
+    public function orderstu(){
+        $orderstu = $this->request->request('orderstu');
+        $arr = ['orderstu' =>$orderstu];
+        if(Db::name('order')->where('orderstu','=',1)->update($arr)){
+            return '处理成功';
+        }else{
+            return '处理异常';
+        }
+    }
 }

application/admin/controller/Task.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 作业票管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Task extends Backend
+{
+
+    /**
+     * Task模型对象
+     * @var \app\admin\model\Task
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Task;
+
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+}

application/admin/lang/zh-cn/order.php

@@ -20,5 +20,5 @@ return [
     'Status 3'      => '已完成',
     'Create'        => '创建时间',
     'Update'        => '更新时间',
-    'Company_id'    => '公司id'
+    'Company_id'    => '公司id',
 ];

application/admin/lang/zh-cn/stock.php

@@ -5,6 +5,7 @@ return [
     'Unit'       => '单位',
     'Number'     => '数量',
     'L_number'   => 'L-库存',
+    'Specs'   => '包装规格',
     'Company_id' => '公司id',
     'Create'     => '创建时间',
     'Update'     => '更新时间'

application/admin/lang/zh-cn/task.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'Name'         => '配方名称',
+    'Bach'         => '批次号',
+    'Drawer_name'  => '开票人',
+    'Examine_name' => '审核人',
+    'Number'       => '生产量',
+    'Remark'       => '备注',
+    'Fid'          => '关联配方id',
+    'Create'       => '创建时间'
+];

application/admin/model/Machine.php

@@ -8,10 +8,6 @@ use think\Model;
 class Machine extends Model
 {
 
-    
-
-    
-
     // 表名
     protected $name = 'machine';
     

application/admin/model/Order.php

@@ -7,11 +7,6 @@ use think\Model;
 
 class Order extends Model
 {
-
-    
-
-    
-
     // 表名
     protected $name = 'order';
     

application/admin/model/Stock.php

@@ -7,11 +7,6 @@ use think\Model;
 
 class Stock extends Model
 {
-
-    
-
-    
-
     // 表名
     protected $name = 'stock';
     
@@ -27,14 +22,5 @@ class Stock extends Model
     protected $append = [
 
     ];
-    
-
-    
-
-
-
-
-
-
 
 }

application/admin/model/Task.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Task extends Model
+{
+
+    // 表名
+    protected $name = 'task';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+    
+
+    
+
+
+
+
+
+
+
+}

application/admin/validate/Task.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Task extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

application/admin/view/feeding/add.html

@@ -14,6 +14,13 @@
     .tg .tg-4qqe{font-size:22px;font-weight:bold;text-align:center;vertical-align:top;border: none}
     .tg .tg-9d8n{font-size:22px;text-align:left;vertical-align:top;}
     .tg .tg-0pky{text-align:left;vertical-align:top;border: none}
+    .layui-layer-dialog .layui-layer-content {
+        font-size: 35px;
+        line-height: 110px;
+        color: red;
+        text-align: center;
+    }
+
 </style>
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     <div class="form-group">
@@ -83,18 +90,20 @@
             <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">
-                <table class="tg" style="width: 800px;">
+                <table class="tg" style="width: 840px;">
                     <thead>
-                    <div id="qrcode" style="margin:0 0 -50px 650px;width: 80px;height: 80px;">
+                    <!--<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="7" >
-                            <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>
@@ -102,7 +111,8 @@
                     <tr>
                         <td class="tg-s5vw"></td>
                         <td class="tg-svyg"></td>
-                        <td class="tg-ub5w" colspan="3" rowspan="2">作业票</td>
+                        <td class="tg-ub5w" colspan="3" rowspan="2">
+                            作业票</td>
                         <td class="tg-4qqe"></td>
                         <td class="tg-s5vw"></td>
                     </tr>
@@ -115,7 +125,7 @@
                     <tr>
                         <td class="tg-9d8n" style="border: none">批号：</td>
                         <td class="tg-z7m5" style="text-decoration: underline" id="bach"></td>
-                        <td class="tg-kghl" style="border: none;text-align: center"><input style="text-align: center" type="text" id="formula"></td>
+                        <td class="tg-kghl" style="border: none;text-align: center"><input style="text-align: center;width: 100%;" type="text" id="formula"></td>
                         <td class="tg-0pky"></td>
                         <td class="tg-0pky"></td>
                         <td class="tg-x1hj" id="specifications"></td>
@@ -125,16 +135,17 @@
                 </table>
             </div>
             <div style="height: 20px;"></div>
+            <!--打印 整体下部分-->
             <div id="body">
-                <table class="tg" style="width: 800px;" id="print_gy">
+                <!--打印表格部分-->
+                <table class="tg" style="width: 840px;" id="print_gy">
                     <tr>
                         <th  style="text-align: center">原材料</th>
-                        <!--                                <th  style="text-align: center">百分比</th>-->
+                        <!--<th  style="text-align: center">百分比</th>-->
                         <th  style="text-align: center">应加量(KG)</th>
                         <th  style="text-align: center;min-width: 100px;">实加量(KG)</th>
                         <th  style="text-align: center">操作记录</th>
                     </tr>
-
                     <!--<tr>
                         <td style="width: 100px;text-align: center">总计</td>
                         <td class="total" style="width: 100px;text-align: center"></td>
@@ -163,6 +174,86 @@
             </div>
         </div>
     </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;">-->
+                        <!--<img src="" id="myImage" alt=""/>-->
+                    <!--</div>-->
+                    <!--<tr>-->
+                        <!--<th class="tg-v8dz" colspan="7" >-->
+                            <!--<p id="formula_no"></p>-->
+                            <!--<hr style="border: 1px solid;margin-top: -5px">-->
+                        <!--</th>-->
+                    <!--</tr>-->
+                    <!--</thead>-->
+                    <!--<tbody>-->
+                    <!--<tr>-->
+                        <!--<td class="tg-s5vw"></td>-->
+                        <!--<td class="tg-svyg"></td>-->
+                        <!--<td class="tg-ub5w" colspan="3" rowspan="2">作业票</td>-->
+                        <!--<td class="tg-4qqe"></td>-->
+                        <!--<td class="tg-s5vw"></td>-->
+                    <!--</tr>-->
+                    <!--<tr>-->
+                        <!--<td class="tg-9d8n" style="border: none;width: 80px;">日期：</td>-->
+                        <!--<td class="tg-z7m5" style="width:134px" id="date">{:date("Y-m-d")}</td>-->
+                        <!--<td class="tg-9d8n" style="width:100px">开票人</td>-->
+                        <!--<td class="tg-9d8n" style="width:100px">审核</td>-->
+                    <!--</tr>-->
+                    <!--<tr>-->
+                        <!--<td class="tg-9d8n" style="border: none">批号：</td>-->
+                        <!--<td class="tg-z7m5" style="text-decoration: underline" id="bach"></td>-->
+                        <!--<td class="tg-kghl" style="border: none;text-align: center"><input style="text-align: center" type="text" id="formula"></td>-->
+                        <!--<td class="tg-0pky"></td>-->
+                        <!--<td class="tg-0pky"></td>-->
+                        <!--<td class="tg-x1hj" id="specifications"></td>-->
+                        <!--<td class="tg-x1hj" id="unit"></td>-->
+                    <!--</tr>-->
+                    <!--</tbody>-->
+                <!--</table>-->
+            <!--</div>-->
+            <!--<div style="height: 20px;"></div>-->
+            <!--<div id="body">-->
+                <!--<table class="tg" style="width: 800px;" id="print_gy">-->
+                    <!--<tr>-->
+                        <!--<th  style="text-align: center">原材料</th>-->
+                        <!--&lt;!&ndash;                                <th  style="text-align: center">百分比</th>&ndash;&gt;-->
+                        <!--<th  style="text-align: center">应加量(KG)</th>-->
+                        <!--<th  style="text-align: center;min-width: 100px;">实加量(KG)</th>-->
+                        <!--<th  style="text-align: center">操作记录</th>-->
+                    <!--</tr>-->
+
+                    <!--&lt;!&ndash;<tr>-->
+                        <!--<td style="width: 100px;text-align: center">总计</td>-->
+                        <!--<td class="total" style="width: 100px;text-align: center"></td>-->
+                        <!--<td></td>-->
+                        <!--<td></td>-->
+                    <!--</tr>-->
+                    <!--<tr>-->
+                        <!--<td colspan="5" class="remark"></td>-->
+                    <!--</tr>&ndash;&gt;-->
+                <!--</table>-->
+                <!--<div style="height: 5px;"></div>-->
+                <!--<table class="tg table_bottom" style="width: 800px;">-->
+                    <!--<tr>-->
+                        <!--<td style="border: none">-->
+                            <!--<span>包装规格：</span>-->
+                            <!--<hr style="border: 1px solid;width: 150px;margin-top: -5px;">-->
+                            <!--<div style="position: absolute;margin-left: 270px;margin-top: -36px;">KG/桶</div>-->
+                        <!--</td>-->
+                        <!--<td style="border: none">作业票回收日期：<hr style="border: 1px solid;width: 150px;margin-top: -5px;"></td>-->
+                    <!--</tr>-->
+                    <!--<tr>-->
+                        <!--<td style="border: none">操作人员：<hr style="border: 1px solid;width: 150px;margin-top: -5px;"></td>-->
+                        <!--<td style="border: none">检验签字：<hr style="border: 1px solid;width: 150px;margin-top: -5px;"></td>-->
+                    <!--</tr>-->
+                <!--</table>-->
+            <!--</div>-->
+        <!--</div>-->
+    <!--</div>-->
 </form>
 <script type='text/javascript' src='__CDN__/assets/js/jquery2.1.1.min.js'></script>
 <script type="text/javascript" src="__CDN__/assets/js/jquery.qrcode.min.js"></script>

application/admin/view/order/task.html

@@ -4,7 +4,7 @@
         overflow:hidden;padding:10px 5px;word-break:normal;}
     .tg th{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;
         font-weight:normal;overflow:hidden;padding:10px 5px;word-break:normal;}
-    .tg .tg-ub5w{font-size:36px;text-align:center;vertical-align:middle;border: none}
+    .tg .tg-ub5w{font-size:36px;vertical-align:middle;border: none}
     .tg .tg-x1hj{font-size:22px;text-align:left;vertical-align:top;}
     .tg .tg-kghl{font-size:22px;text-align:left;vertical-align:middle;}
     .tg .tg-z7m5{font-size:22px;text-align:left;text-decoration:underline;vertical-align:top;border: none}
@@ -57,9 +57,10 @@
         <label class="control-label col-xs-12 col-sm-1"></label>
         <button type="button" id="add" class="btn btn-success">确定生成作业票</button>
     </div>
+    <!--==========================================================================-->
     <div class="form-group">
         <table class="table table-striped table-bordered table-hover table-nowrap">
-            <thead>
+            <thead><!--thead表格表头部位-->
             <tr>
                 <th class="col-xs-12 col-sm-1">原材料</th>
                 <th class="col-xs-12 col-sm-1">百分比</th>
@@ -70,31 +71,33 @@
             </thead>
 
             <tbody id="gy">
-
+                <!--tbody表格主体部位-->
             </tbody>
 
         </table>
     </div>
-    <div style="display: none">
+    <!--==========================================================================-->
+    <div style="display: none;">
         <div class="form-group" id="print_area" >
             <div id="head">
-                <table class="tg" style="width: 800px;">
+                <table class="tg" style="width: 840px;">
                     <thead>
                     <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">
+                        <th class="tg-v8dz" colspan="6">
+                            <!--<p id="formula_no"></p>-->
+                            <!--<hr style="border: 1px solid;margin-top: -5px">-->
                         </th>
                     </tr>
-                    </thead>
                     <tbody>
                     <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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            作业票</td>
                         <td class="tg-4qqe"></td>
                         <td class="tg-s5vw"></td>
                     </tr>
@@ -113,29 +116,33 @@
                         <td class="tg-x1hj" id="examine_name"></td>
                     </tr>
                     </tbody>
+
                 </table>
             </div>
             <div style="height: 20px;"></div>
+            <!--作业票整体下部分 div-->
             <div id="body">
-                <table class="tg" style="width: 800px;" id="print_gy">
+                <!--作业票表格部分-->
+                <table class="tg" style="width: 840px;" id="print_gy">
                     <tr>
-                        <th  style="text-align: center">原材料</th>
-                        <!--                                <th  style="text-align: center">百分比</th>-->
+                        <th  style="text-align: center;">原材料</th>
+                        <!--<th style="text-align: center">百分比</th>-->
                         <th  style="text-align: center">应加量(KG)</th>
                         <th  style="text-align: center">实加量(KG)</th>
                         <th  style="text-align: center">操作记录</th>
                     </tr>
                    <tbody id="print">
-
+                        <!--作业票表格主体部分-->
                    </tbody>
                 </table>
-                <div style="height: 5px;"></div>
+                <br><!--<div style="height: 5px; border: 5px red solid"></div>-->
+                <!--作业票签字部分-->
                 <table class="tg" style="width: 800px;">
                     <tr>
                         <td style="border: none">
                             <span>包装规格：</span>
                             <hr style="border: 1px solid;width: 150px;margin-top: -5px;">
-                            <div style="position: absolute;margin-left: 270px;margin-top: -36px;">KG/桶</div>
+                            <div style="position: absolute;margin-left: 270px;margin-top: -36px;"> KG/桶</div>
                         </td>
                         <td style="border: none">作业票回收日期：<hr style="border: 1px solid;width: 150px;margin-top: -5px;"></td>
                     </tr>

application/admin/view/product/add.html

@@ -14,6 +14,12 @@
     .tg .tg-4qqe{font-size:22px;font-weight:bold;text-align:center;vertical-align:top;border: none}
     .tg .tg-9d8n{font-size:22px;text-align:left;vertical-align:top;}
     .tg .tg-0pky{text-align:left;vertical-align:top;border: none}
+    .layui-layer-dialog .layui-layer-content {
+        font-size: 35px;
+        line-height: 110px;
+        color: red;
+        text-align: center;
+    }
 </style>
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     <input type="hidden" id="status" name="row[status]" value="{$_GET['status']}">

application/admin/view/product/index.html

@@ -38,6 +38,7 @@
                            data-operate-del="{:$auth->check('product/del')}"
                            width="100%">
                     </table>
+
                 </div>
             </div>
 

application/admin/view/stock/add.html

@@ -24,6 +24,12 @@
             <input id="c-l_number" class="form-control" name="row[l_number]" type="text">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Specs')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-specs" class="form-control" name="row[specs]" type="text">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/stock/index.html

@@ -1,3 +1,12 @@
+<style>
+    .layui-layer-dialog .layui-layer-content {
+        font-size: 35px;
+        line-height: 110px;
+        color: red;
+        text-align: center;
+    }
+</style>
+
 <div class="panel panel-default panel-intro">
     {:build_heading()}
 

application/admin/view/task/add.html

@@ -0,0 +1,58 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bach')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bach" data-rule="required" class="form-control" name="row[bach]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Drawer_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-drawer_name" class="form-control" name="row[drawer_name]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Examine_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-examine_name" class="form-control" name="row[examine_name]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <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-2">{:__('Fid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-fid" data-rule="required" class="form-control" name="row[fid]" type="number">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create" class="form-control" name="row[create]" type="text">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/task/edit.html

@@ -0,0 +1,58 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bach')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bach" data-rule="required" class="form-control" name="row[bach]" type="text" value="{$row.bach|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Drawer_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-drawer_name" class="form-control" name="row[drawer_name]" type="text" value="{$row.drawer_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Examine_name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-examine_name" class="form-control" name="row[examine_name]" type="text" value="{$row.examine_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text" value="{$row.number|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Fid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-fid" data-rule="required" class="form-control" name="row[fid]" type="number" value="{$row.fid|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create" class="form-control" name="row[create]" type="text" value="{$row.create|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/task/index.html

@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <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>
+                        
+
+                        <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>
+                            <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>
+                            </ul>
+                        </div>
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('task/edit')}"
+                           data-operate-del="{:$auth->check('task/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/database.php

@@ -16,13 +16,13 @@ return [
     // 数据库类型
     'type'            => Env::get('database.type', 'mysql'),
     // 服务器地址
-    'hostname'        => Env::get('database.hostname', '127.0.0.1'),
+    'hostname'        => Env::get('database.hostname', '120.26.42.86'),
     // 数据库名
     'database'        => Env::get('database.database', 'minongyun'),
     // 用户名
-    'username'        => Env::get('database.username', 'root'),
+    'username'        => Env::get('database.username', 'minongyun'),
     // 密码
-    'password'        => Env::get('database.password', 'root'),
+    'password'        => Env::get('database.password', 'mG8kJr2jmPYRHb5i'),
     // 端口
     'hostport'        => Env::get('database.hostport', ''),
     // 连接dsn

public/assets/js/addons.js

@@ -1,3 +1,28 @@
 define([], function () {
-    
+    require.config({
+    paths: {
+        'editable': '../libs/bootstrap-table/dist/extensions/editable/bootstrap-table-editable.min',
+        'x-editable': '../addons/editable/js/bootstrap-editable.min',
+    },
+    shim: {
+        'editable': {
+            deps: ['x-editable', 'bootstrap-table']
+        },
+        "x-editable": {
+            deps: ["css!../addons/editable/css/bootstrap-editable.css"],
+        }
+    }
+});
+if ($("table.table").size() > 0) {
+    require(['editable', 'table'], function (Editable, Table) {
+        $.fn.bootstrapTable.defaults.onEditableSave = function (field, row, oldValue, $el) {
+            var data = {};
+            data["row[" + field + "]"] = row[field];
+            Fast.api.ajax({
+                url: this.extend.edit_url + "/ids/" + row[this.pk],
+                data: data
+            });
+        };
+    });
+}
 });

public/assets/js/backend/feeding.js

@@ -241,10 +241,25 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                                         }
                                                     }
                                                     if(error===0){
-                                                        Layer.confirm("此物料不在配方中,且没有替代料，请确认！");
-                                                        //语音播报
-                                                        var msg = new SpeechSynthesisUtterance("此物料不在配方中,且没有替代料，请确认！");
-                                                        window.speechSynthesis.speak(msg);
+                                                        // Layer.confirm("此物料不在配方中,且没有替代料，请确认！");
+                                                        layer.confirm("此物料不在配方中,且没有替代料，请确认！", {//物料不存在提示错误信息
+                                                            title: ['信息'],
+                                                            btn: ['确认'],
+                                                            area: ['60%', '60%'],
+                                                        // },function () {
+                                                        //     return false;
+                                                        });
+
+                                                        // var fn = function(){
+                                                            var synth = window.speechSynthesis;
+                                                            var msg = new window.SpeechSynthesisUtterance('此物料不在配方中,且没有替代料，请确认！');
+                                                            window.speechSynthesis.cancel();
+                                                            synth.speak(msg);
+                                                        // }
+                                                        // setInterval(fn,5000);
+                                                        //语音播报setTimeout()
+                                                        // var msg = new SpeechSynthesisUtterance("此物料不在配方中,且没有替代料，请确认！");
+                                                        // window.speechSynthesis.speak(msg);
                                                     }
                                                     //清空物料扫描后的值,下次直接重新扫描即可
                                                     $("#wuliao").val('');

public/assets/js/backend/order.js

@@ -48,8 +48,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                         {field: 'operate', title: '操作',  buttons:[{
                                 name:'task',
-                                text:'生成作业票',
-                                title:'生成作业票',
+                                text:'生成作业票',//订单管理点击作业票标题
+                                title:'生成作业票',//点击作业票内标题
                                 icon:'fa fa-add',
                                 extend: 'data-area=["100%","100%"]',
                                 classname:'btn btn-xs btn-info btn-fields btn-dialog task',
@@ -148,8 +148,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             layer.confirm(data.msg);
                         }
                     }
-                })
-            })
+                });
+            });
 
             Controller.api.bindevent();
             $(document).on('click','.submit',function () {

public/assets/js/backend/product.js

@@ -49,7 +49,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                             }],
                             table: table,
                             events: Table.api.events.operate, formatter: Table.api.formatter.operate
-                        }
+                        },
                     ]
                 ]
             });
@@ -57,6 +57,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                 $(".btn-editone").data("area",["100%","100%"]);
             });
 
+
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
@@ -127,10 +128,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                             $("#wuliao").val('');
                             if($("#status").val()==1){
                                 if(res.error === 1){
-                                    Layer.confirm("此物料不在配方中，请确认！");
+                                    // Layer.confirm("此物料不在配方中，请确认！");
+                                    layer.confirm("此物料不在配方中，请确认！", {//物料不存在提示错误信息
+                                        title: ['信息'],
+                                        btn: ['确认', '取消'],
+                                        area: ['60%', '60%'],
+                                    },function(index) {//点击确定正常执行
+                                        layer.close(index);
+                                    },function(){//点击取消删除添加的最后一个元素
+                                        $("#table tr:last").remove();
+                                    });
+                                    var synth = window.speechSynthesis;
+                                    var msg = new window.SpeechSynthesisUtterance('此物料不在配方中，请确认！');
+                                    window.speechSynthesis.cancel();
+                                    synth.speak(msg);
                                     //语音播报
-                                    var msg = new SpeechSynthesisUtterance("此物料不在配方中，请确认！");
-                                    window.speechSynthesis.speak(msg);
+                                    // var msg = new SpeechSynthesisUtterance("此物料不在配方中，请确认！");
+                                    // window.speechSynthesis.speak(msg);
+
                                 }
                             }
                             i++;
@@ -183,7 +198,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
 
 
                     if (status == 2){
-                        layer.confirm('领料人或仓管人为空,请检查!');return false;
+                        // layer.confirm('领料人或仓管人为空,请检查!');
+                        layer.confirm("领料人或仓管人为空,请检查!",{//物料不存在提示错误信息
+                            title:['信息'],
+                            area:['60%','60%'],
+                        });
+                        return false;
                     }
 
                     // createQrcode(bach,80,80);

public/assets/js/backend/stock.js

@@ -15,7 +15,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 }
             });
 
-            var table = $("#table");
+            var table = $("#table");//index.html table的id
 
             // 初始化表格
             table.bootstrapTable({
@@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'unit', title: __('Unit'), operate: 'LIKE'},
                         {field: 'number', title: __('Number'), operate: 'LIKE'},
                         {field: 'l_number', title: __('L_number'), operate: 'LIKE'},
+                        {field: 'specs', title: __('Specs'), operate: 'LIKE'},
                         // {field: 'company_id', title: __('Company_id')},
                         {field: 'create', title: __('Create'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'update', title: __('Update'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
@@ -41,6 +42,52 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             // 为表格绑定事件
             Table.api.bindevent(table);
+
+
+            $.ajax({
+                type: "POST",
+                url: "order/stockad",
+                success(res) {//根据订单管理返回的值为1代表有新增数据订单
+                    if(res== 1){
+                        layer.confirm("您好，来新订单了！", {
+                            title: ['信息'],
+                            btn: ['确认'],
+                            area: ['60%', '60%'],
+                        },function(index) { //点击处理停止语音播报
+                            setInterval(fn,3000);
+                            jQuery.ajax({
+                                type: "post",
+                                url: "stock/orderstu",
+                                data: {orderstu:2},
+                                success: function(data){//成功回调函数
+                                    if(data='处理成功'){
+                                        location.reload();//刷新本页面
+                                    }
+                                    layer.close(index);//点击确定关闭弹窗
+                                },
+                                error: function(){ //失败返回调用
+                                    alert("处理异常！");
+                                }
+                            });
+                        });
+                        var fn = function(){//有订单弹出提示框并且语音播报
+                            var synth = window.speechSynthesis;
+                            var msg = new window.SpeechSynthesisUtterance('您好，来新订单了！');
+                            window.speechSynthesis.cancel();
+                            synth.speak(msg);
+                        };
+                        setInterval(fn,5000);//多久播一次
+                    }else{
+
+                    }
+                }
+            });
+
+
+
+
+
+
         },
         add: function () {
             Controller.api.bindevent();

public/assets/js/backend/task.js

@@ -0,0 +1,58 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'task/index' + location.search,
+                    add_url: 'task/add',
+                    edit_url: 'task/edit',
+                    del_url: 'task/del',
+                    multi_url: 'task/multi',
+                    import_url: 'task/import',
+                    table: 'task',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'name', title: __('Name'), operate: 'LIKE'},
+                        {field: 'bach', title: __('Bach'), operate: 'LIKE'},
+                        {field: 'drawer_name', title: __('Drawer_name'), operate: 'LIKE'},
+                        {field: 'examine_name', title: __('Examine_name'), operate: 'LIKE'},
+                        {field: 'number', title: __('Number'), operate: 'LIKE'},
+                        {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}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});