Browse Source

优化发货单打印

qiuenguang 1 year ago
parent
commit
32846b164b
2 changed files with 3 additions and 3 deletions
  1. 2 3
      application/admin/controller/Deliver.php
  2. 1 0
      public/assets/js/backend/deliver.js

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

@@ -88,7 +88,7 @@ class Deliver extends Backend
         $limit = input('limit');
         $total = $large->name($userInfo['company'].'_'.'qcode_large')->where('l_status',0)->where($where)->whereIn('bach_id',$bach_id)->count();
         $large_list = $large->name($userInfo['company'].'_'.'qcode_large')
-            ->order('creat_time',$order)
+            ->order('create_time')
             ->where($where)
             ->where('l_status',0)
             ->whereIn('bach_id',$bach_id)
@@ -220,7 +220,7 @@ class Deliver extends Backend
             'large_num' => $lager_num,
             'small_num' => $n,
             'status' => 0,
-            'num' => $bachDetail['s_weight'],
+            'num' => $bachDetail['box_num'],
             'bach_num' => $bachDetail['bach_num'],
             'mater_type' => $mater_type,
             'note' => '',
@@ -660,7 +660,6 @@ class Deliver extends Backend
                 $data[$k] = $export->where('_id',$v)->find();
                 $large_str = explode(',',$data[$k]['large_str']);
                 $large_list = $large->name($userinfo['company'].'_'.'qcode_large')->whereIn('_id',$large_str)->select();
-
                 $large_num = $large_weight = 0;
                 foreach ($large_list as $value){
                     $large_num = $large_num + $value['l_num'];

+ 1 - 0
public/assets/js/backend/deliver.js

@@ -214,6 +214,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                },function (data) {
                    parent.Toastr.error('失败');
                    Fast.api.close();
+                   window.parent.location.reload();
                    return false;
                })
             });