Merge branch 'dev' into test

src/views/saleManage/saleOrder/index.vue

@@ -1137,7 +1137,8 @@ export default {
             '已全部发货，不能创建发货单'
         );
       }
-      if(!this.selection.every((item) => item.isLock == 0 && item.needProduce == 1)){
+
+      if(!this.selection.every((item) => item.isLock == 0) && item.needProduce == 1){
         return this.$message.warning('生产性订单未入库前不允许发货');
       }
       if (