weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oms配置表添加shipperid;

Browse Source
This commit is contained in:
王奎兴
2026-05-08 09:52:36 +08:00
parent ab7534e134
commit e467193f03
5 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/sysTableConfig/SysTableConfigApi.java
+6 -4
View File
@@ -62,10 +62,11 @@ public class SysTableConfigApi extends BaseController {
@ApiOperation(value = "系统表配置 - 根据组织 ID 和键查询", notes = "系统表配置 - 根据组织 ID 和键查询")
@GetMapping(value = "/getByOrgIdAndKey")
public Result<?> getByOrgIdAndKey(@RequestParam(name="organizationId") Long organizationId,
@RequestParam(name="warehouseId") Long warehouseId,
@RequestParam(name="warehouseId", required=false) Long warehouseId,
@RequestParam(name="shipperId", required=false) Long shipperId,
@RequestParam(name="key") String key) {
try {
SysTableConfig config = sysTableConfigService.getByOrgIdAndKey(organizationId, key, warehouseId);
SysTableConfig config = sysTableConfigService.getByOrgIdAndKey(organizationId, key, warehouseId,shipperId);
if (config == null) {
return Result.ok("未找到对应配置");
}
@@ -85,9 +86,10 @@ public class SysTableConfigApi extends BaseController {
@ApiOperation(value = "系统表配置 - 根据组织 ID 查询所有配置", notes = "系统表配置 - 根据组织 ID 查询所有配置")
@GetMapping(value = "/listByOrgId")
public Result<?> listByOrgId(@RequestParam(name="organizationId") Long organizationId,
@RequestParam(name="warehouseId") Long warehouseId) {
@RequestParam(name="warehouseId", required=false) Long warehouseId,
@RequestParam(name="shipperId", required=false) Long shipperId) {
try {
List<SysTableConfig> list = sysTableConfigService.listByOrgId(organizationId, warehouseId);
List<SysTableConfig> list = sysTableConfigService.listByOrgId(organizationId, warehouseId, shipperId);
return Result.ok(list);
} catch (Exception e) {
log.error(e.getMessage(), e);