bug修改，业务单据扫码单据使用后端返回的单据类型名称，仓库名称

api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml

@@ -105,13 +105,14 @@
 
     <select id="filterListOr" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
             resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
-        SELECT stock_order.* FROM stock_order
+        SELECT stock_order.* ,inv_warehouse.name invName, inv_warehouse_sub.name subInvName ,basic_bustype_local.name billTypeName FROM stock_order
+        left join basic_bustype_local on stock_order.billType = basic_bustype_local.action
         LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and stock_order.id =#{id}
             </if>
             <if test="billNo != '' and billNo!=null">
                 and billNo LIKE concat('%',#{billNo},'%')
@@ -141,7 +142,7 @@
                 and statusInfo = #{statusInfo}
             </if>
             <if test="type != '' and type!=null">
-                and `type` = #{type}
+                and stock_order.type = #{type}
             </if>
             <if test="sourceType != '' and sourceType!=null">
                 and sourceType = #{sourceType}
@@ -149,18 +150,15 @@
             <if test="printStatus != '' and printStatus!=null">
                 and printStatus = #{printStatus}
             </if>
-            <if test="localAction != '' and localAction!=null">
-                and billType = #{localAction}
-            </if>
             <if test="unitIdFk != '' and unitIdFk!=null">
                 and unitIdFk = #{unitIdFk}
             </if>
-
-
+            <if test="localAction != '' and localAction!=null">
+                and billType = #{localAction}
+            </if>
             <if test="userId!=null">
                 and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or
-                invWarehouseCode is null or
-                invWarehouseCode ='')
+                invWarehouseCode is null or invWarehouseCode='')
             </if>
 
             <if test="customerId != '' and customerId!=null">