仓库导出修改

liweidong
wusiyu 3 days ago
parent 7205621499
commit 0a591abac7
  1. 3
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java
  2. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StAllotRecordMapper.xml

@ -189,6 +189,9 @@ public class StAllotRecordController extends BladeController {
//} //}
//queryWrapper.lambda().eq(StAllotRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); //queryWrapper.lambda().eq(StAllotRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
// List<StAllotRecordExcel> list = stAllotRecordService.exportStAllotRecord(queryWrapper); // List<StAllotRecordExcel> list = stAllotRecordService.exportStAllotRecord(queryWrapper);
if (stAllotRecord.get("curStatus") == null) {
stAllotRecord.put("curStatus", StAllotRecord.STATUS_OK);
}
List<StAllotRecordExcel> list = stAllotRecordService.exportStAllotRecord(stAllotRecord); List<StAllotRecordExcel> list = stAllotRecordService.exportStAllotRecord(stAllotRecord);
ExcelUtil.export(response, "库位调拨记录表数据" + DateUtil.time(), "库位调拨记录表数据表", list, StAllotRecordExcel.class); ExcelUtil.export(response, "库位调拨记录表数据" + DateUtil.time(), "库位调拨记录表数据表", list, StAllotRecordExcel.class);
} }

@ -101,8 +101,6 @@
LEFT JOIN st_storage_location ol ON a.old_sl_id = ol.id LEFT JOIN st_storage_location ol ON a.old_sl_id = ol.id
LEFT JOIN st_storage_location nl ON a.new_sl_id = nl.id LEFT JOIN st_storage_location nl ON a.new_sl_id = nl.id
WHERE a.is_deleted = 0 WHERE a.is_deleted = 0
<!-- 1. 数据权限:强制过滤【当前用户所属工厂/部门】,必生效 -->
AND a.create_dept = #{param2.createDept}
<!-- 2. 调拨单状态:前端传了用传的,没传用默认值NEW_BUILT,必生效 --> <!-- 2. 调拨单状态:前端传了用传的,没传用默认值NEW_BUILT,必生效 -->
AND a.cur_status = #{param2.curStatus} AND a.cur_status = #{param2.curStatus}
<!-- 3. 商品编码:可选条件,传了就过滤,没传不生效(模糊查询,业务常用) --> <!-- 3. 商品编码:可选条件,传了就过滤,没传不生效(模糊查询,业务常用) -->

Loading…
Cancel
Save