Merge branch 'dev' into pre-production

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml

@@ -391,6 +391,10 @@
             <if test="param.orderCode!=null and param.orderCode !=''">
                 and ldsa.order_code like concat('%',#{param.orderCode},'%')
             </if>
+            <if test="#{param.id} !=null">
+                AND lwug.allocation_id = #{param.id}
+            </if>
+
         </where>
 
     </select>