签收页面导出增加仓库字段

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -1140,6 +1140,9 @@
             <if test="param.signingStatus != null and param.signingStatus!=''">
                 and lds.signing_status = #{param.signingStatus}
             </if>
+            <if test="param.warehouseId != null and param.warehouseId!=''">
+                and ldr.warehouse_id = #{param.warehouseId} AND lddl.warehouse_id =#{param.warehouseId}
+            </if>
         </where>
     </select>
     <select id="selectPushOldPackage" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -1433,6 +1433,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (ObjectUtils.isNotNull(o)) {
 			distributionSignfor.remove("ids");
 		}
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Func.isNotEmpty(myCurrentWarehouse)){
+			distributionSignfor.put("warehouseId",myCurrentWarehouse.getId());
+		}
 
 		DistributionSignforVO distributionSignforVO = JSON.parseObject(JSON.toJSONString(distributionSignfor), DistributionSignforVO.class);
 		if (ObjectUtils.isNotNull(o)) {