运输表头错位调整，收货条码搜索功能优化

app/Services/HandInStorageService.php

@@ -211,7 +211,9 @@ class HandInStorageService
  SELECT DOC_ASN_HEADER.ASNNO,DOC_ASN_HEADER.addtime,DOC_ASN_HEADER.asnreference1,DOC_ASN_HEADER.customerid,DOC_ASN_HEADER.asnstatus,DOC_ASN_HEADER.asntype FROM DOC_ASN_HEADER
                   LEFT JOIN DOC_ASN_DETAILS ON DOC_ASN_HEADER.ASNNO = DOC_ASN_DETAILS.ASNNO
                   LEFT JOIN BAS_SKU ON DOC_ASN_DETAILS.CUSTOMERID = BAS_SKU.CUSTOMERID AND DOC_ASN_DETAILS.SKU = BAS_SKU.SKU
-WHERE DOC_ASN_HEADER.ASNSTATUS in ('00','30') and (BAS_SKU.ALTERNATE_SKU1 = ? OR BAS_SKU.ALTERNATE_SKU2 = ?  OR BAS_SKU.ALTERNATE_SKU3 = ?)
+WHERE DOC_ASN_HEADER.ASNSTATUS in ('00','30') and BAS_SKU.SKU in (select SKU from BAS_SKU where ALTERNATE_SKU1=? union
+                      select SKU from BAS_SKU where ALTERNATE_SKU2=? union
+                      select SKU from BAS_SKU where ALTERNATE_SKU3=? )
 group by DOC_ASN_HEADER.ASNNO,DOC_ASN_HEADER.addtime,DOC_ASN_HEADER.asnreference1,DOC_ASN_HEADER.customerid,DOC_ASN_HEADER.asnstatus,DOC_ASN_HEADER.asntype
 SQL;
                 return DB::connection("oracle")->select(DB::raw($sql), [$asn, $asn, $asn]);
@@ -320,7 +322,9 @@ select INV_LOT_LOC_ID.CUSTOMERID,BAS_SKU.ALTERNATE_SKU1,INV_LOT_LOC_ID.LOCATIONI
        sum(INV_LOT_LOC_ID.QTY) AS QTY from INV_LOT_LOC_ID
     left join BAS_SKU on INV_LOT_LOC_ID.CUSTOMERID=BAS_SKU.CUSTOMERID and INV_LOT_LOC_ID.SKU =BAS_SKU.SKU
     left join INV_LOT_ATT on INV_LOT_ATT.LOTNUM=INV_LOT_LOC_ID.LOTNUM
-    where (BAS_SKU.ALTERNATE_SKU1 = ? OR BAS_SKU.ALTERNATE_SKU2 = ?  OR BAS_SKU.ALTERNATE_SKU3 = ?)
+    where BAS_SKU.SKU in (select SKU from BAS_SKU where ALTERNATE_SKU1=? union
+                      select SKU from BAS_SKU where ALTERNATE_SKU2=? union
+                      select SKU from BAS_SKU where ALTERNATE_SKU3=? )
 group by INV_LOT_LOC_ID.CUSTOMERID,BAS_SKU.ALTERNATE_SKU1,INV_LOT_LOC_ID.LOCATIONID,INV_LOT_ATT.LOTATT05,INV_LOT_ATT.LOTATT08
 sql;
         $invLots = DB::connection("oracle")->select(DB::raw($sql), [$barcode, $barcode, $barcode]);

resources/views/transport/waybill/index.blade.php

@@ -841,7 +841,7 @@
                         {name:'operation',value: '操作', neglect: true, class:"td-operation"},@endcan
                         {name:'onTop',value: '置顶', neglect: true, class:"td-operation"},
                         {name:'status',value: '状态', class:"td-operation"},
-                        {name:'express_face_list',value: '快递面单是否打印', class:"td-operation"},
+                        {name:'express_face_list',value: '快递面单是否打印', class:"td-warm"},
                         {name:'index',value: '序号', neglect: true, class:"td-warm"},
                         {name:'created_at', neglect: true,value: '创建时间', class:"td-warm"},
                         {name:'operating',value: '操作记录', class:"td-warm"},
@@ -889,7 +889,7 @@
                         fixedTop:($('#form_div').height())+2,
                         before : [
                             {colspan:'4',value: '', class:"table-header-layer-1"},
-                            {colspan:'14',value: '运单信息',font:"fa fa-file-text-o", class:"table-header-layer-1"},
+                            {colspan:'15',value: '运单信息',font:"fa fa-file-text-o", class:"table-header-layer-1"},
                             {colspan:'17',value: '运输信息',font:"fa fa-truck", class:"table-header-layer-1"},
                             {colspan:'5',value: '收费信息',font:"fa fa-rmb", class:"table-header-layer-1"},
                                 @can('运输管理-运单-删除'){colspan:'1',value: '',font:"", class:"table-header-layer-1"},@endcan