Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

Administrator

2023-12-12 4054f952396930f34b938074d2908926e0e40c96

 src/main/webapp/static/js/order/out.js

@@ -258,8 +258,6 @@
            }
            ,yes: function(index, layero){
                //按钮【立即出库】的回调
                console.log('261行')
                console.log(tableCache);
                pakout(tableCache, index);
            }
            ,btn2: function(index, layero){
@@ -556,8 +554,6 @@
            }
            ,yes: function(index, layero){
                //按钮【立即出库】的回调
                console.log('560')
                console.log(mergeTabCache);
                pakout(mergeTabCache, index);
            }
            ,btn2: function(index, layero){