油墨扩单优化功能

application/admin/controller/Formula.php

@@ -418,29 +418,13 @@ class Formula extends Backend
         }
         $this->success();
     }
+
     //生成作业单
     public function task(){
-//        $ceshi = Db::name('formula_detail')->where('id','>',52459)->limit(10000)->select();
-//        foreach ($ceshi as $key=>$value){
-//            $ceshi[$key]['percentage'] = encrypt($value['percentage']);
-//        }
-//        Db::name('formula_detail_c')->insertAll($ceshi);
-//        print_r('-------------------------------');
-//        die;
-
-//gyinfo
-
-
-
         $ids = input('ids');
-
-
         if (!$ids) {
             $this->error(__('No Results were found'));
         }
-
-
-
         if (false === $this->request->isPost()) {
 
             //生产部=>开票人
@@ -466,7 +450,7 @@ class Formula extends Backend
             }
             $this->view->assign('erro',$erro);
 
-            $list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('id,material,percentage,gy_name,gy_num,kuodan')->select();
+            $list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('id,material,percentage,gy_name,gy_num')->select();
 
             foreach ($list['gyinfo'] as $key=>$value){
                 $list['gyinfo'][$key]['percentage'] = decode($value['percentage']);
@@ -507,31 +491,22 @@ class Formula extends Backend
         $params['remark'] = $base[6];
         $params['machine'] = $base[7];
         $params['oid'] = $base[8];
-
-        if(!empty($base[9]))
-            if($base[9]){
-                $params['kuodan']=$base[9];
-            }
-
-
-        // print_r($list2['gyinfo']);
-        // exit;
-        //percentage
-
-        //$params['kuodan'] = ($base[9]+$params['number'])*;
-
+        $params['kuodan']=$base[9];
+        //echo "<pre>";
+        //print_r($params);
+        //echo "</pre>";die;
+//        if(!empty($base[9]))
+//            if($base[9]){
+//                $params['kuodan']=$base[9];
+//            }
         $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;//生产中
@@ -687,15 +662,16 @@ class Formula extends Backend
         }
         $num = array_sum($total);
         foreach ($gyinfo as $key=>$value){
-            if($gyinfo[$key]['gy_name'] == null){//
-                $gyinfo[$key]['gy_name'] = '';//
-            }//
+            if($gyinfo[$key]['gy_name'] == null){
+                $gyinfo[$key]['gy_name'] = '';
+            }
             $gyinfo[$key]['num'] = '';
             $gyinfo[$key]['percentage'] =  decode($value['percentage']);
             if (!empty($value['percentage'])){
 //                $gyinfo[$key]['num'] = number_format($gyinfo[$key]['percentage'] / $num * $params['number'],3);
                 $number = ceil($gyinfo[$key]['percentage'] / $num * $params['number'] *1000);
                 $gyinfo[$key]['num'] = number_format($number/1000,3);
+                $gyinfo[$key]['numm'] = $num;
             }
         }
         $date = date('Y/m/d');

application/admin/view/formula/task.html

@@ -34,6 +34,7 @@
             <input id="c-bach" class="form-control" name="row[bach]" type="text" value="{$bach}">
         </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">
@@ -54,6 +55,7 @@
             <!--<input id="c-examine_name" data-rule="required" class="form-control" name="row[examine_name]" type="text">-->
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">生产量(KG):</label>
         <div class="col-xs-12 col-sm-3">
@@ -63,10 +65,16 @@
         <div class="col-xs-12 col-sm-3">
             <input id="c-remark" class="form-control" name="row[remark]" type="text">
         </div>
+    </div>
 
-        <input id="c-kuoz" data-rule="required" class="form-control" name="row[kuoz]" type="hidden">
-
+    <div class="form-group" style="display: none">
+        <!--扩单数量-->
+        <label class="control-label col-xs-12 col-sm-1">扩单数量</label>
+        <div class="col-xs-12 col-sm-3">
+            <input id="c-kuoz" data-rule="required" class="form-control" name="row[kuoz]" 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">
@@ -88,26 +96,18 @@
 
     <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>
-
-
-        <button type="button" id="kuodan" class="btn btn-success">确定扩单</button>
-
-
-
-
-
+        <div class="col-xs-12 col-sm-3">
+            <button type="button" id="add" class="btn btn-success">确定生成作业票</button>
+            <button type="button" id="kuodan" class="btn btn-success">确定扩单</button>
+        </div>
     </div>
+
     <div class="form-group">
         <table class="table table-striped table-bordered table-hover table-nowrap" id="gy">
             <tr>
                 <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-1">应加量(KG)</th>
-
                 <th class="col-xs-12 col-sm-1">扩单后应加重量</th>
                 <th class="col-xs-12 col-sm-6">操作记录</th>
                 <th class="col-xs-12 col-sm-1">工序号</th>
@@ -116,13 +116,8 @@
             <tr>
                 <td><input  class="form-control material" type="text" value="{$vo.material}" readonly></td>
                 <td><input  class="form-control percentage" type="text" value="{$vo.percentage}" readonly></td>
-
-
-
                 <td><input  class="form-control num" type="text" data-id="{$vo.id}" id="input-{$vo.id}" value="" readonly></td>
-
-                <td><input  class="form-control percentage" name="kuodan[{$vo.id}]" type="text"  id="kuodan-{$vo.id}" value="{$vo.kuodan}" readonly></td>
-
+                <td><input  class="form-control num" type="text" data-id="{$vo.id}" id="kuodan-{$vo.id}" value="" readonly></td>
                 <td><input  class="form-control gy_name" type="text" value="{$vo.gy_name}" readonly></td>
                 <td><input  class="form-control gy_num" type="text" value="{$vo.gy_num}" readonly></td>
             </tr>
@@ -180,17 +175,16 @@
                 <table class="tg" style="width: 800px;" 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;">实加量(KG)</th>
                         <th  style="text-align: center;">扩单后应加重量</th>
-
                         <th  style="text-align: center;">操作记录</th>
                     </tr>
                     {foreach name='row["gyinfo"]' id='vo'}
                     <tr>
                         <td style="width: 200px;text-align: center;font-size: 18px;line-height: 100%">{$vo.material}</td>
-                        <!--                                <td style="width: 100px">{$vo.percentage}</td>-->
+                    <!--<td style="width: 100px">{$vo.percentage}</td>-->
                         <td data-id="{$vo.id}" id="text-{$vo.id}" style="width: 100px;text-align: center;font-size: 18px;line-height: 10px" class="tt"></td>
                         <td style="width: 100px;text-align: center;"></td>
                         <td style="width: 100px;text-align: center;" class="tty_{$vo.id}"></td>
@@ -200,9 +194,8 @@
                     <tr>
                         <td style="width: 100px;text-align: center;font-size: 18px;">总计</td>
                         <td class="total" style="width: 100px;text-align: center;font-size: 18px;"></td>
-                        <td></td>
-                        <td class="zoj" style="width: 100px;text-align: center;font-size: 18px;"></td>
-
+                        <td ></td>
+                        <td class="kd_total" style="width: 100px;text-align: center;font-size: 18px;"></td>
                         <td></td>
                     </tr>
                     <tr>

public/assets/js/backend/formula.js

@@ -194,9 +194,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     baseData.push(controlled_one);
                     baseData.push(controlled_two);
 
-
-
-
                     //配方数据
                     var data = [];
                     var formulaTrList = $("#gy").find("tr");//行数
@@ -222,10 +219,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     if (data.length == 0){
                         layer.confirm('工艺信息不能为空!');return false;
                     }
-
-                    console.log(data);
                     // return false;
-
                     Fast.api.ajax({
                         url:'formula/add',
                         data:{baseData:baseData,formulaData:data}
@@ -270,8 +264,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     return false;
                 }
                 var trs = $(this).parents('tr').clone(true);
-                console.log(trs);
-
                 $(this).parents('table tbody').find('tr').eq(ind - 1).before(trs);
                 $(this).parents('tr').remove();
                 //重新添加序号
@@ -401,24 +393,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
         },
         task: function () {
-
             $('#kuodan').click(function () {
                 layer.prompt({
                     title: ['扩单'],
-                    formType: 0, //输入框类型，支持0（文本）默认1（密码）2（多行文本）
-
+                    formType: 0, //输入框类型
                 },function(value2, index, elem){
-                    kuoz= value2
-                    $('#c-kuoz').val(value2)
-
+                    // kuoz= value2;//扩单全局变量
+                    $('#c-kuoz').val(value2);
                     //配方获取和计算
                     var ids = $('#ids').val();
-                    var number = $('#c-number').val();
+                    var kd_number = parseFloat($('#c-kuoz').val());//获取扩单数据
+                    var number = parseInt($('#c-number').val());//获取生产量数据
                     if (number == ''){
                         layer.confirm('生产量不能为空');
                         return false;
                     }
-                    var pc = $('#hidden').val();//当前批次号
+                    // var pc = $('#hidden').val();//当前批次号
                     // if($('#hidden').val() > $('#c-bach').val()){
                     //     layer.confirm("批次号不能小于当前的批次,当前批次为"+pc,  {
                     //         title: ['信息'],
@@ -435,7 +425,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     //     return false;
                     // }
                     //给打印界面赋值
+                    var sum_num = number + kd_number;
+                    // console.log(sum_num);
                     $('.total').text(number);
+                    $('.kd_total').text(sum_num);
                     var remark = $('#c-remark').val();
                     remark = '备注：'+remark;
                     $('.remark').text(remark);
@@ -453,39 +446,38 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         url: "formula/getNumber",
                         data: {
                             'ids': ids,
-                            'number': number
+                            'number': number,
                         },
                         success:function(data) {
-                            if (1 == data.status)
-                            {
+                            if (1 == data.status){
                                 var formulaTrList = $("#gy").find("tr");//行数
                                 for (var i = 1; i < formulaTrList.length; i++) {
                                     var formulaTrArr=formulaTrList.eq(i);
                                     var id = formulaTrArr.children("td").eq(2).find('input').attr('data-id');//应加量
                                     $.each(data.data,function (key,value){
                                         if (id == value.id){
-
                                             $('#input-'+id).val(value.num);
                                         }
                                     })
                                 }
-
-                                let p=0
                                 for (var i = 1; i < formulaTrList.length; i++) {
                                     var formulaTrArr=formulaTrList.eq(i);
                                     var id = formulaTrArr.children("td").eq(2).find('input').attr('data-id');//应加量
                                     $.each(data.data,function (key,value){
                                         if (id == value.id){
-                                            $('#kuodan-'+id).val((Number(number)+Number(value2))*(value.percentage/100));
-                                            if((Number(number)+Number(value2))*(value.percentage/100)){
-                                                $('.tty_'+id).text((Number(number)+Number(value2))*(value.percentage/100))
-                                                p+=(Number(number)+Number(value2))*(value.percentage/100)
+                                            var kd_number = Math.ceil(value.percentage / value.numm * (Number(number)+Number(value2)) * 1000);
+                                            var kd_num = (kd_number / 1000).toFixed(3);
+                                            if(isNaN(kd_num)){
+                                                kd_num = '';
+                                            }
+                                            // $('#kuodan-'+id).val(value.num);
+                                            $('#kuodan-'+id).val(kd_num);
+                                            if(kd_num){
+                                                $('.tty_'+id).text(kd_num);
                                             }
-
                                         }
                                     })
                                 }
-                                $('.zoj').text(p)
 
                                 var print_gyList = $("#print_gy").find("tr");//行数
                                 for (var i = 1; i < print_gyList.length; i++) {
@@ -499,20 +491,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 }
                                 $('#formula_no').text(data.formula_no);
                                 $('#date').text(data.date);
-
                             }else {
                                 layer.confirm(data.msg);
                             }
-                        }
-                    })
 
+                        }
+                    });
                     layer.close(index);
-
                 });
-
-
-
-            })
+            });
 
             $('#add').click(function () {
                 //配方获取和计算
@@ -522,7 +509,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     layer.confirm('生产量不能为空');
                     return false;
                 }
-                var pc = $('#hidden').val();//当前批次号
+                // var pc = $('#hidden').val();//当前批次号
                 // if($('#hidden').val() > $('#c-bach').val()){
                 //     layer.confirm("批次号不能小于当前的批次,当前批次为"+pc,  {
                 //         title: ['信息'],
@@ -591,14 +578,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         }
                     }
                 })
-            })
+            });
 
-//提交数据
+            //提交数据
             Controller.api.bindevent();
             $(document).on('click','.submit',function () {
-
-
-                var pc = $('#hidden').val();//当前批次号
+                // var pc = $('#hidden').val();//当前批次号
                 // if($('#hidden').val() > $('#c-bach').val()){
                 //     layer.confirm("批次号不能小于当前的批次,当前批次为"+pc,  {
                 //         title: ['信息'],
@@ -641,12 +626,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     var remark = $('#c-remark').val();
                     var mid = $('#c-mid').val();
                     var oid = $('#c-order-uncompleted').val();
+                    var kd_number = parseFloat($('#c-kuoz').val());
                     if (verify == -1){
                         layer.confirm("数据格式不对,请仔细核查!");return false;
                     }
-
-
-
                     //基础数据
                     var baseData = [];
                     baseData.push(ids);
@@ -658,8 +641,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     baseData.push(remark);
                     baseData.push(mid);
                     baseData.push(oid);
-                    if(kuoz)
-                        baseData.push(kuoz);
+                    baseData.push(kd_number);
+                    // if(kuoz)
+                    //     baseData.push(kuoz);
                     Fast.api.ajax({
                         url:'formula/task?ids='+ids,
                         data:{baseData:baseData}
@@ -693,9 +677,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     table: 'formula',
                 }
             });
-
             var table = $("#table");
-
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
@@ -733,7 +715,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
             table.on('post-body.bs.table',function(){
                 $(".btn-editone").data("area",["100%","100%"]);
-            })
+            });
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
@@ -752,8 +734,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 // var baseData = [];
                 // baseData.push(cname);
                 // baseData.push(cformula_no);
-
-
                 if (status == ''){
                     layer.confirm('数据错误,请重新打开页面');return false;
                 }